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

rev：库存报表新增接头数

Browse Source
This commit is contained in:
liuxy
2024-06-14 17:29:30 +08:00
parent b035da2cca
commit 13cdba9ea1
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/service/impl/StructivtServiceImpl.java
View File

@@ -312,6 +312,7 @@ public class StructivtServiceImpl implements StructivtService {
mp.put("净重", json.getString("net_weight"));
mp.put("毛重", json.getString("box_weight"));
mp.put("长度", json.getString("length"));
mp.put("接头数", json.getString("joint_type"));
mp.put("计划外分切的子卷", json.getString("is_un_plan_production"));
mp.put("子卷的物性值1", json.getString("un_plan_product_property1"));
mp.put("子卷的物性值2", json.getString("un_plan_product_property2"));

6
lms/nladmin-system/src/main/java/org/nl/wms/basedata/st/wql/QST_STRUCTIVT001.wql
View File

@@ -90,7 +90,8 @@
WHEN DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '3'
END
END AS sub_type,
DATEDIFF( NOW(), sub.date_of_production ) AS stock_age
DATEDIFF( NOW(), sub.date_of_production ) AS stock_age,
sub.joint_type
FROM
ST_IVT_StructIvt ivt
@@ -243,7 +244,8 @@
WHEN DATEDIFF( NOW(), sub.date_of_production ) <= '90' THEN '1'
WHEN DATEDIFF( NOW(), sub.date_of_production ) > '90' THEN '3'
END AS sub_type,
DATEDIFF( NOW(), ivt.instorage_time ) AS stock_age
DATEDIFF( NOW(), ivt.instorage_time ) AS stock_age,
sub.joint_type
FROM
ST_IVT_StructIvt ivt
LEFT JOIN st_ivt_structattr attr ON ivt.struct_id = attr.struct_id

1
lms/nladmin-ui/src/views/wms/basedata/st/ivt/index.vue
View File

@@ -240,6 +240,7 @@
<el-table-column prop="warehousing_qty" label="待入数" :formatter="rounding"/>
<el-table-column prop="unit_name" label="计量单位"/>
<el-table-column prop="instorage_time" label="入库时间" min-width="150"/>
<el-table-column prop="joint_type" label="接头数" min-width="150"/>
<el-table-column prop="sub_type" label="子卷状态" min-width="150" :formatter="formatSubType"/>
<el-table-column prop="stock_age" label="生产时长（天）" min-width="120" />
<el-table-column prop="paper_type" label="管件类型" min-width="150"/>