From a82c8ea82542654fda2c5b6b3d40aebe6a2f676a Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 21 Jan 2026 18:02:29 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E8=B0=83?= =?UTF-8?q?=E5=88=B6=E5=BA=A6=E5=92=8C=E9=95=80=E5=B1=82=E7=A7=8D=E7=B1=BB?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsMaterialCoil 实体类中新增调制度和镀层种类字段 - 在 WmsMaterialCoilBo 业务对象中添加对应字段定义 - 在 WmsMaterialCoilExportVo 导出视图对象中增加相关字段 - 更新 WmsMaterialCoilMapper.xml 映射文件中的查询语句 - 在 WmsMaterialCoilServiceImpl 服务实现中添加条件查询逻辑 - 扩展字段变更记录功能以支持新字段的跟踪 - 在 WmsMaterialCoilVo 视图对象中添加新字段定义 --- .../java/com/klp/domain/WmsMaterialCoil.java | 6 ++++++ .../com/klp/domain/bo/WmsMaterialCoilBo.java | 6 ++++++ .../klp/domain/vo/WmsMaterialCoilExportVo.java | 5 +++++ .../com/klp/domain/vo/WmsMaterialCoilVo.java | 6 ++++++ .../impl/WmsMaterialCoilServiceImpl.java | 18 ++++++++++++++++++ .../mapper/klp/WmsMaterialCoilMapper.xml | 7 ++++++- 6 files changed, 47 insertions(+), 1 deletion(-) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java index 767a8606..5b0067b9 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java @@ -138,5 +138,11 @@ public class WmsMaterialCoil extends BaseEntity { //发货人 private String exportBy; + + + // 调制度 + private String temperGrade; + // 镀层种类 + private String coatingType; } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java index c8575ccd..1bf107ff 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialCoilBo.java @@ -215,5 +215,11 @@ public class WmsMaterialCoilBo extends BaseEntity { private Boolean onlyScrap; private String exportBy; + + + // 调制度 + private String temperGrade; + // 镀层种类 + private String coatingType; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java index 928c630e..e5979d9e 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilExportVo.java @@ -169,4 +169,9 @@ public class WmsMaterialCoilExportVo { // 数据类型 private Integer dataType; + + // 调制度 + private String temperGrade; + // 镀层种类 + private String coatingType; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java index 2fcd9ab6..45658a99 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsMaterialCoilVo.java @@ -322,5 +322,11 @@ public class WmsMaterialCoilVo extends BaseEntity { private String exportBy; //发货人昵称 private String exportByName; + + + // 调制度 + private String temperGrade; + // 镀层种类 + private String coatingType; } 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 9ff8eea6..88e24d25 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 @@ -347,6 +347,9 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(StringUtils.isNotBlank(bo.getItemType()), "mc.item_type", bo.getItemType()); qw.eq(StringUtils.isNotBlank(bo.getCreateBy()), "mc.create_by", bo.getCreateBy()); qw.eq(StringUtils.isNotBlank(bo.getUpdateBy()), "mc.update_by", bo.getUpdateBy()); + // 锌层种类和调制度 + qw.eq(StringUtils.isNotBlank(bo.getCoatingType()), "mc.coating_type", bo.getCoatingType()); + qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade()); // 统一处理 warehouseId 与 warehouseIds： List warehouseIdList = new ArrayList<>(); if (bo.getWarehouseId() != null) { @@ -1740,6 +1743,21 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (bo.getPackagingRequirement() != null && !bo.getPackagingRequirement().equals(oldCoil.getPackagingRequirement())) { changedFields.add("包装要求: " + oldCoil.getPackagingRequirement() + " → " + bo.getPackagingRequirement()); } + if (bo.getItemId() != null && !bo.getItemId().equals(oldCoil.getItemId())) { + changedFields.add("物品ID: " + oldCoil.getItemId() + " → " + bo.getItemId()); + } + if (bo.getMaterialType() != null && !bo.getMaterialType().equals(oldCoil.getMaterialType())) { + changedFields.add("材料类型: " + oldCoil.getMaterialType() + " → " + bo.getMaterialType()); + } + if (bo.getLength() != null && !bo.getLength().equals(oldCoil.getLength())) { + changedFields.add("长度: " + oldCoil.getLength() + " → " + bo.getLength()); + } + if (bo.getTemperGrade() != null && !bo.getTemperGrade().equals(oldCoil.getTemperGrade())) { + changedFields.add("调制度: " + oldCoil.getTemperGrade() + " → " + bo.getTemperGrade()); + } + if (bo.getCoatingType() != null && !bo.getCoatingType().equals(oldCoil.getCoatingType())) { + changedFields.add("镀层种类: " + oldCoil.getCoatingType() + " → " + bo.getCoatingType()); + } newStep.put("changed_fields", String.join("; ", changedFields)); newStep.put("update_time", new java.util.Date()); diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index 9b28ee82..39dc87fd 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -98,7 +98,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.packing_status, mc.sale_id AS saleId, mc.length, - w.warehouse_name AS warehouseName, + mc.coating_type, + mc.temper_grade, su.nick_name AS saleName, aw.actual_warehouse_name AS actualWarehouseName, CASE WHEN mc.item_type = 'raw_material' THEN rm.specification @@ -372,6 +373,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.net_weight AS netWeight, -- 长度 mc.length AS length, + -- 镀层种类 + mc.coating_type AS coatingType, + -- 调制度 + mc.temper_grade AS temperGrade, -- 用途（暂无数据源） NULL AS purpose, -- 切边要求