From db691a68a70332b36e93f818b296d292ae5638f6 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 14 Nov 2025 10:31:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(wms):=20=E6=96=B0=E5=A2=9E=E7=89=A9?= =?UTF-8?q?=E6=96=99=E5=8D=B7=E8=B4=A8=E9=87=8F=E4=B8=8E=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E5=8F=98=E6=9B=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 记录质量状态字段变更历史 - 记录切边要求字段变更历史 - 记录打包状态字段变更历史 - 记录包装要求字段变更历史 --- .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 59b5b984..78ff9b82 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 @@ -906,6 +906,18 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { if (bo.getRemark() != null && !bo.getRemark().equals(oldCoil.getRemark())) { changedFields.add("备注: " + oldCoil.getRemark() + " → " + bo.getRemark()); } + if (bo.getQualityStatus() != null && !bo.getQualityStatus().equals(oldCoil.getQualityStatus())) { + changedFields.add("质量状态: " + oldCoil.getQualityStatus() + " → " + bo.getQualityStatus()); + } + if (bo.getTrimmingRequirement() != null && !bo.getTrimmingRequirement().equals(oldCoil.getTrimmingRequirement())) { + changedFields.add("切边要求: " + oldCoil.getTrimmingRequirement() + " → " + bo.getTrimmingRequirement()); + } + if (bo.getPackingStatus() != null && !bo.getPackingStatus().equals(oldCoil.getPackingStatus())) { + changedFields.add("打包状态: " + oldCoil.getPackingStatus() + " → " + bo.getPackingStatus()); + } + if (bo.getPackagingRequirement() != null && !bo.getPackagingRequirement().equals(oldCoil.getPackagingRequirement())) { + changedFields.add("包装要求: " + oldCoil.getPackagingRequirement() + " → " + bo.getPackagingRequirement()); + } newStep.put("changed_fields", String.join("; ", changedFields)); newStep.put("update_time", new java.util.Date()); From a3269487e4cd1bcc0eac5c175027abbf0c228991 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 14 Nov 2025 16:58:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E4=BA=A7?= =?UTF-8?q?=E5=93=81=E5=92=8C=E5=8E=9F=E6=9D=90=E6=96=99=E7=9A=84=E6=9D=90?= =?UTF-8?q?=E8=B4=A8=E3=80=81=E5=8E=82=E5=AE=B6=E3=80=81=E8=A1=A8=E9=9D=A2?= =?UTF-8?q?=E5=A4=84=E7=90=86=E5=8F=8A=E9=94=8C=E5=B1=82=E5=8E=9A=E5=BA=A6?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsProduct和WmsRawMaterial实体类中新增material、manufacturer、 surfaceTreatmentDesc和zincLayer字段 - 更新对应的BO和VO类，同步添加上述四个字段 - 修改Mapper XML文件，增加新字段的映射配置 - 在Service实现类中，为新字段添加查询条件支持 - 导入必要的MyBatis注解以支持字段映射 --- .../main/java/com/klp/domain/WmsProduct.java | 20 ++++++++++++++++ .../java/com/klp/domain/WmsRawMaterial.java | 21 +++++++++++++++++ .../java/com/klp/domain/bo/WmsProductBo.java | 23 +++++++++++++++++++ .../com/klp/domain/bo/WmsRawMaterialBo.java | 20 ++++++++++++++++ .../java/com/klp/domain/vo/WmsProductVo.java | 21 +++++++++++++++++ .../com/klp/domain/vo/WmsRawMaterialVo.java | 20 ++++++++++++++++ .../service/impl/WmsProductServiceImpl.java | 4 ++++ .../impl/WmsRawMaterialServiceImpl.java | 5 ++++ .../resources/mapper/klp/WmsProductMapper.xml | 5 ++++ .../mapper/klp/WmsRawMaterialMapper.xml | 5 ++++ 10 files changed, 144 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/WmsProduct.java b/klp-wms/src/main/java/com/klp/domain/WmsProduct.java index 6378bb64..2d4470ad 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsProduct.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsProduct.java @@ -95,5 +95,25 @@ public class WmsProduct extends BaseEntity { //规格 private String specification; + /** + * 材质 + */ + private String material; + + /** + * 厂家 + */ + private String manufacturer; + + /** + * 表面处理详情 + */ + private String surfaceTreatmentDesc; + + /** + * 锌层厚度 + */ + private String zincLayer; + } diff --git a/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java b/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java index 0b97da44..6d71805d 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsRawMaterial.java @@ -135,5 +135,26 @@ public class WmsRawMaterial extends BaseEntity { //规格 private String specification; + + /** + * 材质 + */ + private String material; + + /** + * 厂家 + */ + private String manufacturer; + + /** + * 表面处理详情 + */ + private String surfaceTreatmentDesc; + + /** + * 锌层厚度 + */ + private String zincLayer; + } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java index c97609ae..49d7407d 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsProductBo.java @@ -1,5 +1,6 @@ package com.klp.domain.bo; +import com.baomidou.mybatisplus.annotation.TableField; import com.klp.common.core.domain.BaseEntity; import com.klp.common.core.validate.AddGroup; import com.klp.common.core.validate.EditGroup; @@ -96,5 +97,27 @@ public class WmsProductBo extends BaseEntity { //规格 private String specification; + + + /** + * 材质 + */ + private String material; + + /** + * 厂家 + */ + private String manufacturer; + + /** + * 表面处理详情 + */ + private String surfaceTreatmentDesc; + + /** + * 锌层厚度 + */ + private String zincLayer; + } diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java index b1100867..ebe7fbbd 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsRawMaterialBo.java @@ -152,5 +152,25 @@ public class WmsRawMaterialBo extends BaseEntity { //规格 private String specification; + + /** + * 材质 + */ + private String material; + + /** + * 厂家 + */ + private String manufacturer; + + /** + * 表面处理详情 + */ + private String surfaceTreatmentDesc; + + /** + * 锌层厚度 + */ + private String zincLayer; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java index 8cacbeeb..227293c3 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsProductVo.java @@ -126,5 +126,26 @@ public class WmsProductVo { //规格 private String specification; + + + /** + * 材质 + */ + private String material; + + /** + * 厂家 + */ + private String manufacturer; + + /** + * 表面处理详情 + */ + private String surfaceTreatmentDesc; + + /** + * 锌层厚度 + */ + private String zincLayer; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java index 3286ba88..1931f127 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsRawMaterialVo.java @@ -221,5 +221,25 @@ public class WmsRawMaterialVo { //规格 private String specification; + + /** + * 材质 + */ + private String material; + + /** + * 厂家 + */ + private String manufacturer; + + /** + * 表面处理详情 + */ + private String surfaceTreatmentDesc; + + /** + * 锌层厚度 + */ + private String zincLayer; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java index be191bf8..0b54ca39 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsProductServiceImpl.java @@ -103,6 +103,10 @@ public class WmsProductServiceImpl implements IWmsProductService { lqw.eq(StringUtils.isNotBlank(bo.getType()), WmsProduct::getType, bo.getType()); //规格模糊匹配 lqw.like(StringUtils.isNotBlank(bo.getSpecification()), WmsProduct::getSpecification, bo.getSpecification()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), WmsProduct::getMaterial, bo.getMaterial()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatmentDesc()), WmsProduct::getSurfaceTreatmentDesc, bo.getSurfaceTreatmentDesc()); + lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), WmsProduct::getManufacturer, bo.getManufacturer()); + lqw.eq(StringUtils.isNotBlank(bo.getZincLayer()), WmsProduct::getZincLayer, bo.getZincLayer()); return lqw; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java index 40cbe061..b935ffaf 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsRawMaterialServiceImpl.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.klp.common.utils.StringUtils; +import com.klp.domain.WmsProduct; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import com.klp.domain.bo.WmsRawMaterialBo; @@ -204,6 +205,10 @@ public class WmsRawMaterialServiceImpl implements IWmsRawMaterialService { lqw.eq(bo.getBomId() != null, WmsRawMaterial::getBomId, bo.getBomId()); //规格模糊匹配 lqw.like(StringUtils.isNotBlank(bo.getSpecification()), WmsRawMaterial::getSpecification, bo.getSpecification()); + lqw.eq(StringUtils.isNotBlank(bo.getMaterial()), WmsRawMaterial::getMaterial, bo.getMaterial()); + lqw.eq(StringUtils.isNotBlank(bo.getSurfaceTreatmentDesc()), WmsRawMaterial::getSurfaceTreatmentDesc, bo.getSurfaceTreatmentDesc()); + lqw.eq(StringUtils.isNotBlank(bo.getManufacturer()), WmsRawMaterial::getManufacturer, bo.getManufacturer()); + lqw.eq(StringUtils.isNotBlank(bo.getZincLayer()), WmsRawMaterial::getZincLayer, bo.getZincLayer()); return lqw; } diff --git a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml index 25ce423c..9f0de650 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsProductMapper.xml @@ -26,6 +26,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + diff --git a/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml index e9733b85..1098c31c 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsRawMaterialMapper.xml @@ -36,6 +36,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + +