feat(domain): 添加材料卷材业务用途和订单关联字段
- 在 WmsMaterialCoil 实体类中新增 businessPurpose 和 isRelatedToOrder 字段 - 在 WmsMaterialCoilBo 业务对象中同步添加对应字段 - 在 WmsMaterialCoilVo 视图对象中添加相应属性定义 - 更新 MyBatis 映射文件中的查询字段和条件过滤逻辑 - 实现在查询条件中支持按业务用途和订单关联状态进行筛选
This commit is contained in:
@@ -142,6 +142,13 @@ public class WmsMaterialCoil extends BaseEntity {
|
|||||||
|
|
||||||
// 调制度
|
// 调制度
|
||||||
private String temperGrade;
|
private String temperGrade;
|
||||||
|
|
||||||
|
// 业务用途(如:生产领用、销售发货、样品送检、内部调拨等)
|
||||||
|
private String businessPurpose;
|
||||||
|
|
||||||
|
// 是否与订单相关(0=否,1=是)
|
||||||
|
private Integer isRelatedToOrder;
|
||||||
|
|
||||||
// 镀层种类
|
// 镀层种类
|
||||||
private String coatingType;
|
private String coatingType;
|
||||||
|
|
||||||
|
|||||||
@@ -235,6 +235,13 @@ public class WmsMaterialCoilBo extends BaseEntity {
|
|||||||
|
|
||||||
// 调制度
|
// 调制度
|
||||||
private String temperGrade;
|
private String temperGrade;
|
||||||
|
|
||||||
|
// 业务用途(如:生产领用、销售发货、样品送检、内部调拨等)
|
||||||
|
private String businessPurpose;
|
||||||
|
|
||||||
|
// 是否与订单相关(0=否,1=是)
|
||||||
|
private Integer isRelatedToOrder;
|
||||||
|
|
||||||
// 镀层种类
|
// 镀层种类
|
||||||
private String coatingType;
|
private String coatingType;
|
||||||
|
|
||||||
|
|||||||
@@ -331,6 +331,13 @@ public class WmsMaterialCoilVo extends BaseEntity {
|
|||||||
|
|
||||||
// 调制度
|
// 调制度
|
||||||
private String temperGrade;
|
private String temperGrade;
|
||||||
|
|
||||||
|
// 业务用途(如:生产领用、销售发货、样品送检、内部调拨等)
|
||||||
|
private String businessPurpose;
|
||||||
|
|
||||||
|
// 是否与订单相关(0=否,1=是)
|
||||||
|
private Integer isRelatedToOrder;
|
||||||
|
|
||||||
// 镀层种类
|
// 镀层种类
|
||||||
private String coatingType;
|
private String coatingType;
|
||||||
|
|
||||||
|
|||||||
@@ -417,6 +417,10 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService {
|
|||||||
qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade());
|
qw.eq(StringUtils.isNotBlank(bo.getTemperGrade()), "mc.temper_grade", bo.getTemperGrade());
|
||||||
// 独占状态
|
// 独占状态
|
||||||
qw.eq(bo.getExclusiveStatus() != null, "mc.exclusive_status", bo.getExclusiveStatus());
|
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);
|
qw.eq("mc.del_flag", 0);
|
||||||
// 统一处理 warehouseId 与 warehouseIds:
|
// 统一处理 warehouseId 与 warehouseIds:
|
||||||
|
|||||||
@@ -102,6 +102,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.length,
|
mc.length,
|
||||||
mc.coating_type,
|
mc.coating_type,
|
||||||
mc.temper_grade,
|
mc.temper_grade,
|
||||||
|
mc.business_purpose,
|
||||||
|
mc.is_related_to_order,
|
||||||
mc.exclusive_status,
|
mc.exclusive_status,
|
||||||
su.nick_name AS saleName,
|
su.nick_name AS saleName,
|
||||||
w.warehouse_name AS warehouseName,
|
w.warehouse_name AS warehouseName,
|
||||||
@@ -383,8 +385,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.coating_type AS coatingType,
|
mc.coating_type AS coatingType,
|
||||||
-- 调制度
|
-- 调制度
|
||||||
mc.temper_grade AS temperGrade,
|
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.trimming_requirement AS trimmingRequirement,
|
||||||
-- 包装种类
|
-- 包装种类
|
||||||
@@ -472,7 +476,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||||||
mc.length AS length,
|
mc.length AS length,
|
||||||
mc.coating_type AS coatingType,
|
mc.coating_type AS coatingType,
|
||||||
mc.temper_grade AS temperGrade,
|
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.trimming_requirement AS trimmingRequirement,
|
||||||
mc.packaging_requirement AS packagingRequirement,
|
mc.packaging_requirement AS packagingRequirement,
|
||||||
mc.quality_status AS qualityStatus,
|
mc.quality_status AS qualityStatus,
|
||||||
|
|||||||
Reference in New Issue
Block a user