修改

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/HandMoveStorServiceImpl.java

@@ -643,6 +643,9 @@ public class HandMoveStorServiceImpl implements HandMoveStorService {
         if (StrUtil.isNotEmpty(map.get("package_box_sn"))) {
             map.put("package_box_sn", "%" + map.get("package_box_sn") + "%");
         }
+        if (StrUtil.isNotEmpty(map.get("sale_order_name"))) {
+            map.put("sale_order_name", "%" + map.get("sale_order_name") + "%");
+        }
 
         //获取人员对应的仓库
         UserStorServiceImpl userStorService = new UserStorServiceImpl();

lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_HANDMOVESTOR.wql

@@ -30,6 +30,7 @@
     输入.pcsn				            TYPEAS s_string
     输入.sap_pcsn				        TYPEAS s_string
     输入.package_box_sn				    TYPEAS s_string
+    输入.sale_order_name				    TYPEAS s_string
     输入.ivt_level				        TYPEAS s_string
     输入.is_active				        TYPEAS s_string
     输入.sect_id				            TYPEAS s_string
@@ -207,7 +208,9 @@
                     OPTION 输入.package_box_sn <> ""
                           sub.package_box_sn like 输入.package_box_sn
                     ENDOPTION
-
+                    OPTION 输入.sale_order_name <> ""
+                          sub.sale_order_name like 输入.sale_order_name
+                    ENDOPTION
                     ENDSELECT
                 ENDPAGEQUERY
         ENDIF

lms/nladmin-ui/src/views/wms/st/inStor/change/AddDtl.vue

@@ -9,29 +9,19 @@
     @close="close"
     @open="open"
   >
-    <el-row>
+    <el-row style="padding-bottom: 5px;">
-      <el-col :span="5">
+      <el-col :span="6">
         <!-- 搜索 -->
         <el-cascader
           placeholder="库区"
           :options="sects"
           :props="{ checkStrictly: true }"
+          style="width: 200px;"
           clearable
           @change="sectQueryChange"
         />
       </el-col>
-      <el-col :span="5">
+      <el-col :span="6">
-        <el-input
-          v-model="query.struct_code"
-          clearable
-          size="mini"
-          placeholder="货位号模糊查询"
-          style="width: 200px;"
-          class="filter-item"
-          @keyup.enter.native="crud.toQuery"
-        />
-      </el-col>
-      <el-col :span="5">
         <el-input
           v-model="query.remark"
           clearable
@@ -42,19 +32,53 @@
           @keyup.enter.native="crud.toQuery"
         />
       </el-col>
-      <el-col :span="5">
+      <el-col :span="6">
         <el-input
-          v-model="query.pcsn"
+          v-model="query.package_box_sn"
           clearable
           size="mini"
-          placeholder="批次"
+          placeholder="木箱码"
           style="width: 200px;"
           class="filter-item"
           @keyup.enter.native="crud.toQuery"
         />
       </el-col>
-
+      <el-col :span="6">
-      <el-col :span="4">
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          size="mini"
+          placeholder="子卷批次"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+    </el-row>
+    <el-row style="padding-bottom: 5px;">
+      <el-col :span="6">
+        <el-input
+          v-model="query.pcsn"
+          clearable
+          size="mini"
+          placeholder="SAP批次"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+      <el-col :span="6">
+        <el-input
+          v-model="query.sale_order_name"
+          clearable
+          size="mini"
+          placeholder="销售订单号"
+          style="width: 200px;"
+          class="filter-item"
+          @keyup.enter.native="crud.toQuery"
+        />
+      </el-col>
+      <el-col :span="6" :offset="6">
         <rrOperation />
       </el-col>
     </el-row>
@@ -73,7 +97,8 @@
       <el-table-column show-overflow-tooltip prop="storagevehicle_code" label="载具号" />
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150px" />
       <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" width="110px" />
-      <el-table-column show-overflow-tooltip prop="pcsn" label="批次" />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" />
+      <el-table-column show-overflow-tooltip prop="pcsn" label="SAP批次" />
       <el-table-column show-overflow-tooltip prop="sale_order_name" width="150px" label="销售订单及批次" />
       <el-table-column show-overflow-tooltip prop="customer_name" label="客户编码" />
       <el-table-column show-overflow-tooltip prop="customer_description" label="客户描述" />