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

3
lms/nladmin-ui/src/views/wms/stat/inbillquery/index2.vue
View File

@@ -217,7 +217,8 @@
<el-table-column show-overflow-tooltip prop="confirm_time" label="入库日期" :min-width="flexWidth('confirm_time',crud.data,'入库日期')" />
<el-table-column show-overflow-tooltip prop="date_of_production" label="生产日期" :min-width="flexWidth('date_of_production',crud.data,'生产日期')" />
<el-table-column show-overflow-tooltip prop="input_optname" label="入库人" :min-width="flexWidth('input_optname',crud.data,'入库人')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width" label="产品规格" :min-width="flexWidth('width',crud.data,'产品规格')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width" label="产品实际幅宽" :min-width="flexWidth('width',crud.data,'产品实际幅宽')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="width_standard" label="客户要求幅宽" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
<el-table-column v-if="crud.query.is_all === '0'" show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />

3
lms/nladmin-ui/src/views/wms/stat/outbillquery/index2.vue
View File

@@ -133,7 +133,8 @@
<el-table-column show-overflow-tooltip prop="sale_order_name" label="销售订单" :min-width="flexWidth('sale_order_name',crud.data,'销售订单')" />
<el-table-column show-overflow-tooltip prop="old_sale_order_name" label="原销售订单" :min-width="flexWidth('old_sale_order_name',crud.data,'原销售订单')" />
<el-table-column show-overflow-tooltip prop="confirm_time" label="出库日期" :min-width="flexWidth('confirm_time',crud.data,'出库日期')" />
<el-table-column show-overflow-tooltip prop="width" label="产品规格" :formatter="crud.formatNum1" :min-width="flexWidth('width',crud.data,'产品规格')" />
<el-table-column show-overflow-tooltip prop="width" label="产品实际幅宽" :formatter="crud.formatNum1" :min-width="flexWidth('width',crud.data,'产品实际幅宽')" />
<el-table-column show-overflow-tooltip prop="width_standard" label="客户要求幅宽" :formatter="crud.formatNum1" :min-width="flexWidth('width_standard',crud.data,'客户要求幅宽')" />
<el-table-column show-overflow-tooltip prop="thickness" label="产品厚度" :min-width="flexWidth('thickness',crud.data,'产品厚度')" />
<el-table-column show-overflow-tooltip prop="paper_type" label="管件类型" :min-width="flexWidth('paper_type',crud.data,'管件类型')" />
<el-table-column show-overflow-tooltip prop="paper_code" label="管件编码" :min-width="flexWidth('paper_code',crud.data,'管件编码')" />