From 29b6f1848523a464ea9cc3bfd383b950608b3d62 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 16 四月 2025 15:37:38 +0800
Subject: [PATCH] 焊缝统计表-逻辑更新

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPlatePlan.java |   44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 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..7d6bb49 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
@@ -21,7 +21,7 @@
     private String id;
 
     /** 涓昏鍒掑憳 */
-    @Excel(name = "涓昏鍒掑憳")
+    @Excel(name = "涓昏鍒�")
     private String masterPlanner;
 
     /** 鍛ㄦ棩 */
@@ -121,7 +121,7 @@
 
     /** 鏄惁鎸傝捣 */
     @Excel(name = "鏄惁鎸傝捣")
-    private Boolean isSuspended;
+    private String isSuspended;
 
     /** 澶栧崗鏍囪瘑 */
     @Excel(name = "澶栧崗鏍囪瘑")
@@ -146,19 +146,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) 
     {
@@ -410,12 +414,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 +474,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 +552,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