From 1ca85950d9cecd3cfc342337e28aec53d2f17fce Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 19 May 2023 17:54:49 +0800 Subject: [PATCH] =?UTF-8?q?rev:=20=E7=9B=98=E7=82=B9=E5=8D=95=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E6=97=A5=E6=9C=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../instor/service/impl/CheckServiceImpl.java | 2 ++ .../nl/wms/st/instor/wql/QST_IVT_CHECK.wql | 26 +++++++++++++++++-- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java index dbb7e6210..6a42c29d5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/st/instor/service/impl/CheckServiceImpl.java @@ -731,12 +731,14 @@ public class CheckServiceImpl implements CheckService { map.put("物料名称", jo.getString("material_name")); if (ObjectUtil.isEmpty(jsonSub)) { + map.put("生产日期", ""); map.put("厚度", ""); map.put("幅宽", ""); map.put("标准厚度", ""); map.put("客户要求幅宽", ""); map.put("备注", ""); } else { + map.put("生产日期", jsonSub.getString("date_of_production")); map.put("厚度", jsonSub.getString("thickness")); map.put("幅宽", jsonSub.getString("width")); map.put("标准厚度", jsonSub.getString("thickness_request")); 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 28779db57..814501562 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 @@ -160,12 +160,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 CheckDtl.status <> '1' OPTION 输入.check_id <> "" @@ -185,12 +196,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 CheckDtl.status = '1' OPTION 输入.check_id <> ""