From 21a662d7d80d41a925fbe6b1955307a473cd0ab3 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Tue, 25 Nov 2025 16:26:17 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=89=A9=E5=B1=95=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A7=E7=9B=B8=E5=85=B3VO=E7=B1=BB=E7=BB=A7=E6=89=BFBaseEnt?=
 =?UTF-8?q?ity=E5=B9=B6=E6=96=B0=E5=A2=9E=E5=85=B3=E8=81=94=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- WmsDeliveryPlanVo类继承BaseEntity基类
- WmsDeliveryWaybillDetailVo类继承BaseEntity基类
- WmsDeliveryWaybillVo类继承BaseEntity基类
- WmsDeliveryPlanVo新增waybills字段用于关联发货单列表
- 各VO类添加必要的导入依赖包
---
 .../main/java/com/klp/domain/vo/WmsDeliveryPlanVo.java   | 9 ++++++++-
 .../com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java    | 3 ++-
 .../java/com/klp/domain/vo/WmsDeliveryWaybillVo.java     | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

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 87f0716d..63c35993 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
@@ -1,11 +1,14 @@
 package com.klp.domain.vo;
 
 import java.util.Date;
+import java.util.List;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
+import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 
@@ -17,7 +20,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsDeliveryPlanVo {
+public class WmsDeliveryPlanVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
@@ -46,5 +49,9 @@ public class WmsDeliveryPlanVo {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 关联的发货单列表
+     */
+    private List<WmsDeliveryWaybillVo> waybills;
 
 }
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
index e89d106c..1d5c6864 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillDetailVo.java
@@ -5,6 +5,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
+import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 
@@ -16,7 +17,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsDeliveryWaybillDetailVo {
+public class WmsDeliveryWaybillDetailVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
 
diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java
index ac8120e3..3a3e5e04 100644
--- a/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java
+++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsDeliveryWaybillVo.java
@@ -6,6 +6,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.klp.common.annotation.ExcelDictFormat;
 import com.klp.common.convert.ExcelDictConvert;
+import com.klp.common.core.domain.BaseEntity;
 import lombok.Data;
 
 
@@ -17,7 +18,7 @@ import lombok.Data;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class WmsDeliveryWaybillVo {
+public class WmsDeliveryWaybillVo extends BaseEntity {
 
     private static final long serialVersionUID = 1L;