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) {