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/WrkMastLog.java | 48 +++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 45 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index efbd735..1bd8fdf 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -4,11 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
-import com.core.common.Cools;
-import com.core.common.SpringUtils;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -297,7 +297,7 @@
@ApiModelProperty(value= "")
@TableField("Pdc_type")
- private String PdcType;
+ private String pdcType;
@ApiModelProperty(value= "")
@TableField("ctn_no")
@@ -324,6 +324,42 @@
@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 WrkMastLog() {}
public String getWrkNo$(){
@@ -349,6 +385,10 @@
return String.valueOf(basWrkStatus.getWrkDesc());
}
return null;
+ }
+
+ public long getWrkSts(){
+ return (long)this.wrkSts;
}
public String getIoType$(){
@@ -381,6 +421,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;
}
--
Gitblit v1.9.1