From 8d71dad251ee34708e5ab9d18fba4c9778286725 Mon Sep 17 00:00:00 2001 From: liuxy Date: Sat, 15 Jun 2024 21:23:09 +0800 Subject: [PATCH 1/2] =?UTF-8?q?rev=EF=BC=9A=E6=89=93=E5=8D=B0=E7=B1=B3?= =?UTF-8?q?=E6=95=B0=E4=BF=9D=E7=95=992=E4=BD=8D=E5=B0=8F=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java index a4b39fac9..37b0ea539 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/pda/st/service/impl/PrintServiceImpl.java @@ -153,7 +153,7 @@ public class PrintServiceImpl implements PrintService { + box_jo.getString("customer_description") + "," + box_jo.getString("thickness") + "," + box_jo.getString("mass_per_unit_area") + "," - + box_jo.getString("length") + "," + + NumberUtil.round(box_jo.getString("length"), 2) + "," + box_jo.getString("box_type") + "," + box_jo.getString("sap_pcsn") + "," + box_jo.getString("box_length") + "," @@ -295,7 +295,7 @@ public class PrintServiceImpl implements PrintService { + box_jo.getString("customer_description") + "," + box_jo.getString("thickness") + "," + box_jo.getString("mass_per_unit_area") + "," - + box_jo.getString("length") + "," + + NumberUtil.round(box_jo.getString("length"), 2) + "," + box_jo.getString("box_type") + "," + box_jo.getString("sap_pcsn") + "," + box_jo.getString("box_length") + "," From 61d28d7138b0ecc3fc9ccc309b55612106f7a31b Mon Sep 17 00:00:00 2001 From: liuxy Date: Mon, 17 Jun 2024 15:38:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?rev=EF=BC=9A=E5=BA=93=E5=AD=98=E6=8A=A5?= =?UTF-8?q?=E8=A1=A8=E5=85=A5=E5=BA=93=E6=97=B6=E9=97=B4=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../st/service/impl/StructivtServiceImpl.java | 2 +- .../wms/basedata/st/wql/QST_STRUCTIVT001.wql | 34 +++++++++++++++++-- .../src/views/wms/basedata/st/ivt/index.vue | 2 +- 3 files changed, 34 insertions(+), 4 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java index 7b0d48823..4957fe537 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java @@ -296,7 +296,7 @@ public class StructivtServiceImpl implements StructivtService { mp.put("客户名称", json.getString("customer_description")); mp.put("销售订单", json.getString("sale_order_name")); mp.put("业务员", json.getString("sales_owner")); - mp.put("入库日期", json.getString("instorage_time")); + mp.put("入库日期", json.getString("confirm_time")); mp.put("生产日期", json.getString("date_of_production")); if ("1".equals(json.getString("sub_type"))) { mp.put("子卷状态", "正常"); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql index c0b1e2cf6..170793a81 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql @@ -91,7 +91,8 @@ END END AS sub_type, DATEDIFF( NOW(), sub.date_of_production ) AS stock_age, - sub.joint_type + sub.joint_type, + dis.confirm_time FROM ST_IVT_StructIvt ivt @@ -115,6 +116,20 @@ WHERE plan1.is_delete = '0' GROUP BY container_name) plan ON plan.container_name = sub.container_name + LEFT JOIN ( + SELECT + MIN( mst.confirm_time ) AS confirm_time, + dis.pcsn + FROM + st_ivt_iostorinvdis dis + LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + WHERE + mst.io_type = '0' + AND mst.bill_type = '0001' + AND mst.is_delete = '0' + GROUP BY + dis.pcsn + ) dis ON dis.pcsn = ivt.pcsn WHERE 1 = 1 @@ -245,7 +260,8 @@ WHEN DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '3' END AS sub_type, DATEDIFF( NOW(), ivt.instorage_time ) AS stock_age, - sub.joint_type + sub.joint_type, + dis.confirm_time FROM ST_IVT_StructIvt ivt LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id @@ -269,6 +285,20 @@ WHERE plan1.is_delete = '0' GROUP BY container_name) plan ON plan.container_name = sub.container_name + LEFT JOIN ( + SELECT + MIN( mst.confirm_time ) AS confirm_time, + dis.pcsn + FROM + st_ivt_iostorinvdis dis + LEFT JOIN st_ivt_iostorinv mst ON mst.iostorinv_id = dis.iostorinv_id + WHERE + mst.io_type = '0' + AND mst.bill_type = '0001' + AND mst.is_delete = '0' + GROUP BY + dis.pcsn + ) dis ON dis.pcsn = ivt.pcsn WHERE 1 = 1 and attr.stor_id in 输入.in_stor_id diff --git a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue index ea1de6182..2cb0dcbe7 100644 --- a/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue +++ b/lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue @@ -239,7 +239,7 @@ - +