diff --git a/klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java b/klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java
index 2609f53f..8b43fe78 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsDeliveryPlan.java
@@ -7,6 +7,7 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 发货计划对象 wms_delivery_plan
@@ -51,4 +52,13 @@ public class WmsDeliveryPlan extends BaseEntity {
// 钢卷集合
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;
+
}
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java
index 47611b11..01331195 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java
@@ -7,6 +7,7 @@ import javax.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 发货计划业务对象 wms_delivery_plan
@@ -46,5 +47,12 @@ public class WmsDeliveryPlanBo extends BaseEntity {
// 钢卷集合
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;
}
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java
index b4ce46cc..1befe163 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java
@@ -10,6 +10,7 @@ import com.klp.common.annotation.ExcelDictFormat;
import com.klp.common.convert.ExcelDictConvert;
import com.klp.common.core.domain.BaseEntity;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -74,4 +75,13 @@ public class WmsDeliveryPlanVo extends BaseEntity {
// 钢卷集合
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;
+
}
diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java
index 422a6372..1680e119 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsDeliveryPlanServiceImpl.java
@@ -91,6 +91,7 @@ public class WmsDeliveryPlanServiceImpl implements IWmsDeliveryPlanService {
lqw.like(StringUtils.isNotBlank(bo.getPlanName()), WmsDeliveryPlan::getPlanName, bo.getPlanName());
lqw.eq(bo.getPlanDate() != null, WmsDeliveryPlan::getPlanDate, bo.getPlanDate());
lqw.eq(bo.getPlanType() != null, WmsDeliveryPlan::getPlanType, bo.getPlanType());
+ lqw.eq(bo.getAuditStatus() != null, WmsDeliveryPlan::getAuditStatus, bo.getAuditStatus());
return lqw;
}
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
index 8ed7a445..32cb8357 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml
@@ -10,6 +10,9 @@
+
+
+