From f16ec51787ed0cb094b71ff8146c740d944f729d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 15 五月 2025 11:40:54 +0800
Subject: [PATCH] Merge branch 'dev_platePlanv2' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateOrderPlanManager.java |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 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 47d6d07..28b0904 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
@@ -22,15 +22,17 @@
 
     /** 宸ュ崟ID */
     @Excel(name = "宸ュ崟ID")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long id;
 
     /** 闇�姹侷D */
     @Excel(name = "闇�姹侷D")
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
     private Long requireId;
 
     /** 闇�姹傝拷婧疘D */
     @Excel(name = "闇�姹傝拷婧疘D")
-    private Long requireTraceId;
+    private Long requireTrackId;
 
     /** 宸ュ崟鍙� */
     @Excel(name = "宸ュ崟鍙�")
@@ -90,4 +92,21 @@
     @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 startDate;
+
+    /** 闇�姹傝鍒掑紑瀹屾棩 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "闇�姹傝鍒掑紑瀹屾棩", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date completeDate;
+
+    /** 鑷畾涔夋棩鏈� */
+//    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+//    @Excel(name = "鑷畾涔夋棩鏈�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+//    private Date customTime;
+
+    private Integer requireNum;
 }

--
Gitblit v1.9.3