rev： 空托盘入库托盘类型，仓位顺序，前端页面优化

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java

@@ -164,6 +164,7 @@ public class InVehicleManageServiceImpl implements InVehicleManageService {
         JSONArray structArray = attrTab.query("IFNULL(storagevehicle_code,'') = '' " +
                 "AND is_used = '" + IOSEnum.IS_NOTANDYES.code("是") + "' AND is_delete = '" + IOSEnum.IS_NOTANDYES.code("否") + "' " +
                 "AND lock_type = '" + IOSEnum.LOCK_TYPE.code("未锁定") + "' AND stor_id = '"+jsonParam.getString("stor_id")+"' " +
+                "AND storagevehicle_type = '" +jsonParam.getString("vehicle_type")+"'"+
                 "AND sect_id = '"+jsonParam.getString("sect_id")+"'").getResultJSONArray(0);
 
         if (ObjectUtil.isEmpty(structArray)) {

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INBOX.wql

@@ -140,7 +140,7 @@
                  AND attr.block_num = 输入.block_num
                  AND attr.row_num = 输入.row_num
 
-                 order by attr.col_num,attr.layer_num ASC,attr.zdepth DESC
+                 order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC
 
              ENDSELECT
          ENDQUERY

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INRULE.wql

@@ -212,7 +212,7 @@
                 attr.row_num = 输入.row_num
             ENDOPTION
 
-            order by attr.col_num DESC ,attr.layer_num ASC,attr.zdepth DESC
+            order by attr.col_num,attr.layer_num ASC,attr.zdepth DESC
 
             ENDSELECT
         ENDQUERY

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_INVEHICLE.wql

@@ -22,7 +22,7 @@
     输入.row_in      			        TYPEAS f_string
     输入.not_row_in      			    TYPEAS f_string
     输入.not_block      			        TYPEAS f_string
-    输入.storagevehicle_type      	    TYPEAS s_string
+    输入.vehicle_type      	            TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -64,8 +64,8 @@
                     attr.block_num NOT IN 输入.not_block
                 ENDOPTION
 
-                OPTION 输入.storagevehicle_type <> ""
+                OPTION 输入.vehicle_type <> ""
-                    attr.storagevehicle_type = 输入.storagevehicle_type
+                    attr.storagevehicle_type = 输入.vehicle_type
                 ENDOPTION
 
                 group by attr.block_num
@@ -147,7 +147,7 @@
                  AND attr.block_num = 输入.block_num
                  AND attr.row_num = 输入.row_num
 
-                 order by attr.col_num,attr.layer_num ASC,attr.zdepth DESC
+                 order by attr.col_num DESC,attr.layer_num ASC,attr.zdepth DESC
 
              ENDSELECT
          ENDQUERY

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTBOX.wql

@@ -228,7 +228,7 @@
                     box.num = 输入.num
                 ENDOPTION
 
-                order by attr.col_num, attr.zdepth, attr.layer_num
+                order by attr.col_num DESC, attr.zdepth, attr.layer_num
 
             ENDSELECT
         ENDQUERY

lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/wql/BST_OUTVEHICLE.wql

@@ -168,7 +168,7 @@
                     attr.row_num = 输入.row_num
                 ENDOPTION
 
-                order by attr.col_num, attr.zdepth
+                order by attr.col_num DESC, attr.zdepth
 
             ENDSELECT
         ENDQUERY

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/rest/CheckOutBillController.java

@@ -375,6 +375,7 @@ public class CheckOutBillController {
 
     @PostMapping("/testInEmp")
     @Log("空载具入库测试")
+    @SaIgnore
     public ResponseEntity<Object> testInEmp(@RequestBody JSONObject whereJson) {
         new InVehicleManageServiceImpl().inVehicle(whereJson);
         return new ResponseEntity<>(HttpStatus.OK);

lms/nladmin-ui/src/assets/styles/eladmin.scss

@@ -1,14 +1,17 @@
 .head-container {
-  padding-bottom: 10px;
+  padding-top: 8px;
+  padding-bottom: 6px;
+  background-color: #ffffff;
+  border-radius: 4px;
 
   .filter-item {
     display: inline-block;
     vertical-align: middle;
-    margin: 0 3px 3px 0;
+    margin: 0 3px 10px 0;
 
     input {
-      height: 28px;
+      height: 30.5px;
-      line-height: 28px;
+      line-height: 30.5px;
     }
   }
 
@@ -19,7 +22,7 @@
     vertical-align: middle;
     font-size: 14px;
     color: #606266;
-    line-height: 28px;
+    line-height: 30.5px;
     padding: 0 7px 0 7px;
   }
 
@@ -28,7 +31,7 @@
   }
 
   .el-select__caret.el-input__icon.el-icon-arrow-up {
-    line-height: 28px;
+    line-height: 30.5px;
   }
 
   .date-item {
@@ -149,7 +152,7 @@
 }
 
 .el-form-item--mini.el-form-item {
-  margin-bottom: 8px !important;
+  margin-bottom: 10px !important;
 }
 
 //去除编辑文本框为数字时的上下箭头start
@@ -188,7 +191,7 @@ input[type="number"]::-webkit-outer-spin-button {
   .el-table__fixed-header-wrapper {
     th {
       word-break: break-word;
-      background-color: #f8f8f9;
+      background-color: #f5f5f5;
       color: #515a6e;
       height: 35px;
       font-size: 13px;

lms/nladmin-ui/src/assets/styles/index.scss

@@ -21,6 +21,7 @@ label {
 html {
   height: 100%;
   box-sizing: border-box;
+  background-color: #eeeeee;
 }
 
 #app {
@@ -98,7 +99,7 @@ div:focus {
 }
 
 aside {
-  background: #eef1f6;
+  background: #d40c70;
   padding: 8px 24px;
   margin-bottom: 20px;
   border-radius: 2px;
@@ -122,7 +123,7 @@ aside {
 
 //main-container全局样式
 .app-container {
-  padding: 20px 20px 45px 20px;
+  padding: 10px 10px 45px 10px;
 }
 
 .components-container {

lms/nladmin-ui/src/assets/styles/variables.scss

@@ -13,17 +13,17 @@ $base-logo-light-title-color: #001529;
 $base-menu-light-background:#ffffff;
 
 // sidebar
-$menuText:#bfcbd9;
+$menuText: #ffffff;
 $menuActiveText:#409EFF;
-$subMenuActiveText:#f4f4f5; // https://github.com/ElemeFE/element/issues/12951
+$subMenuActiveText: #ffffff; // https://github.com/ElemeFE/element/issues/12951
 
-$menuBg:#304156; //https://cloud.tencent.com/developer/article/1753773
+$menuBg: #001529; //https://cloud.tencent.com/developer/article/1753773
-$menuHover:#263445;
+$menuHover:#4e5465;
 
 $base-menu-light-color:rgba(0,0,0,.70);
 
-$subMenuBg:#1f2d3d;
+$subMenuBg:#000c17;
-$subMenuHover:#001528;
+$subMenuHover:#4e5465;
 
 $sideBarWidth: 205px;
 
@@ -45,4 +45,4 @@ $sideBarWidth: 205px;
   logoLightTitleColor: $base-logo-light-title-color
 }
 
-$base-sidebar-width: 200px;
+$base-sidebar-width: 2010px;

lms/nladmin-ui/src/components/Crud/CRUD.operation.vue

@@ -258,6 +258,7 @@ export default {
   display: -webkit-flex;
   display: flex;
   align-items: center;
+  margin: 0px 10px 0px 10px;
 }
 .crud-opts .crud-opts-right {
   margin-left: auto;