From 0d7e206298c63572e7993be34b92a12228eb6275 Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Sat, 10 Dec 2022 13:31:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql   | 4 +++-
 lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue        | 1 +
 lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue        | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
index 64e1a1da8..ee79ceb0a 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/outbill/wql/QST_IVT_CHECKOUTBILL.wql
@@ -592,12 +592,14 @@
                 task.task_id,
                 task.task_code,
                 task.task_type,
-                task.task_status
+                task.task_status,
+                sub.sap_pcsn
               FROM
                 st_ivt_iostorinvdis dis
                 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
                 WHERE
                 1=1
 
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
index d11220987..1244ae06f 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/TaskDialog.vue
@@ -109,6 +109,7 @@
         <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="sap_pcsn" label="sap批次号" align="center" />
         <el-table-column show-overflow-tooltip prop="box_no" label="箱号" align="center" />
         <el-table-column show-overflow-tooltip prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column show-overflow-tooltip prop="struct_code" label="起始位置" align="center" />
diff --git a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
index 42b2dbb94..80bc8664e 100644
--- a/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/outbill/ViewDialog.vue
@@ -140,7 +140,7 @@
         <el-table-column min-width="120" show-overflow-tooltip prop="material_name" label="物料名称" align="center" />
         <el-table-column prop="pcsn" label="子卷批次号" align="center" show-overflow-tooltip />
         <el-table-column prop="sap_pcsn" label="sap批次号" align="center" />
-        <el-table-column prop="box_no" label="箱号" align="center" width="200px" show-overflow-tooltip />
+        <el-table-column prop="box_no" label="箱号" align="center" width="250px" show-overflow-tooltip />
         <el-table-column prop="plan_qty" :formatter="crud.formatNum3" label="重量" align="center" />
         <el-table-column prop="struct_code" label="仓位" align="center" show-overflow-tooltip />
 <!--        <el-table-column prop="next_point_code" label="目的位置" align="center" />-->