From e50218d4ba057a4a33af708ad13b8ef77c41e91c Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期一, 21 七月 2025 10:49:22 +0800
Subject: [PATCH] 订单追溯完善
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index f33acd0..605be35 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -137,7 +137,7 @@
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "1姣嶆墭鐩橈紝2瀛愭墭鐩�")
@TableField("plt_type")
private Integer pltType;
@@ -294,7 +294,7 @@
// Y:閿�鍞鍗曞嚭搴撲换鍔�
@ApiModelProperty(value= "")
@TableField("Pdc_type")
- private String PdcType;
+ private String pdcType;
@ApiModelProperty(value= "")
@TableField("ctn_no")
@@ -320,6 +320,42 @@
@ApiModelProperty(value= "绌烘搷浣�")
@TableField("take_none")
private String takeNone;
+
+ /**
+ * RGV鍙�
+ */
+ @ApiModelProperty(value= "RGV")
+ @TableField("rgv_no")
+ private Integer rgvNo;
+
+ /**
+ * RGV婧愮珯
+ */
+ @ApiModelProperty(value= "RGV婧愮珯")
+ @TableField("rgv_ssta_no")
+ private Integer rgvSstaNo;
+
+ /**
+ * RGV鐩爣绔�
+ */
+ @ApiModelProperty(value= "RGV鐩爣绔�")
+ @TableField("rgv_dsta_no")
+ private Integer rgvDstaNo;
+
+ @ApiModelProperty(value= "rgv鍛戒护涓嬪彂鏃堕棿")
+ @TableField("rgv_create_time")
+ private Date rgvCreateTime;
+
+ @ApiModelProperty(value= "rgv浠诲姟瀹屾垚鏃堕棿")
+ @TableField("rgv_finish_time")
+ private Date rgvFinishTime;
+
+ /**
+ * 浼寸敓宸ヤ綔鍙�
+ */
+ @ApiModelProperty(value= "浼寸敓宸ヤ綔鍙�")
+ @TableField("work_no_other")
+ private Integer workNoOther;
public WrkMast() {}
@@ -369,6 +405,8 @@
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
+ } else if(!Cools.isEmpty(this.locNo)) {
+ return this.locNo;
}
return null;
}
@@ -481,12 +519,12 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public void setErrorMemo(String errorMemo) {
- if (errorMemo.length() > 255) {
- errorMemo = errorMemo.substring(0, 150);
- }
- this.errorMemo = errorMemo;
- }
+// public void setErrorMemo(String errorMemo) {
+// if (errorMemo.length() > 255) {
+// errorMemo = errorMemo.substring(0, 150);
+// }
+// this.errorMemo = errorMemo;
+// }
public String getLogErrTime$(){
if (Cools.isEmpty(this.logErrTime)){
--
Gitblit v1.9.1