From d668c213bbcccd83acb57056a6b7919fda7e6d2d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 28 四月 2025 11:55:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
index 330ad8f..93de2ee 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderProcess.java
@@ -7,6 +7,7 @@
 import org.apache.commons.lang3.builder.ToStringStyle;
 
 import java.io.Serial;
+import java.math.BigDecimal;
 import java.util.Date;
 
 /**
@@ -45,7 +46,7 @@
 
     /** 鏍囧噯宸ユ椂-灏忔暟 */
     @Excel(name = "鏍囧噯宸ユ椂-灏忔暟")
-    private Float standardTime;
+    private BigDecimal standardTime;
 
     /** 宸ュ簭璁″垝寮�濮嬫椂闂� */
     @JsonFormat(pattern = "yyyy-MM-dd")
@@ -59,11 +60,11 @@
 
     /** 鍔犲伐鏁伴噺-灏忔暟 */
     @Excel(name = "鍔犲伐鏁伴噺-灏忔暟")
-    private Float processQty;
+    private BigDecimal processQty;
 
     /** 搴熷純鏁伴噺 */
     @Excel(name = "搴熷純鏁伴噺")
-    private Float scrapQty;
+    private BigDecimal scrapQty;
 
     /** 宸ュ簭鐘舵�� */
     @Excel(name = "宸ュ簭鐘舵��")
@@ -77,12 +78,15 @@
     @Excel(name = "璐﹀缂栫爜")
     private String orgCode;
 
-    public void setId(Long id) 
+    @Excel(name = "宸ヤ綔涓績")
+    private String workCenter;
+
+    public void setId(Long id)
     {
         this.id = id;
     }
 
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
@@ -137,12 +141,12 @@
         return processName;
     }
 
-    public void setStandardTime(Float standardTime)
+    public void setStandardTime(BigDecimal standardTime)
     {
         this.standardTime = standardTime;
     }
 
-    public Float getStandardTime()
+    public BigDecimal getStandardTime()
     {
         return standardTime;
     }
@@ -167,22 +171,22 @@
         return planCompleteDate;
     }
 
-    public void setProcessQty(Float processQty)
+    public void setProcessQty(BigDecimal processQty)
     {
         this.processQty = processQty;
     }
 
-    public Float getProcessQty()
+    public BigDecimal getProcessQty()
     {
         return processQty;
     }
 
-    public void setScrapQty(Float scrapQty)
+    public void setScrapQty(BigDecimal scrapQty)
     {
         this.scrapQty = scrapQty;
     }
 
-    public Float getScrapQty()
+    public BigDecimal getScrapQty()
     {
         return scrapQty;
     }
@@ -217,6 +221,14 @@
         return orgCode;
     }
 
+    public String getWorkCenter() {
+        return workCenter;
+    }
+
+    public void setWorkCenter(String workCenter) {
+        this.workCenter = workCenter;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -234,6 +246,7 @@
             .append("opStatus", getOpStatus())
             .append("org", getOrg())
             .append("orgCode", getOrgCode())
+            .append("workCenter", getWorkCenter())
             .toString();
     }
 }

--
Gitblit v1.9.3