From 1bfaca8b92e05dc6fa6a5d4225d56b4fb634af2c Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Sat, 19 Jul 2025 13:35:08 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=87=87=E8=B4=AD?=
=?UTF-8?q?=E9=9D=9E=E7=A9=BA=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/klp/domain/bo/WmsPurchasePlanBo.java | 4 ----
.../main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java | 5 -----
2 files changed, 9 deletions(-)
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanBo.java
index 35bd4d1d..69c3f765 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanBo.java
@@ -27,25 +27,21 @@ public class WmsPurchasePlanBo extends BaseEntity {
/**
* 采购计划编号
*/
- @NotBlank(message = "采购计划编号不能为空", groups = { AddGroup.class, EditGroup.class })
private String planCode;
/**
* 负责人
*/
- @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
private String owner;
/**
* 关联订单ID
*/
- @NotNull(message = "关联订单ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long orderId;
/**
* 状态（0=新建，1=待审核，2=已审核，3=已完成，4=已取消）
*/
- @NotNull(message = "状态（0=新建，1=待审核，2=已审核，3=已完成，4=已取消）不能为空", groups = { AddGroup.class, EditGroup.class })
private Integer status;
/**
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
index 8d072eef..720807e3 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
@@ -28,31 +28,26 @@ public class WmsPurchasePlanDetailBo extends BaseEntity {
/**
* 采购计划ID
*/
- @NotNull(message = "采购计划ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long planId;
/**
* 原材料ID
*/
- @NotNull(message = "原材料ID不能为空", groups = { AddGroup.class, EditGroup.class })
private Long rawMaterialId;
/**
* 负责人
*/
- @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
private String owner;
/**
* 计划采购数量
*/
- @NotNull(message = "计划采购数量不能为空", groups = { AddGroup.class, EditGroup.class })
private BigDecimal quantity;
/**
* 单位
*/
- @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
private String unit;
/**
From 487e78ff896e0f11ddbad52c3a144a809ee0d92e Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Sat, 19 Jul 2025 14:06:32 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=BB=86=E8=8A=82?=
=?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/klp/domain/WmsPurchasePlanDetail.java | 4 ++++
.../java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java | 5 +++++
.../java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java | 6 ++++++
3 files changed, 15 insertions(+)
diff --git a/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java b/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
index b8531590..900cbadf 100644
--- a/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
+++ b/klp-wms/src/main/java/com/klp/domain/WmsPurchasePlanDetail.java
@@ -45,6 +45,10 @@ public class WmsPurchasePlanDetail extends BaseEntity {
* 单位
*/
private String unit;
+ /**
+ * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
+ */
+ private Integer status;
/**
* 备注
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
index 720807e3..38156c54 100644
--- a/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
+++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsPurchasePlanDetailBo.java
@@ -50,6 +50,11 @@ public class WmsPurchasePlanDetailBo extends BaseEntity {
*/
private String unit;
+ /**
+ * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
+ */
+ private Integer status;
+
/**
* 备注
*/
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java
index e4ad0d20..4524e543 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsPurchasePlanDetailVo.java
@@ -56,6 +56,12 @@ public class WmsPurchasePlanDetailVo {
@ExcelProperty(value = "单位")
private String unit;
+ /**
+ * 状态（ 0=新建，1=在途，2=到货，3=待审核，4=采购完成）
+ */
+ @ExcelProperty(value = "状态")
+ private Integer status;
+
/**
* 备注
*/
From f4001e4bab63edd23aa43b792ecaf133062a072b Mon Sep 17 00:00:00 2001
From: JR <3573153686@qq.com>
Date: Sat, 19 Jul 2025 14:07:58 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E7=BB=86=E8=8A=82?=
=?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
index 38ab1605..814ce903 100644
--- a/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
+++ b/klp-wms/src/main/resources/mapper/klp/WmsPurchasePlanDetailMapper.xml
@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+