From cff1bdc46bfc64617006883defe42c8fe002700a Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Mon, 8 Dec 2025 14:42:28 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=8F=91?=
=?UTF-8?q?=E8=B4=A7=E8=AE=A1=E5=88=92=E5=AE=A1=E6=A0=B8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 在 WmsDeliveryPlan 实体中新增 auditStatus、auditBy 和 auditTime 字段
- 在 WmsDeliveryPlanBo 业务对象中同步新增审核相关字段
- 更新 WmsDeliveryPlanMapper.xml 映射文件以支持新字段查询
- 在 WmsDeliveryPlanServiceImpl 查询条件构造器中增加 auditStatus 筛选
- 在 WmsDeliveryPlanVo 视图对象中新增审核字段并配置日期格式化注解
---
.../src/main/java/com/klp/domain/WmsDeliveryPlan.java | 10 ++++++++++
.../main/java/com/klp/domain/bo/WmsDeliveryPlanBo.java | 10 +++++++++-
.../main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java | 10 ++++++++++
.../klp/service/impl/WmsDeliveryPlanServiceImpl.java | 1 +
.../resources/mapper/klp/WmsDeliveryPlanMapper.xml | 3 +++
5 files changed, 33 insertions(+), 1 deletion(-)
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 @@
+
+
+