From 3f44cb30434b0ca513e232c69efbe7568bcd896b Mon Sep 17 00:00:00 2001 From: liuxy Date: Fri, 15 Mar 2024 16:16:51 +0800 Subject: [PATCH] =?UTF-8?q?rev=EF=BC=9A=E6=88=90=E5=93=81=E5=87=BA?= =?UTF-8?q?=E5=BA=93=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=AE=A1=E4=BB=B6=E7=BC=96=E7=A0=81=E3=80=81=E7=AE=A1=E4=BB=B6?= =?UTF-8?q?=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql | 2 +- .../org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) 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 f06c3ed29..f8df38c80 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 @@ -82,7 +82,7 @@ WHEN DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '3' END AS sub_type, - DATEDIFF( NOW(), ivt.instorage_time ) AS stock_age + DATEDIFF( NOW(), sub.date_of_production ) AS stock_age FROM ST_IVT_StructIvt ivt diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java index 82ddf84b5..5f41caf70 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java @@ -296,6 +296,8 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mp.put("净重", json.getString("net_weight")); mp.put("单位", json.getString("qty_unit_name")); mp.put("管件类型", json.getString("paper_type")); + mp.put("管件编码", json.getString("paper_code")); + mp.put("管件描述", json.getString("paper_name")); mp.put("客户编码", json.getString("customer_name")); mp.put("发货客户名称", json.getString("customer_description")); if (ObjectUtil.isEmpty(json.getString("sale_order_name"))) {