From 7097f55c291cc62ab29d9f52caef80f605247e40 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 08 五月 2025 22:01:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java |   25 ++++++++++++++++++++-----
 1 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
index e391b63..c19ae34 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java
@@ -9,10 +9,10 @@
 import java.util.Date;
 
 /**
- * 鏍囧噯宸ヨ壓璺嚎Header瀵硅薄 aps_standard_process_route_header
+ * 閽ｉ噾宸ュ崟璁″垝绠＄悊
  * 
- * @author zhl
- * &#064;date  2025-05-06
+ * @author sfd
+ * &#064;date  2025-05-08
  */
 @Data
 public class ApsPlateOrderPlanManager
@@ -20,13 +20,17 @@
     @Serial
     private static final long serialVersionUID = 1L;
 
+    /** 宸ュ崟ID */
+    @Excel(name = "宸ュ崟ID")
+    private Long id;
+
     /** 闇�姹侷D */
     @Excel(name = "闇�姹侷D")
-    private String requireId;
+    private Long requireId;
 
     /** 闇�姹傝拷婧疘D */
     @Excel(name = "闇�姹傝拷婧疘D")
-    private String requireTraceId;
+    private Long requireTraceId;
 
     /** 宸ュ崟鍙� */
     @Excel(name = "宸ュ崟鍙�")
@@ -79,10 +83,21 @@
     private Date planEndDay;
 
     /** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
+    @Excel(name = "鏈尮閰嶇殑鐢熶骇鏁伴噺")
     private BigDecimal unmatchedQuantity;
 
     /** 宸ュ崟鍒涘缓鏃堕棿 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date orderCreateTime;
+
+    /** 闇�姹傝鍒掑紑宸ユ棩 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "闇�姹傝鍒掑紑宸ユ棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startDay;
+
+    /** 闇�姹傝鍒掑紑瀹屾棩 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "闇�姹傝鍒掑紑瀹屾棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date completeDay;
 }

--
Gitblit v1.9.3