From 47ae9a2a0d8a1196603ddd7835563413bbe14824 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期二, 22 四月 2025 15:14:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java |   49 ++++++++++++++++++++++++++++++++++---------------
 1 files changed, 34 insertions(+), 15 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
index 61dea35..2b1d185 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java
@@ -1,11 +1,19 @@
 package com.aps.core.domain;
 
+import java.math.BigDecimal;
 import java.util.Date;
+
+import com.aps.common.core.utils.uuid.IdUtils;
+import com.aps.common.core.utils.uuid.UUID;
 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 org.apache.poi.hpsf.Decimal;
+import org.springframework.data.annotation.Id;
+
+import javax.annotation.processing.Generated;
 
 /**
  * 闆朵欢璁″垝绠＄悊瀵硅薄 aps_part_plan
@@ -19,14 +27,13 @@
 
     /** 涓婚敭id */
     private String id;
-
     /** 涓昏鍒掑憳 */
-    @Excel(name = "涓昏鍒掑憳")
+    @Excel(name = "涓昏鍒�")
     private String masterPlanner;
 
     /** 鍛ㄦ棩 */
     @JsonFormat(pattern = "yyyy-MM-dd")
-    @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "鍛ㄦ棩", width = 30, dateFormat = "MM-dd")
     private Date weekDay;
 
     /** 鍛ㄥ害 */
@@ -75,11 +82,11 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Long productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鑹搧鏁伴噺 */
     @Excel(name = "鑹搧鏁伴噺")
-    private Long goodProductsQuantity;
+    private BigDecimal goodProductsQuantity;
 
     /** 宸ュ簭鍙� */
     @Excel(name = "宸ュ簭鍙�")
@@ -121,11 +128,11 @@
 
     /** 鏄惁鎸傝捣 */
     @Excel(name = "鏄惁鎸傝捣")
-    private Integer isSuspended;
+    private String isSuspended;
 
     /** 澶栧崗鏍囪瘑 */
     @Excel(name = "澶栧崗鏍囪瘑")
-    private Integer isOutsourcing;
+    private String isOutsourcing;
 
     /** 璐﹀ */
     @Excel(name = "璐﹀")
@@ -159,6 +166,10 @@
     /** 椋庨櫓鏍囪瘑 */
     @Excel(name = "椋庨櫓鏍囪瘑")
     private Integer hasRisk;
+
+    /** 宸ュ巶 */
+//    @Excel(name = "宸ュ巶")
+    private String plant;
 
     public void setId(String id) 
     {
@@ -300,22 +311,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;
     }
@@ -410,22 +421,22 @@
         return nextProcessDeparment;
     }
 
-    public void setIsSuspended(Integer isSuspended) 
+    public void setIsSuspended(String isSuspended)
     {
         this.isSuspended = isSuspended;
     }
 
-    public Integer getIsSuspended() 
+    public String getIsSuspended()
     {
         return isSuspended;
     }
 
-    public void setIsOutsourcing(Integer isOutsourcing) 
+    public void setIsOutsourcing(String isOutsourcing)
     {
         this.isOutsourcing = isOutsourcing;
     }
 
-    public Integer getIsOutsourcing() 
+    public String getIsOutsourcing()
     {
         return isOutsourcing;
     }
@@ -548,6 +559,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