From ab0b4b2397c46701e372a49cf8ff4d268bb577b3 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期三, 23 四月 2025 10:40:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 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..5cb4ae5 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
@@ -30,7 +30,7 @@
/** 宸ュ簭搴忓彿 */
@Excel(name = "宸ュ簭搴忓彿")
- private Long processNumber;
+ private String processNumber;
/** 宸ュ簭鍚嶇О */
@Excel(name = "宸ュ簭鍚嶇О")
@@ -64,7 +64,10 @@
/** 宸ュ巶 */
// @Excel(name = "宸ュ巶")
private String plant;
-
+ @Excel(name = "鏍囧噯宸ユ椂")
+ private Long standardTime;
+ @Excel(name = "宸ュ簭鎺掑簭")
+ private Long processOrder;
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
@@ -98,12 +101,12 @@
return workOrderNo;
}
- public void setProcessNumber(Long processNumber)
+ public void setProcessNumber(String processNumber)
{
this.processNumber = processNumber;
}
- public Long getProcessNumber()
+ public String getProcessNumber()
{
return processNumber;
}
@@ -217,4 +220,20 @@
public void setDiscardCount(Long discardCount) {
this.discardCount = discardCount;
}
+
+ public Long getStandardTime() {
+ return standardTime;
+ }
+
+ public void setStandardTime(Long standardTime) {
+ this.standardTime = standardTime;
+ }
+
+ public Long getProcessOrder() {
+ return processOrder;
+ }
+
+ public void setProcessOrder(Long processOrder) {
+ this.processOrder = processOrder;
+ }
}
--
Gitblit v1.9.3