From 1a89f5d1bee8039273ae2044c28b939edb6cb48a Mon Sep 17 00:00:00 2001 From: liuxy Date: Wed, 20 Sep 2023 15:02:39 +0800 Subject: [PATCH] =?UTF-8?q?rev:=E4=B8=B4=E6=9C=9F=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PastIvtQueryServiceImpl.java | 17 ++++++++++---- .../nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql | 22 +++++++++++++++---- 2 files changed, 31 insertions(+), 8 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java index dcf2f212a..b96a406ce 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/PastIvtQueryServiceImpl.java @@ -41,7 +41,8 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { public Map queryAll(Map whereJson, Pageable page) { String stor_id = MapUtil.getStr(whereJson, "stor_id"); String sect_id = MapUtil.getStr(whereJson, "sect_id"); - String sid_day = MapUtil.getStr(whereJson, "sid_day"); // 超期天数 + String sid_day_start = MapUtil.getStr(whereJson, "sid_day_start"); // 库龄天数起始 + String sid_day_end = MapUtil.getStr(whereJson, "sid_day_end"); // 库龄天数结束 String material_code = MapUtil.getStr(whereJson, "material_code"); String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); String container_name = MapUtil.getStr(whereJson, "container_name"); @@ -52,16 +53,19 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { String customer_name = MapUtil.getStr(whereJson, "customer_name"); // 客户编码 String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + String is_sid = MapUtil.getStr(whereJson, "is_sid"); // 是否超期 JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("stor_id",stor_id); map.put("sect_id",sect_id); - map.put("sid_day",sid_day); + map.put("sid_day_start",sid_day_start); + map.put("sid_day_end",sid_day_end); map.put("begin_time",begin_time); map.put("end_time",end_time); map.put("date_of_production",date_of_production); map.put("date_of_FG_inbound",date_of_FG_inbound); + map.put("is_sid",is_sid); if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%"); if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%"); if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); @@ -114,7 +118,8 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { public void download(Map whereJson, HttpServletResponse response) throws IOException { String stor_id = MapUtil.getStr(whereJson, "stor_id"); String sect_id = MapUtil.getStr(whereJson, "sect_id"); - String sid_day = MapUtil.getStr(whereJson, "sid_day"); // 超期天数 + String sid_day_start = MapUtil.getStr(whereJson, "sid_day_start"); // 库龄天数起始 + String sid_day_end = MapUtil.getStr(whereJson, "sid_day_end"); // 库龄天数结束 String material_code = MapUtil.getStr(whereJson, "material_code"); String package_box_sn = MapUtil.getStr(whereJson, "package_box_sn"); String container_name = MapUtil.getStr(whereJson, "container_name"); @@ -125,16 +130,19 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { String customer_name = MapUtil.getStr(whereJson, "customer_name"); // 客户编码 String begin_time = MapUtil.getStr(whereJson, "begin_time"); String end_time = MapUtil.getStr(whereJson, "end_time"); + String is_sid = MapUtil.getStr(whereJson, "is_sid"); // 是否超期 JSONObject map = new JSONObject(); map.put("flag", "1"); map.put("stor_id",stor_id); map.put("sect_id",sect_id); - map.put("sid_day",sid_day); + map.put("sid_day_start",sid_day_start); + map.put("sid_day_end",sid_day_end); map.put("begin_time",begin_time); map.put("end_time",end_time); map.put("date_of_production",date_of_production); map.put("date_of_FG_inbound",date_of_FG_inbound); + map.put("is_sid",is_sid); if (ObjectUtil.isNotEmpty(material_code)) map.put("material_code","%"+material_code+"%"); if (ObjectUtil.isNotEmpty(package_box_sn)) map.put("package_box_sn","%"+package_box_sn+"%"); if (ObjectUtil.isNotEmpty(container_name)) map.put("container_name","%"+container_name+"%"); @@ -159,6 +167,7 @@ public class PastIvtQueryServiceImpl implements PastIvtQueryService { mp.put("销售订单及行号", json.getString("sale_order_name")); mp.put("子卷号", json.getString("pcsn")); mp.put("sap批次", json.getString("sap_pcsn")); + mp.put("库龄", json.getString("sid_day")); mp.put("产品编码", json.getString("product_name")); mp.put("产品描述", json.getString("product_description")); mp.put("产品规格(幅宽)", json.getString("width")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql index 1f8c2a8e5..81c1aa0b5 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_PASTIVTQUERY.wql @@ -16,7 +16,8 @@ 输入.flag TYPEAS s_string 输入.stor_id TYPEAS s_string 输入.sect_id TYPEAS s_string - 输入.sid_day TYPEAS s_string + 输入.sid_day_start TYPEAS s_string + 输入.sid_day_end TYPEAS s_string 输入.material_code TYPEAS s_string 输入.package_box_sn TYPEAS s_string 输入.container_name TYPEAS s_string @@ -27,6 +28,7 @@ 输入.customer_name TYPEAS s_string 输入.begin_time TYPEAS s_string 输入.end_time TYPEAS s_string + 输入.is_sid TYPEAS s_string [临时表] --这边列出来的临时表就会在运行期动态创建 @@ -82,7 +84,7 @@ sub.box_width, sub.box_high, sub.remark, - (90 - DATEDIFF(NOW(),sub.date_of_production)) AS sid_day + DATEDIFF( NOW(), ivt.instorage_time ) AS sid_day FROM st_ivt_structivt ivt LEFT JOIN st_ivt_structattr attr ON attr.struct_id = ivt.struct_id @@ -136,8 +138,20 @@ sub.customer_description LIKE 输入.customer_name) ENDOPTION - OPTION 输入.sid_day <> "" - ( -(90 - DATEDIFF(NOW(),sub.date_of_production)) ) = 输入.sid_day + OPTION 输入.sid_day_start <> "" + DATEDIFF( NOW(), ivt.instorage_time ) >= 输入.sid_day_start + ENDOPTION + + OPTION 输入.sid_day_end <> "" + DATEDIFF( NOW(), ivt.instorage_time ) <= 输入.sid_day_end + ENDOPTION + + OPTION 输入.is_sid = "0" + DATEDIFF( NOW(), sub.date_of_production ) <= SUBSTRING_INDEX(sub.quality_guaran_period,'天',1) + ENDOPTION + + OPTION 输入.is_sid = "1" + DATEDIFF( NOW(), sub.date_of_production ) >= SUBSTRING_INDEX(sub.quality_guaran_period,'天',1) ENDOPTION ENDSELECT