From 8bcf258496e7c6cdaa3921acec4db1d4f77fe6f2 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 24 四月 2025 13:34:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/java/com/aps/core/domain/ApsProcessRoute.java | 58 ++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 36 insertions(+), 22 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 1603e8b..b11a864 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
@@ -89,6 +89,9 @@
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
+ /** 宸ヤ綔涓績 */
+ private String workCenter;
+
public void setId(String id)
{
this.id = id;
@@ -209,28 +212,6 @@
return delFlag;
}
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("itemNo", getItemNo())
- .append("workOrderNo", getWorkOrderNo())
- .append("processNumber", getProcessNumber())
- .append("processName", getProcessName())
- .append("processPlanStartDay", getProcessPlanStartDay())
- .append("processPlanEndDay", getProcessPlanEndDay())
- .append("notStartWorkCount", getNotStartWorkCount())
- .append("completedCount", getCompletedCount())
- .append("integrationDay", getIntegrationDay())
- .append("plant", getPlant())
- .append("delFlag", getDelFlag())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .toString();
- }
-
public BigDecimal getDiscardCount() {
return discardCount;
}
@@ -286,4 +267,37 @@
public void setOrgCode(String orgCode) {
this.orgCode = 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)
+ .append("id", getId())
+ .append("itemNo", getItemNo())
+ .append("workOrderNo", getWorkOrderNo())
+ .append("processNumber", getProcessNumber())
+ .append("processName", getProcessName())
+ .append("processPlanStartDay", getProcessPlanStartDay())
+ .append("processPlanEndDay", getProcessPlanEndDay())
+ .append("notStartWorkCount", getNotStartWorkCount())
+ .append("completedCount", getCompletedCount())
+ .append("integrationDay", getIntegrationDay())
+ .append("plant", getPlant())
+ .append("delFlag", getDelFlag())
+ .append("createBy", getCreateBy())
+ .append("createTime", getCreateTime())
+ .append("updateBy", getUpdateBy())
+ .append("updateTime", getUpdateTime())
+ .append("workCenter", getWorkCenter())
+ .toString();
+ }
+
+
}
--
Gitblit v1.9.3