root/lanzhouhailiang_one
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed:

Browse Source 
新成品入库查询-->
界面：产品规格改成产品实际幅宽，新增客户要求幅宽
导出：同步导出这两个字段：产品实际幅宽、客户要求幅宽
新成品出库查询-->
界面：产品规格改成产品实际幅宽，新增客户要求幅宽
导出：同步导出这两个字段：产品实际幅宽、客户要求幅宽
This commit is contained in:
yangyufu
2026-04-03 13:33:38 +08:00
parent b733f3713c
commit 7b3cff7acd
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/InBillQueryServiceImpl.java
View File

@@ -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("木箱");

3
lms/nladmin-system/src/main/java/org/nl/wms/stat/service/impl/OutBillQueryServiceImpl.java
View File

@@ -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"));

1
lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_INBILLQUERY.wql
View File

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

6
lms/nladmin-system/src/main/java/org/nl/wms/stat/wql/ST_IVT_OUTBILLQUERY.wql
View File

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