From d4d5f196cc42ef8cfe739de6ecd40f2d21a96e31 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 29 四月 2025 09:45:57 +0800
Subject: [PATCH] 【UPDATE-BUGFIX】优化计算产能开始结束日期

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java |   96 ++++++++++++++++++++++++++++++++----------------
 1 files changed, 64 insertions(+), 32 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
index 439b258..dd2c4f0 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsGasPipingPlan.java
@@ -1,11 +1,14 @@
 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;
+import java.util.List;
 
 /**
  * 姘斾綋绠¤矾璁″垝绠＄悊瀵硅薄 aps_gas_piping_plan
@@ -74,11 +77,11 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Long productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鑹搧鏁伴噺 */
     @Excel(name = "鑹搧鏁伴噺")
-    private Long goodProductsQuantity;
+    private BigDecimal goodProductsQuantity;
 
     /** 宸ュ簭鍙� */
     @Excel(name = "宸ュ簭鍙�")
@@ -119,11 +122,9 @@
     private String nextProcessDeparment;
 
     /** 鏄惁鎸傝捣 */
-//    @Excel(name = "鏄惁鎸傝捣")
-    private Integer isSuspended;
-    /** 鏄惁鎸傝捣 */
     @Excel(name = "鏄惁鎸傝捣")
-    private String isSuspendedTxt;
+    private String isSuspended;
+
     /** 澶栧崗鏍囪瘑 */
     @Excel(name = "澶栧崗鏍囪瘑")
     private String isOutsourcing;
@@ -160,7 +161,52 @@
     /** 椋庨櫓鏍囪瘑 */
     @Excel(name = "椋庨櫓鏍囪瘑")
     private Integer hasRisk;
-    private String plant;
+
+    /** 褰撳墠宸ュ簭鐘舵�� */
+    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+    private String opStatus;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+    private String nextOpName;
+
+    public String getOpStatus() {
+        return opStatus;
+    }
+
+    public void setOpStatus(String opStatus) {
+        this.opStatus = opStatus;
+    }
+
+    public String getNextOpName() {
+        return nextOpName;
+    }
+
+    public void setNextOpName(String nextOpName) {
+        this.nextOpName = nextOpName;
+    }
+
+    public String getPlanType() {
+        return planType;
+    }
+
+    public void setPlanType(String planType) {
+        this.planType = planType;
+    }
+
+    private String planType;
+
+    /** 宸ュ簭鍒楄〃 */
+    private List<ApsProcessRoute> apsProcessRoutes;
+
+    public List<ApsProcessRoute> getApsProcessRoutes() {
+        return apsProcessRoutes;
+    }
+
+    public void setApsProcessRoutes(List<ApsProcessRoute> apsProcessRoutes) {
+        this.apsProcessRoutes = apsProcessRoutes;
+    }
+
     public void setId(String id)
     {
         this.id = id;
@@ -301,22 +347,22 @@
         return versionNumber;
     }
 
-    public void setProductionQuantity(Long productionQuantity)
+    public void setProductionQuantity(BigDecimal productionQuantity)
     {
         this.productionQuantity = productionQuantity;
     }
 
-    public Long getProductionQuantity()
+    public BigDecimal getProductionQuantity()
     {
         return productionQuantity;
     }
 
-    public void setGoodProductsQuantity(Long goodProductsQuantity)
+    public void setGoodProductsQuantity(BigDecimal goodProductsQuantity)
     {
         this.goodProductsQuantity = goodProductsQuantity;
     }
 
-    public Long getGoodProductsQuantity()
+    public BigDecimal getGoodProductsQuantity()
     {
         return goodProductsQuantity;
     }
@@ -411,12 +457,12 @@
         return nextProcessDeparment;
     }
 
-    public void setIsSuspended(Integer isSuspended)
+    public void setIsSuspended(String isSuspended)
     {
         this.isSuspended = isSuspended;
     }
 
-    public Integer getIsSuspended()
+    public String getIsSuspended()
     {
         return isSuspended;
     }
@@ -549,22 +595,8 @@
                 .append("isStockComplete", getIsStockComplete())
                 .append("hasTurnback", getHasTurnback())
                 .append("hasRisk", getHasRisk())
+                .append("opStatus", getOpStatus())
+                .append("nextOpName", getNextOpName())
                 .toString();
-    }
-
-    public String getIsSuspendedTxt() {
-        return isSuspendedTxt;
-    }
-
-    public void setIsSuspendedTxt(String isSuspendedTxt) {
-        this.isSuspendedTxt = isSuspendedTxt;
-    }
-
-    public String getPlant() {
-        return plant;
-    }
-
-    public void setPlant(String plant) {
-        this.plant = plant;
     }
 }

--
Gitblit v1.9.3