From 234ddd7037d7f4704364269e5d1ea2e40b3b6ab7 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 15:38:47 +0800
Subject: [PATCH] 钣金大表统计：增加 当前工序状态、下一工序
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
index bbd6c87..aacf18f 100644
--- a/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
+++ b/aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java
@@ -1,12 +1,12 @@
package com.aps.job.domain;
-import java.math.BigDecimal;
-
+import com.aps.common.core.annotation.Excel;
+import com.aps.common.core.web.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonProperty;
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;
/**
* 宸ュ崟鍚屾瀵硅薄 aps_work_order_job
@@ -122,12 +122,20 @@
@Excel(name = "鍒犻櫎鏍囧織", readConverterExp = "0=浠ｈ〃瀛樺湪,2=浠ｈ〃鍒犻櫎")
private String delFlag;
+ /** 浣滀笟 */
+ @Excel(name = "浣滀笟")
+ private String stdOp;
-
-
-
-
+ /** 璐﹀缂栫爜 */
private String orgCode;
+
+ /** 褰撳墠宸ュ簭鐘舵�� */
+ @Excel(name = "褰撳墠宸ュ簭鐘舵��")
+ private String opStatus;
+
+ /** 涓嬩竴宸ュ簭鍚嶇О */
+ @Excel(name = "涓嬩竴宸ュ簭鍚嶇О")
+ private String nextOpName;
public void setId(Long id)
{
@@ -406,6 +414,30 @@
this.orgCode = orgCode;
}
+ public void setStdOp(String stdOp) {
+ this.stdOp = stdOp;
+ }
+
+ public String getStdOp() {
+ return stdOp;
+ }
+
+ public String getOpStatus() {
+ return opStatus;
+ }
+
+ public void setOpStatus(String opStatus) {
+ this.opStatus = opStatus;
+ }
+
+ public String getNextOpName() {
+ return nextOpName;
+ }
+
+ public void setNextOpName(String nextOpName) {
+ this.nextOpName = nextOpName;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -439,6 +471,10 @@
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
+ .append("processStatus", getProcessStatus())
+ .append("stdOp", getStdOp())
+ .append("opStatus", getOpStatus())
+ .append("nextOpName", getNextOpName())
.toString();
}
}
--
Gitblit v1.9.3