From ab0b4b2397c46701e372a49cf8ff4d268bb577b3 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java |   58 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 36 insertions(+), 22 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 f722fd0..6132f28 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
@@ -1,11 +1,13 @@
 package com.aps.core.domain;
 
-import java.util.Date;
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.aps.common.core.annotation.Excel;
-import com.aps.common.core.web.domain.BaseEntity;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 閽ｉ噾璁″垝绠＄悊瀵硅薄 aps_plate_plan
@@ -21,7 +23,7 @@
     private String id;
 
     /** 涓昏鍒掑憳 */
-    @Excel(name = "涓昏鍒掑憳")
+    @Excel(name = "涓昏鍒�")
     private String masterPlanner;
 
     /** 鍛ㄦ棩 */
@@ -75,7 +77,7 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Integer productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鑹搧鏁伴噺 */
     @Excel(name = "鑹搧鏁伴噺")
@@ -121,7 +123,7 @@
 
     /** 鏄惁鎸傝捣 */
     @Excel(name = "鏄惁鎸傝捣")
-    private Boolean isSuspended;
+    private String isSuspended;
 
     /** 澶栧崗鏍囪瘑 */
     @Excel(name = "澶栧崗鏍囪瘑")
@@ -146,19 +148,23 @@
 
     /** 璁″垝榻愬 */
     @Excel(name = "璁″垝榻愬")
-    private Boolean isPlanComplete;
+    private Integer isPlanComplete;
 
     /** 搴撳瓨榻愬 */
     @Excel(name = "搴撳瓨榻愬")
-    private Boolean isStockComplete;
+    private Integer isStockComplete;
 
     /** 鏄惁鏈夋姌杩斿伐搴� */
     @Excel(name = "鏄惁鏈夋姌杩斿伐搴�")
-    private Boolean hasTurnback;
+    private Integer hasTurnback;
 
     /** 椋庨櫓鏍囪瘑 */
     @Excel(name = "椋庨櫓鏍囪瘑")
-    private Boolean hasRisk;
+    private Integer hasRisk;
+
+    /** 宸ュ巶 */
+//    @Excel(name = "宸ュ巶")
+    private String plant;
 
     public void setId(String id) 
     {
@@ -300,12 +306,12 @@
         return versionNumber;
     }
 
-    public void setProductionQuantity(Integer productionQuantity) 
+    public void setProductionQuantity(BigDecimal productionQuantity)
     {
         this.productionQuantity = productionQuantity;
     }
 
-    public Integer getProductionQuantity() 
+    public BigDecimal getProductionQuantity()
     {
         return productionQuantity;
     }
@@ -410,12 +416,12 @@
         return nextProcessDeparment;
     }
 
-    public void setIsSuspended(Boolean isSuspended) 
+    public void setIsSuspended(String isSuspended)
     {
         this.isSuspended = isSuspended;
     }
 
-    public Boolean getIsSuspended() 
+    public String getIsSuspended()
     {
         return isSuspended;
     }
@@ -470,42 +476,42 @@
         return advancedRequirementDay;
     }
 
-    public void setIsPlanComplete(Boolean isPlanComplete) 
+    public void setIsPlanComplete(Integer isPlanComplete)
     {
         this.isPlanComplete = isPlanComplete;
     }
 
-    public Boolean getIsPlanComplete() 
+    public Integer getIsPlanComplete()
     {
         return isPlanComplete;
     }
 
-    public void setIsStockComplete(Boolean isStockComplete) 
+    public void setIsStockComplete(Integer isStockComplete)
     {
         this.isStockComplete = isStockComplete;
     }
 
-    public Boolean getIsStockComplete() 
+    public Integer getIsStockComplete()
     {
         return isStockComplete;
     }
 
-    public void setHasTurnback(Boolean hasTurnback) 
+    public void setHasTurnback(Integer hasTurnback)
     {
         this.hasTurnback = hasTurnback;
     }
 
-    public Boolean getHasTurnback() 
+    public Integer getHasTurnback()
     {
         return hasTurnback;
     }
 
-    public void setHasRisk(Boolean hasRisk) 
+    public void setHasRisk(Integer hasRisk)
     {
         this.hasRisk = hasRisk;
     }
 
-    public Boolean getHasRisk() 
+    public Integer getHasRisk()
     {
         return hasRisk;
     }
@@ -548,6 +554,14 @@
             .append("isStockComplete", getIsStockComplete())
             .append("hasTurnback", getHasTurnback())
             .append("hasRisk", getHasRisk())
+                .append("plant", getPlant())
             .toString();
     }
+    public String getPlant() {
+        return plant;
+    }
+
+    public void setPlant(String plant) {
+        this.plant = plant;
+    }
 }

--
Gitblit v1.9.3