From 2a64b537e8e3bce9ce030585a3da17d48379c0ad Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期一, 26 五月 2025 15:04:45 +0800
Subject: [PATCH] 修改json类型转换错误

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsPartPlan.java |   86 +++++++++++++++++++++++++++++++++++-------
 1 files changed, 71 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 c12bbd2..0796a29 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,17 +1,13 @@
 package com.aps.core.domain;
 
-import java.util.Date;
-
-import com.aps.common.core.utils.uuid.IdUtils;
-import com.aps.common.core.utils.uuid.UUID;
+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 org.springframework.data.annotation.Id;
 
-import javax.annotation.processing.Generated;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 闆朵欢璁″垝绠＄悊瀵硅薄 aps_part_plan
@@ -80,11 +76,11 @@
 
     /** 鐢熶骇鏁伴噺 */
     @Excel(name = "鐢熶骇鏁伴噺")
-    private Long productionQuantity;
+    private BigDecimal productionQuantity;
 
     /** 鑹搧鏁伴噺 */
     @Excel(name = "鑹搧鏁伴噺")
-    private Long goodProductsQuantity;
+    private BigDecimal goodProductsQuantity;
 
     /** 宸ュ簭鍙� */
     @Excel(name = "宸ュ簭鍙�")
@@ -165,9 +161,58 @@
     @Excel(name = "椋庨櫓鏍囪瘑")
     private Integer hasRisk;
 
+    /** 浣滀笟锛堝伐搴忓悕绉帮級 */
+    @Excel(name = "浣滀笟")
+    private String stdOp;
+
     /** 宸ュ巶 */
 //    @Excel(name = "宸ュ巶")
     private String plant;
+
+    /** 褰撳墠宸ュ簭鐘舵�� */
+    @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+    private String opStatus;
+
+    /** 涓嬩竴宸ュ簭鍚嶇О */
+    @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+    private String nextOpName;
+
+    public BigDecimal getUnmatchedQuantity() {
+        return unmatchedQuantity;
+    }
+
+    public void setUnmatchedQuantity(BigDecimal unmatchedQuantity) {
+        this.unmatchedQuantity = unmatchedQuantity;
+    }
+
+    public String getProfessionalAffiliation() {
+        return professionalAffiliation;
+    }
+
+    public void setProfessionalAffiliation(String professionalAffiliation) {
+        this.professionalAffiliation = professionalAffiliation;
+    }
+
+    /** 鏈尮閰嶇殑鐢熶骇鏁伴噺*/
+    private BigDecimal unmatchedQuantity;
+    /** 涓撲笟褰掑睘*/
+    private String professionalAffiliation;
+
+    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 void setId(String id) 
     {
@@ -309,22 +354,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;
     }
@@ -519,6 +564,14 @@
         return hasRisk;
     }
 
+    public void setStdOp(String stdOp) {
+        this.stdOp = stdOp;
+    }
+
+    public String getStdOp() {
+        return stdOp;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -557,7 +610,10 @@
             .append("isStockComplete", getIsStockComplete())
             .append("hasTurnback", getHasTurnback())
             .append("hasRisk", getHasRisk())
-                .append("plant", getPlant())
+            .append("plant", getPlant())
+            .append("stdOp", getStdOp())
+            .append("opStatus", getOpStatus())
+            .append("nextOpName", getNextOpName())
             .toString();
     }
     public String getPlant() {

--
Gitblit v1.9.3