From 3106b2c530c9e3254f12f24d0ad8a2fe9057286b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Tue, 2 Jun 2026 13:35:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms/report):=20=E6=96=B0=E5=A2=9E=E7=90=86?= =?UTF-8?q?=E8=AE=BA=E5=8E=9A=E5=BA=A6=E3=80=81=E7=90=86=E8=AE=BA=E9=95=BF?= =?UTF-8?q?=E5=BA=A6=E4=B8=8E=E9=95=80=E9=93=AC=E5=8D=B7=E5=8F=B7=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=87=B3=E9=92=A2=E5=8D=B7=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 在钢卷入库报表中新增以下字段： 1. 理论厚度（theoreticalThickness） 2. 理论长度（theoreticalLength） 3. 镀铬卷号（chromePlateCoilNo） 调整涉及前端报表展示列配置、后端导出列映射及理论计算公式注释修正。调整前，报表仅展示物理属性与材质属性的基础字段；调整后，新增理论计算字段与镀铬卷号，提升报表信息完整性与业务分析能力。同时修正理论计算公式注释中的单位转换符号，将除1000更正为乘1000，确保公式表述准确。 --- klp-ui/src/views/wms/report/receive.vue | 4 ++-- .../java/com/klp/controller/WmsMaterialCoilController.java | 3 +++ .../java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/klp-ui/src/views/wms/report/receive.vue b/klp-ui/src/views/wms/report/receive.vue index 2f585050..0b901cd3 100644 --- a/klp-ui/src/views/wms/report/receive.vue +++ b/klp-ui/src/views/wms/report/receive.vue @@ -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'], diff --git a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java index fb5a391b..beeeef8e 100644 --- a/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java +++ b/klp-wms/src/main/java/com/klp/controller/WmsMaterialCoilController.java @@ -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); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index 8423c916..012aeefe 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -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) {