From fcc62c9f3b829b51eb8f0607d9276c49b63c6331 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期日, 27 四月 2025 14:24:57 +0800
Subject: [PATCH] 零件统计问题修复
---
aps-modules/aps-job/src/main/java/com/aps/job/domain/ApsWorkOrderJob.java | 48 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 42 insertions(+), 6 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 0bc7a35..17a9c4b 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,10 +1,12 @@
package com.aps.job.domain;
-import java.math.BigDecimal;
-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 com.fasterxml.jackson.annotation.JsonProperty;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+import java.math.BigDecimal;
/**
* 宸ュ崟鍚屾瀵硅薄 aps_work_order_job
@@ -21,6 +23,7 @@
/** 鍚屾涓婚敭 */
@Excel(name = "鍚屾涓婚敭")
+ @JsonProperty("ID")
private String orderId;
/** 鍗曟嵁鍙� */
@@ -77,7 +80,7 @@
/** 宸ヤ綔涓績 褰撳墠鍦ㄥ埗鐨勫伐搴� */
@Excel(name = "宸ヤ綔涓績 褰撳墠鍦ㄥ埗鐨勫伐搴�")
- private Integer workCenter;
+ private String workCenter;
/** 鎵�灞為儴闂� */
@Excel(name = "鎵�灞為儴闂�")
@@ -118,6 +121,12 @@
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
@Excel(name = "鍒犻櫎鏍囧織", readConverterExp = "0=浠ｈ〃瀛樺湪,2=浠ｈ〃鍒犻櫎")
private String delFlag;
+
+ /** 浣滀笟 */
+ @Excel(name = "浣滀笟")
+ private String stdOp;
+
+ private String orgCode;
public void setId(Long id)
{
@@ -269,12 +278,12 @@
return opNum;
}
- public void setWorkCenter(Integer workCenter)
+ public void setWorkCenter(String workCenter)
{
this.workCenter = workCenter;
}
- public Integer getWorkCenter()
+ public String getWorkCenter()
{
return workCenter;
}
@@ -378,6 +387,31 @@
{
return delFlag;
}
+ public String getProcessStatus() {
+ return processStatus;
+ }
+
+ public void setProcessStatus(String processStatus) {
+ this.processStatus = processStatus;
+ }
+
+ private String processStatus;
+
+ public String getOrgCode() {
+ return orgCode;
+ }
+
+ public void setOrgCode(String orgCode) {
+ this.orgCode = orgCode;
+ }
+
+ public void setStdOp(String stdOp) {
+ this.stdOp = stdOp;
+ }
+
+ public String getStdOp() {
+ return stdOp;
+ }
@Override
public String toString() {
@@ -412,6 +446,8 @@
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
+ .append("processStatus", getProcessStatus())
+ .append("stdOp", getStdOp())
.toString();
}
}
--
Gitblit v1.9.3