From 7b3cff7acd7f9aec615573ea47fbbd20b78f03ff Mon Sep 17 00:00:00 2001 From: yangyufu Date: Fri, 3 Apr 2026 13:33:38 +0800 Subject: [PATCH] =?UTF-8?q?fixed:=20=E6=96=B0=E6=88=90=E5=93=81=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E6=9F=A5=E8=AF=A2-->=20=E7=95=8C=E9=9D=A2=EF=BC=9A?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E8=A7=84=E6=A0=BC=E6=94=B9=E6=88=90=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=AE=9E=E9=99=85=E5=B9=85=E5=AE=BD=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82=E5=B9=85=E5=AE=BD?= =?UTF-8?q?=20=E5=AF=BC=E5=87=BA=EF=BC=9A=E5=90=8C=E6=AD=A5=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E8=BF=99=E4=B8=A4=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9A?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=AE=9E=E9=99=85=E5=B9=85=E5=AE=BD=E3=80=81?= =?UTF-8?q?=E5=AE=A2=E6=88=B7=E8=A6=81=E6=B1=82=E5=B9=85=E5=AE=BD=20?= =?UTF-8?q?=E6=96=B0=E6=88=90=E5=93=81=E5=87=BA=E5=BA=93=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?-->=20=E7=95=8C=E9=9D=A2=EF=BC=9A=E4=BA=A7=E5=93=81=E8=A7=84?= =?UTF-8?q?=E6=A0=BC=E6=94=B9=E6=88=90=E4=BA=A7=E5=93=81=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=B9=85=E5=AE=BD=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E8=A6=81=E6=B1=82=E5=B9=85=E5=AE=BD=20=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=EF=BC=9A=E5=90=8C=E6=AD=A5=E5=AF=BC=E5=87=BA=E8=BF=99=E4=B8=A4?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5=EF=BC=9A=E4=BA=A7=E5=93=81=E5=AE=9E?= =?UTF-8?q?=E9=99=85=E5=B9=85=E5=AE=BD=E3=80=81=E5=AE=A2=E6=88=B7=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E5=B9=85=E5=AE=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/wms/stat/service/impl/InBillQueryServiceImpl.java | 4 ++-- .../nl/wms/stat/service/impl/OutBillQueryServiceImpl.java | 3 ++- .../main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql | 1 + .../main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql | 6 +++++- lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue | 3 ++- lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue | 3 ++- 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java index 60fcd5471..bbc9a88a1 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java @@ -476,8 +476,8 @@ public class InBillQueryServiceImpl implements InBillQueryService { mp.put("客户名称", json.getString("cust_name")); mp.put("业务员", json.getString("sales_owner")); mp.put("规格", json.getString("thickness_request")); - mp.put("尺寸（mm）（客户要求幅宽）", json.getString("width_standard")); - mp.put("实际尺寸（mm）（实际幅宽）", json.getString("width")); + mp.put("产品实际幅宽", json.getString("width")); + mp.put("客户要求幅宽", json.getString("width_standard")); String box_name = json.getString("box_name"); if (StrUtil.isNotEmpty(box_name)) { String[] s = box_name.split("木箱"); 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 6770f9d54..8089a0dc1 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 @@ -459,7 +459,8 @@ public class OutBillQueryServiceImpl implements OutBillQueryService { mp.put("业务员", json.getString("sales_owner")); mp.put("出库日期", json.getString("input_time")); - mp.put("产品规格", json.getString("width")); + mp.put("产品实际幅宽", json.getString("width")); + mp.put("客户要求幅宽", json.getString("width_standard")); mp.put("产品厚度", json.getString("thickness")); mp.put("单位面积", json.getString("mass_per_unit_area")); mp.put("制单人", json.getString("input_optname")); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql index 6bd51d81a..d22b7dce0 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql @@ -656,6 +656,7 @@ sub.date_of_production, mst.input_optname, sub.width, + sub.width_standard, case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type, case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_material when plan.paper_tube_or_FRP = '2' then plan.FRP_material end AS paper_code, case when plan.paper_tube_or_FRP = '1' then plan.paper_tube_description when plan.paper_tube_or_FRP = '2' then plan.FRP_description end AS paper_name, diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql index 835fb1c76..bf51b638c 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql +++ b/lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql @@ -280,6 +280,7 @@ sub.sale_order_name, cust.sales_owner, sub.width, + sub.width_standard, sub.thickness, sub.mass_per_unit_area, case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type, @@ -335,6 +336,7 @@ max(record.customer_name) as customer_name, max(record.customer_description) as customer_description, max(record.width) as width, + max(record.width_standard) as width_standard, max(record.quanlity_in_box) boxin_num, max(record.thickness) as thickness, max(record.mass_per_unit_area) as mass_per_unit_area, @@ -405,6 +407,7 @@ sub.sale_order_name, cust.sales_owner, sub.width, + sub.width_standard, sub.thickness, sub.mass_per_unit_area, case when plan.paper_tube_or_FRP = '1' then '纸管' when plan.paper_tube_or_FRP = '2' then 'FRP管' end AS paper_type, @@ -460,6 +463,7 @@ max(record.customer_name) as customer_name, max(record.customer_description) as customer_description, max(record.width) as width, + max(record.width_standard) as width_standard, max(record.thickness) as thickness, max(record.mass_per_unit_area) as mass_per_unit_area, max(record.net_weight) as net_weight, @@ -501,4 +505,4 @@ limit 0,50000 ENDSELECT ENDQUERY - ENDIF \ No newline at end of file + ENDIF diff --git a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue index be59c0694..9a55f6b35 100644 --- a/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue +++ b/lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue @@ -217,7 +217,8 @@ - + + diff --git a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue index 05be94c4f..1173745e4 100644 --- a/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue +++ b/lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue @@ -133,7 +133,8 @@ - + +