From c8aa8900258c9f497d6fc5844d8d9cc9e9ef7779 Mon Sep 17 00:00:00 2001
From: huangjiayang <5265313@qq.com>
Date: 星期三, 23 四月 2025 11:33:54 +0800
Subject: [PATCH] 【UPDATE】修改S1中部分功能实体字段类型为小数

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java |   87 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
index 2287c9b..1603e8b 100644
--- a/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
+++ b/aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java
@@ -1,11 +1,13 @@
 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;
 
 /**
  * 宸ヨ壓璺嚎瀵硅薄 aps_process_route
@@ -30,7 +32,7 @@
 
     /** 宸ュ簭搴忓彿 */
     @Excel(name = "宸ュ簭搴忓彿")
-    private Long processNumber;
+    private String processNumber;
 
     /** 宸ュ簭鍚嶇О */
     @Excel(name = "宸ュ簭鍚嶇О")
@@ -55,7 +57,7 @@
     private Long completedCount;
     /** 搴熷純鏁伴噺 */
     @Excel(name = "搴熷純鏁伴噺")
-    private Long discardCount;
+    private BigDecimal discardCount;
     /** 闆嗘垚鏃ユ湡 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "闆嗘垚鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
@@ -64,6 +66,25 @@
     /** 宸ュ巶 */
 //    @Excel(name = "宸ュ巶")
     private String plant;
+
+    @Excel(name = "鏍囧噯宸ユ椂")
+    private BigDecimal standardTime;
+
+    @Excel(name = "宸ュ簭鎺掑簭")
+    private Long processOrder;
+
+    /** 宸ュ簭ID */
+    private String opId;
+
+    /** 鍔犲伐鏁伴噺 */
+    @Excel(name = "鍔犲伐鏁伴噺")
+    private BigDecimal processQty;
+
+    /** 宸ュ簭鐘舵�� */
+    private String opStatus;
+
+    /** 璐﹀浠ｇ爜 */
+    private String orgCode;
 
     /** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
     private String delFlag;
@@ -98,12 +119,12 @@
         return workOrderNo;
     }
 
-    public void setProcessNumber(Long processNumber)
+    public void setProcessNumber(String processNumber)
     {
         this.processNumber = processNumber;
     }
 
-    public Long getProcessNumber()
+    public String getProcessNumber()
     {
         return processNumber;
     }
@@ -210,11 +231,59 @@
                 .toString();
     }
 
-    public Long getDiscardCount() {
+    public BigDecimal getDiscardCount() {
         return discardCount;
     }
 
-    public void setDiscardCount(Long discardCount) {
+    public void setDiscardCount(BigDecimal discardCount) {
         this.discardCount = discardCount;
     }
+
+    public BigDecimal getStandardTime() {
+        return standardTime;
+    }
+
+    public void setStandardTime(BigDecimal standardTime) {
+        this.standardTime = standardTime;
+    }
+
+    public Long getProcessOrder() {
+        return processOrder;
+    }
+
+    public void setProcessOrder(Long processOrder) {
+        this.processOrder = processOrder;
+    }
+
+    public String getOpId() {
+        return opId;
+    }
+
+    public void setOpId(String opId) {
+        this.opId = opId;
+    }
+
+    public BigDecimal getProcessQty() {
+        return processQty;
+    }
+
+    public void setProcessQty(BigDecimal processQty) {
+        this.processQty = processQty;
+    }
+
+    public String getOpStatus() {
+        return opStatus;
+    }
+
+    public void setOpStatus(String opStatus) {
+        this.opStatus = opStatus;
+    }
+
+    public String getOrgCode() {
+        return orgCode;
+    }
+
+    public void setOrgCode(String orgCode) {
+        this.orgCode = orgCode;
+    }
 }

--
Gitblit v1.9.3