From b5dd01fcc7a12d34b63f43702338edd33f72563a Mon Sep 17 00:00:00 2001
From: liuxy <lxy1605052545@163.com>
Date: Tue, 11 Apr 2023 08:53:46 +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/instor/wql/QST_IVT_CHECK.wql | 13 ++++++++++++-
 .../src/views/wms/st/inStor/check/AddDialog.vue     |  1 +
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
index 3e28240d6..28779db57 100644
--- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
+++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/wql/QST_IVT_CHECK.wql
@@ -119,12 +119,23 @@
                     	struct.sect_code,
                     	mb.material_code,
                     	mb.material_name,
-                    	user1.person_name AS process_optname
+                    	user1.person_name AS process_optname,
+                    	sub.date_of_production
                     FROM
                     	ST_IVT_CheckDtl CheckDtl
                     LEFT JOIN md_me_materialbase mb ON mb.material_id = CheckDtl.material_id
                     LEFT JOIN st_ivt_structattr struct ON struct.struct_id = CheckDtl.struct_id
                     LEFT JOIN sys_user user1 ON user1.user_id = CheckDtl.process_optid
+                    LEFT JOIN (
+                        SELECT
+                            MIN(date_of_production) AS date_of_production,
+                            package_box_sn
+                        FROM
+                            pdm_bi_subpackagerelation
+                        WHERE
+                            1=1
+                            group by package_box_sn
+                    ) sub ON sub.package_box_sn = CheckDtl.storagevehicle_code
                     WHERE
                     	1 = 1
                     OPTION 输入.check_id <> ""
diff --git a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
index 9c3c9f3ec..fd5ba97a0 100644
--- a/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
+++ b/lms/nladmin-ui/src/views/wms/st/inStor/check/AddDialog.vue
@@ -188,6 +188,7 @@
       <el-table-column show-overflow-tooltip v-if="crud.status.view > 0" prop="base_qty" label="净重" width="150" align="center" :formatter="crud.formatNum3"/>
       <el-table-column show-overflow-tooltip prop="material_code" label="物料编码" width="150" align="center" />
       <el-table-column prop="material_name" label="物料名称" align="center" min-width="150" show-overflow-tooltip />
+      <el-table-column prop="date_of_production" label="生产日期" v-if="crud.status.view > 0" align="center" min-width="150" show-overflow-tooltip />
       <el-table-column prop="remark" v-if="crud.status.view > 0" label="备注" align="center" min-width="150" show-overflow-tooltip />
    <!--   <el-table-column show-overflow-tooltip prop="remark" label="明细备注" align="center" width="200px" >
         <template scope="scope">