From 8bf3c2520653133ae5c5c875cc8e45d2996ed34c Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 07 三月 2024 16:15:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java | 66 +++++++++++++++++++++++++++++++++
1 files changed, 66 insertions(+), 0 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
index 6a51915..a72445a 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/om/productionOrde/domain/OmProductionOrdeInfo.java
@@ -20,6 +20,26 @@
/** ID */
private Long id;
+ @Excel(name = "鏄惁鎶ュ伐")
+ private String sfResult;
+
+ @Excel(name = "鎶ュ伐缁撴灉浠ｇ爜锛圫鎴愬姛锛孎澶辫触锛�")
+ private String resultCode;
+
+ @Excel(name = "鎶ュ伐淇℃伅缁撴灉")
+ private String resultText;
+
+ @Excel(name = "宸ョ珯缂栧彿")
+ private String stationCode;
+
+
+
+ @Excel(name = "浜у搧搴忓垪鍙�")
+ private String productNum;
+
+ @Excel(name = "宸ュ巶缂栧彿")
+ private String siteCode;
+
/** 鐢熶骇宸ュ崟鍙� */
@Excel(name = "鐢熶骇宸ュ崟鍙�")
private String workOrderNo;
@@ -161,7 +181,47 @@
private Long[] idNums;
private String flag;
+ public String getSfResult() {
+ return sfResult;
+ }
+ public void setSfResult(String sfResult) {
+ this.sfResult = sfResult;
+ }
+
+ public String getResultCode() {
+ return resultCode;
+ }
+
+ public void setResultCode(String resultCode) {
+ this.resultCode = resultCode;
+ }
+
+ public String getResultText() {
+ return resultText;
+ }
+
+ public void setResultText(String resultText) {
+ this.resultText = resultText;
+ }
+
+ public String getStationCode() {
+ return stationCode;
+ }
+
+ public void setStationCode(String stationCode) {
+ this.stationCode = stationCode;
+ }
+
+ public String getProductNum() {
+ return productNum;
+ }
+
+ public void setProductNum(String productNum) {
+ this.productNum = productNum;
+ }
+ public String getSiteCode() {return siteCode;}
+ public void setSiteCode(String siteCode) {this.siteCode = siteCode;}
public String getFlag() {
return flag;
}
@@ -552,6 +612,12 @@
.append("spareField2", getSpareField2())
.append("spareField3", getSpareField3())
.append("spareField4", getSpareField4())
+ .append("siteCode", getSiteCode())
+ .append("productNum", getProductNum())
+ .append("stationCode", getStationCode())
+ .append("resultCode", getResultCode())
+ .append("resultText", getResultText())
+ .append("sfResult", getSfResult())
.toString();
}
}
--
Gitblit v1.9.3