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 @@
-
+
+