From 097a230fea54afc1f0a21a16e5e9f38d45d0573e Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 10:29:48 +0800
Subject: [PATCH] 钣金计划（管理&大表）接口字段变更，管路、气柜产能负载按月统计工厂拆分，气柜管路产能规划增加工厂查询字段

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java |   56 ++++++++++++++++++++++++++++++--------------------------
 1 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
index 1ffafb4..1f6ffea 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java
@@ -3,9 +3,12 @@
 import com.aps.common.core.annotation.Excel;
 import com.aps.common.core.web.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.io.Serial;
 import java.math.BigDecimal;
 import java.util.Date;
 
@@ -13,14 +16,17 @@
  * 閽ｉ噾璁″垝绠＄悊瀵硅薄 aps_plate_plan
  * 
  * @author ruoyi
- * @date 2025-04-08
+ * &#064;date  2025-04-08
  */
+@EqualsAndHashCode(callSuper = true)
+@Data
 public class ApsPlatePlan extends BaseEntity
 {
+    @Serial
     private static final long serialVersionUID = 1L;
 
     /** 涓婚敭id */
-    private String id;
+    private Long id;
 
     /** 涓昏鍒掑憳 */
     @Excel(name = "涓昏鍒�")
@@ -183,37 +189,35 @@
     @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 customTime;
+
     /** 鐢熶骇鍩哄湴 */
     @Excel(name = "鐢熶骇鍩哄湴")
     private String productionBase;
 
+    /** 宸ュ崟瀹℃牳鏃堕棿 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "宸ュ崟瀹℃牳鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date approveOn;
+
+    /** 宸ュ崟寮�宸ユ椂闂� */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "宸ュ崟寮�宸ユ椂闂�", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date startWorkDate;
+
     /** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
     private BigDecimal unmatchedQuantity;
+    /** 涓撲笟褰掑睘*/
+    private String professionalAffiliation;
 
-    public Date getOrderCreateTime() {
-        return orderCreateTime;
-    }
+    /** 闇�姹傝拷婧疘D*/
+    private String requireId;
 
-    public void setOrderCreateTime(Date orderCreateTime) {
-        this.orderCreateTime = orderCreateTime;
-    }
-
-    public String getProductionBase() {
-        return productionBase;
-    }
-
-    public void setProductionBase(String productionBase) {
-        this.productionBase = productionBase;
-    }
-
-    public BigDecimal getUnmatchedQuantity() {
-        return unmatchedQuantity;
-    }
-
-    public void setUnmatchedQuantity(BigDecimal unmatchedQuantity) {
-        this.unmatchedQuantity = unmatchedQuantity;
-    }
-
+    private Integer version;
+/*
     public String getOpStatus() {
         return opStatus;
     }
@@ -638,5 +642,5 @@
 
     public void setPlant(String plant) {
         this.plant = plant;
-    }
+    }*/
 }

--
Gitblit v1.9.3