代码更新

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/service/impl/CheckOutBillServiceImpl.java

@@ -853,6 +853,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 jsonMap.put("flag", "1");
                 jsonMap.put("material_id", dtl.getString("material_id"));
                 jsonMap.put("pcsn", dtl.getString("pcsn"));
+                jsonMap.put("box_no", dtl.getString("box_no"));
                 jsonMap.put("sect_id", whereJson.getString("sect_id"));
                 jsonMap.put("stor_id", whereJson.getString("stor_id"));
 
@@ -1072,6 +1073,7 @@ public class CheckOutBillServiceImpl implements CheckOutBillService {
                 jsonMap.put("flag", "1");
                 jsonMap.put("material_id", dtl.getString("material_id"));
                 jsonMap.put("pcsn", dtl.getString("pcsn"));
+                jsonMap.put("box_no", dtl.getString("box_no"));
                 jsonMap.put("sect_id", whereJson.getString("sect_id"));
                 jsonMap.put("stor_id", whereJson.getString("stor_id"));
 

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql

@@ -168,7 +168,7 @@
                     	ST_IVT_IOStorInvDtl iosdtl
                     LEFT JOIN md_me_materialbase mb ON mb.material_id = iosdtl.material_id
                     LEFT JOIN ST_IVT_IOStorInv ios ON ios.iostorinv_id = iosdtl.iostorinv_id
-                    LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn
+                    LEFT JOIN pdm_bi_subpackagerelation sub ON sub.container_name = iosdtl.pcsn AND sub.package_box_sn = iosdtl.box_no
                     WHERE
                         1=1
                     OPTION 输入.iostorinv_id <> ""
@@ -679,7 +679,7 @@
                 LEFT JOIN md_me_materialbase mater ON dis.material_id = mater.material_id
                 LEFT JOIN sch_base_point point ON dis.point_id = point.point_id
                 LEFT JOIN sch_base_task task ON dis.task_id = task.task_id
-                LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name
+                LEFT JOIN pdm_bi_subpackagerelation sub ON dis.pcsn = sub.container_name AND sub.package_box_sn = dis.box_no
                 WHERE
                 1=1
 

lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/ST_OUTIVT01.wql

@@ -24,6 +24,7 @@
 	输入.iostorinv_id					         TYPEAS s_string
 	输入.iostorinvdtl_id					         TYPEAS s_string
 	输入.stor_id					                 TYPEAS s_string
+	输入.box_no					                 TYPEAS s_string
 
 [临时表]
 	--这边列出来的临时表就会在运行期动态创建
@@ -73,6 +74,10 @@
                         ivt.material_id = 输入.material_id
                 ENDOPTION
 
+                OPTION 输入.box_no <> ""
+                        attr.storagevehicle_code = 输入.box_no
+                ENDOPTION
+
                 OPTION 输入.sale_order_name <> ""
                         sub.sale_order_name = 输入.sale_order_name
                 ENDOPTION

lms/nladmin-ui/src/views/wms/st/outbill/DivDialog.vue

@@ -108,7 +108,7 @@
         <el-table-column prop="bill_status" label="状态" align="center" width="110px" :formatter="bill_statusFormat" />
         <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" align="center" />
         <el-table-column show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
-        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" />
+        <el-table-column show-overflow-tooltip prop="pcsn" label="子卷号" align="center" width="140px" />
         <el-table-column show-overflow-tooltip prop="sap_pcsn" label="sap批次" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" label="重量" :formatter="crud.formatNum3" align="center" />
         <el-table-column show-overflow-tooltip prop="assign_qty" label="已分配重量" :formatter="crud.formatNum3" align="center" />