feat(wms): 添加发货计划审核功能
- 在 WmsDeliveryPlan 实体中新增 auditStatus、auditBy 和 auditTime 字段 - 在 WmsDeliveryPlanBo 业务对象中同步新增审核相关字段 - 更新 WmsDeliveryPlanMapper.xml 映射文件以支持新字段查询 - 在 WmsDeliveryPlanServiceImpl 查询条件构造器中增加 auditStatus 筛选 - 在 WmsDeliveryPlanVo 视图对象中新增审核字段并配置日期格式化注解
This commit is contained in:
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发货计划对象 wms_delivery_plan
|
* 发货计划对象 wms_delivery_plan
|
||||||
@@ -51,4 +52,13 @@ public class WmsDeliveryPlan extends BaseEntity {
|
|||||||
// 钢卷集合
|
// 钢卷集合
|
||||||
private String coil;
|
private String coil;
|
||||||
|
|
||||||
|
//-- 1. 新增审核状态字段(核心)
|
||||||
|
private Integer auditStatus;
|
||||||
|
//-- 2. 新增审核人字段
|
||||||
|
private String auditBy;
|
||||||
|
//-- 3. 新增审核时间字段
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date auditTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import javax.validation.constraints.*;
|
|||||||
|
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发货计划业务对象 wms_delivery_plan
|
* 发货计划业务对象 wms_delivery_plan
|
||||||
@@ -46,5 +47,12 @@ public class WmsDeliveryPlanBo extends BaseEntity {
|
|||||||
// 钢卷集合
|
// 钢卷集合
|
||||||
private String coil;
|
private String coil;
|
||||||
|
|
||||||
|
//-- 1. 新增审核状态字段(核心)
|
||||||
|
private Integer auditStatus;
|
||||||
|
//-- 2. 新增审核人字段
|
||||||
|
private String auditBy;
|
||||||
|
//-- 3. 新增审核时间字段
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date auditTime;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import com.klp.common.annotation.ExcelDictFormat;
|
|||||||
import com.klp.common.convert.ExcelDictConvert;
|
import com.klp.common.convert.ExcelDictConvert;
|
||||||
import com.klp.common.core.domain.BaseEntity;
|
import com.klp.common.core.domain.BaseEntity;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
import org.springframework.format.annotation.DateTimeFormat;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -74,4 +75,13 @@ public class WmsDeliveryPlanVo extends BaseEntity {
|
|||||||
// 钢卷集合
|
// 钢卷集合
|
||||||
private String coil;
|
private String coil;
|
||||||
|
|
||||||
|
//-- 1. 新增审核状态字段(核心)
|
||||||
|
private Integer auditStatus;
|
||||||
|
//-- 2. 新增审核人字段
|
||||||
|
private String auditBy;
|
||||||
|
//-- 3. 新增审核时间字段
|
||||||
|
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
|
||||||
|
private Date auditTime;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -91,6 +91,7 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
|
|||||||
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), WmsDeliveryPlan::getPlanName, bo.getPlanName());
|
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), WmsDeliveryPlan::getPlanName, bo.getPlanName());
|
||||||
lqw.eq(bo.getPlanDate() != null, WmsDeliveryPlan::getPlanDate, bo.getPlanDate());
|
lqw.eq(bo.getPlanDate() != null, WmsDeliveryPlan::getPlanDate, bo.getPlanDate());
|
||||||
lqw.eq(bo.getPlanType() != null, WmsDeliveryPlan::getPlanType, bo.getPlanType());
|
lqw.eq(bo.getPlanType() != null, WmsDeliveryPlan::getPlanType, bo.getPlanType());
|
||||||
|
lqw.eq(bo.getAuditStatus() != null, WmsDeliveryPlan::getAuditStatus, bo.getAuditStatus());
|
||||||
return lqw;
|
return lqw;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,9 @@
|
|||||||
<result property="planDate" column="plan_date"/>
|
<result property="planDate" column="plan_date"/>
|
||||||
<result property="planType" column="plan_type"/>
|
<result property="planType" column="plan_type"/>
|
||||||
<result property="coil" column="coil"/>
|
<result property="coil" column="coil"/>
|
||||||
|
<result property="auditStatus" column="audit_status"/>
|
||||||
|
<result property="auditBy" column="audit_by"/>
|
||||||
|
<result property="auditTime" column="audit_time"/>
|
||||||
<result property="remark" column="remark"/>
|
<result property="remark" column="remark"/>
|
||||||
<result property="delFlag" column="del_flag"/>
|
<result property="delFlag" column="del_flag"/>
|
||||||
<result property="createTime" column="create_time"/>
|
<result property="createTime" column="create_time"/>
|
||||||
|
|||||||
Reference in New Issue
Block a user