DeXun/klp-oa
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms/report): 新增理论厚度、理论长度与镀铬卷号字段至钢卷报表

Browse Source 
在钢卷入库报表中新增以下字段：
1. 理论厚度（theoreticalThickness）
2. 理论长度（theoreticalLength）
3. 镀铬卷号（chromePlateCoilNo）

调整涉及前端报表展示列配置、后端导出列映射及理论计算公式注释修正。调整前，报表仅展示物理属性与材质属性的基础字段；调整后，新增理论计算字段与镀铬卷号，提升报表信息完整性与业务分析能力。同时修正理论计算公式注释中的单位转换符号，将除1000更正为乘1000，确保公式表述准确。
This commit is contained in:
Joshi
2026-06-02 13:35:29 +08:00
parent b59bb1789e
commit 3106b2c530
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
klp-ui/src/views/wms/report/receive.vue
View File

@@ -214,8 +214,8 @@ export default {
'基本信息': ['itemTypeDesc', 'warehouseName', 'actualWarehouseName', 'dataTypeText'],
'钢卷号': ['enterCoilNo', 'supplierCoilNo', 'currentCoilNo'],
'时间': ['createTime', 'exportTime', 'exportBy'],
'物理属性': ['netWeight', 'length', 'specification', 'actualThickness'],
'材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType'],
'物理属性': ['netWeight', 'length', 'specification', 'actualThickness', 'theoreticalThickness', 'theoreticalLength'],
'材质属性': ['material', 'manufacturer', 'surfaceTreatmentDesc', 'zincLayer', 'packingStatus', 'temperGrade', 'coatingType', 'chromePlateCoilNo'],
'用途': ['purpose', 'businessPurpose'],
'状态': ['qualityStatus', 'statusDesc', 'isRelatedToOrderText'],
'其他': ['itemName', 'itemId', 'packagingRequirement', 'trimmingRequirement', 'transferType', 'saleName', 'remark', 'team'],

3
klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java
View File

@@ -173,6 +173,9 @@ public class WmsMaterialCoilController extends BaseController {
columns.put("actualThickness", "实测厚度");
columns.put("transferType", "调拨类型");
columns.put("team", "班组");
columns.put("theoreticalThickness", "理论厚度");
columns.put("theoreticalLength", "理论长度");
columns.put("chromePlateCoilNo", "镀铬卷号");
return R.ok(columns);
}

4
klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java
View File

@@ -1043,8 +1043,8 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
/**
* 根据净重(吨)、规格厚度和宽度自动计算理论厚度(mm)和理论长度(m)
* 理论厚度 = 净重(吨) × 1000 / 7.85 / 实测长度(mm) / 宽度(mm) / 1000
* 理论长度 = 净重(吨) × 1000 / 7.85 / 厚度(mm) / 宽度(mm) / 1000
* 理论厚度 = 净重(吨) × 1000 / 7.85 / 实测长度(mm) / 宽度(mm) * 1000
* 理论长度 = 净重(吨) × 1000 / 7.85 / 厚度(mm) / 宽度(mm) * 1000
*/
private void calculateTheoretical(WmsMaterialCoilBo bo) {
if (bo.getNetWeight() == null) {