From c357f8844e03627d0c3bea4bf2058e7c69ff3518 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 14:18:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java |   76 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 76 insertions(+), 0 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
index b8a3b62..bd68f2a 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlateProcessShopPlanStat.java
@@ -8,6 +8,7 @@
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -27,10 +28,25 @@
     @Excel(name = "涓讳欢鏂欏彿")
     private String mainPartNumber;
 
+    /** 涓讳欢瀹㈡埛 */
+    @Schema(description = "涓讳欢瀹㈡埛锛屾潵鑷狤RP", type = "String")
+    @Excel(name = "涓讳欢瀹㈡埛")
+    private String customer;
+
+    /** 涓讳欢璁㈠崟浜ゆ湡 */
+    @Schema(description = "涓讳欢璁㈠崟浜ゆ湡锛屾潵鑷狤RP", type = "String")
+    @Excel(name = "涓讳欢璁㈠崟浜ゆ湡")
+    private BigInteger mainOrderDelivery;
+
     /** 涓氬姟绫诲瀷 */
     @Schema(description = "涓氬姟绫诲瀷", type = "String")
     @Excel(name = "涓氬姟绫诲瀷")
     private String businessType;
+
+    /** 鐣彿 */
+    @Schema(description = "闇�姹傝拷婧彿锛岀敱APS浜х敓", type = "String")
+    @Excel(name = "鐣彿")
+    private String designation;
 
     /** 鍗曟嵁鍙� */
     @Schema(description = "鍗曟嵁鍙�", type = "String")
@@ -73,11 +89,71 @@
     @Excel(name = "鐢熶骇鏁伴噺")
     private BigDecimal productionQuantity;
 
+    /** 宸ュ崟鍒涘缓鏃堕棿 */
+    @Schema(description = "宸ュ崟鍒涘缓鏃堕棿锛屾潵鑷狤RP", type = "String")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "宸ュ崟鍒涘缓鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date orderCreateTime;
+
+    /** 宸ュ崟瀹℃牳鏃堕棿 */
+    @Schema(description = "宸ュ崟瀹℃牳鏃堕棿锛屾潵鑷狤RP", type = "String")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date approveOn;
+
+    /** 宸ュ崟寮�宸ユ椂闂� */
+    @Schema(description = "宸ュ崟寮�宸ユ椂闂达紝鏉ヨ嚜ERP", type = "String")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startWorkDate;
+
+    /** 鍐嶆纭瀹屽伐鏃堕棿 */
+    @Schema(description = "鍐嶆纭瀹屽伐鏃堕棿锛屾潵鑷狝PS", type = "String")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "鍐嶆纭瀹屽伐鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date workOrderConfirmTime;
+
     /** 璁″垝瀹屽伐鏃� */
     @Schema(description = "璁″垝瀹屽伐鏃�", type = "String")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "璁″垝瀹屽伐鏃�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date planEndDay;
 
+    /** 鐗堟湰鍙� */
+    @Schema(description = "鐢熶骇宸ュ巶锛屾潵鑷狤RP", type = "String")
+    @Excel(name = "鐢熶骇宸ュ巶")
+    private String productionBase;
+
+    /** 鐗堟湰鍙� */
+    @Schema(description = "榻愬鐘跺喌锛屾潵鑷狤RP", type = "String")
+    @Excel(name = "榻愬鐘跺喌")
+    private String kittingCondition;
+
+    /** 璁″垝榻愬鏃堕棿 */
+    @Schema(description = "璁″垝榻愬鏃堕棿锛屾潵鑷狤RP", type = "String")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "璁″垝榻愬鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date planKittingTime;
+
+    /** 宸ュ簭鍙� */
+    @Excel(name = "宸ュ簭鍙�")
+    private String processNumber;
+
+    /** 鎵�灞為儴闂� */
+    @Excel(name = "鎵�灞為儴闂�")
+    private String department;
+    /** 涓嬮亾宸ュ簭鎵�灞為儴闂� */
+    @Excel(name = "涓嬮亾宸ュ簭鎵�灞為儴闂�")
+    private String nextProcessDeparment;
+
+    /** 褰撳墠宸ュ簭鐘舵�� */
+    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+    private String opStatus;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+    private String nextOpName;
+
+
     private List<ApsPlateProcessShopStat> deptPlans=new ArrayList<>();
 }

--
Gitblit v1.9.3