From 71159a496be09159625e710d4ba30b175e59ee11 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 7 Mar 2026 11:28:39 +0800 Subject: [PATCH] =?UTF-8?q?feat(domain):=20=E6=B7=BB=E5=8A=A0=E6=9D=90?= =?UTF-8?q?=E6=96=99=E5=8D=B7=E6=9D=90=E4=B8=9A=E5=8A=A1=E7=94=A8=E9=80=94?= =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E5=85=B3=E8=81=94=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 WmsMaterialCoil 实体类中新增 businessPurpose 和 isRelatedToOrder 字段 - 在 WmsMaterialCoilBo 业务对象中同步添加对应字段 - 在 WmsMaterialCoilVo 视图对象中添加相应属性定义 - 更新 MyBatis 映射文件中的查询字段和条件过滤逻辑 - 实现在查询条件中支持按业务用途和订单关联状态进行筛选 --- .../src/main/java/com/klp/domain/WmsMaterialCoil.java | 7 +++++++ .../java/com/klp/domain/bo/WmsMaterialCoilBo.java | 7 +++++++ .../java/com/klp/domain/vo/WmsMaterialCoilVo.java | 7 +++++++ .../klp/service/impl/WmsMaterialCoilServiceImpl.java | 4 ++++ .../resources/mapper/klp/WmsMaterialCoilMapper.xml | 11 ++++++++--- 5 files changed, 33 insertions(+), 3 deletions(-) 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 99f7c908..69d5e9f3 100644 --- a/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java +++ b/klp-wms/src/main/java/com/klp/domain/WmsMaterialCoil.java @@ -142,6 +142,13 @@ public class WmsMaterialCoil extends BaseEntity { // 调制度 private String temperGrade; + + // 业务用途（如：生产领用、销售发货、样品送检、内部调拨等） + private String businessPurpose; + + // 是否与订单相关（0=否，1=是） + private Integer isRelatedToOrder; + // 镀层种类 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 92bb7989..cad12c2f 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 @@ -235,6 +235,13 @@ public class WmsMaterialCoilBo extends BaseEntity { // 调制度 private String temperGrade; + + // 业务用途（如：生产领用、销售发货、样品送检、内部调拨等） + private String businessPurpose; + + // 是否与订单相关（0=否，1=是） + private Integer isRelatedToOrder; + // 镀层种类 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 a468c784..16001a65 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 @@ -331,6 +331,13 @@ public class WmsMaterialCoilVo extends BaseEntity { // 调制度 private String temperGrade; + + // 业务用途（如：生产领用、销售发货、样品送检、内部调拨等） + private String businessPurpose; + + // 是否与订单相关（0=否，1=是） + private Integer isRelatedToOrder; + // 镀层种类 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 d5e847ba..d26dac29 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 @@ -417,6 +417,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade()); // 独占状态 qw.eq(bo.getExclusiveStatus() != null, "mc.exclusive_status", bo.getExclusiveStatus()); + // 业务用途 + qw.eq(StringUtils.isNotBlank(bo.getBusinessPurpose()), "mc.business_purpose", bo.getBusinessPurpose()); + // 是否与订单相关（0=否，1=是） + qw.eq(bo.getIsRelatedToOrder() != null, "mc.is_related_to_order", bo.getIsRelatedToOrder()); //逻辑删除 qw.eq("mc.del_flag", 0); // 统一处理 warehouseId 与 warehouseIds： diff --git a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml index bbdf3ea7..3337d400 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsMaterialCoilMapper.xml @@ -102,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.length, mc.coating_type, mc.temper_grade, + mc.business_purpose, + mc.is_related_to_order, mc.exclusive_status, su.nick_name AS saleName, w.warehouse_name AS warehouseName, @@ -383,8 +385,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.coating_type AS coatingType, -- 调制度 mc.temper_grade AS temperGrade, - -- 用途（暂无数据源） - NULL AS purpose, + -- 业务用途 + mc.business_purpose AS businessPurpose, + -- 是否与订单相关 + mc.is_related_to_order AS isRelatedToOrder, -- 切边要求 mc.trimming_requirement AS trimmingRequirement, -- 包装种类 @@ -472,7 +476,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mc.length AS length, mc.coating_type AS coatingType, mc.temper_grade AS temperGrade, - NULL AS purpose, + mc.business_purpose AS businessPurpose, + mc.is_related_to_order AS isRelatedToOrder, mc.trimming_requirement AS trimmingRequirement, mc.packaging_requirement AS packagingRequirement, mc.quality_status AS qualityStatus,