From af2f1450e22d4b65e0013733e08025cdcd075b31 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 18:20:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java |   68 +++++++++++++++++++++++++++++----
 1 files changed, 59 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 5cb4ae5..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
@@ -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,10 +66,26 @@
     /** 宸ュ巶 */
 //    @Excel(name = "宸ュ巶")
     private String plant;
+
     @Excel(name = "鏍囧噯宸ユ椂")
-    private Long standardTime;
+    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;
 
@@ -213,19 +231,19 @@
                 .toString();
     }
 
-    public Long getDiscardCount() {
+    public BigDecimal getDiscardCount() {
         return discardCount;
     }
 
-    public void setDiscardCount(Long discardCount) {
+    public void setDiscardCount(BigDecimal discardCount) {
         this.discardCount = discardCount;
     }
 
-    public Long getStandardTime() {
+    public BigDecimal getStandardTime() {
         return standardTime;
     }
 
-    public void setStandardTime(Long standardTime) {
+    public void setStandardTime(BigDecimal standardTime) {
         this.standardTime = standardTime;
     }
 
@@ -236,4 +254,36 @@
     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