From 285deae97a62db611ee2485d3940e24307594f2a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 22 九月 2025 20:09:42 +0800
Subject: [PATCH] 数据结构修改 任务工作档修改 组托工作档修改
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 29 +++++++++++++++++++++--------
1 files changed, 21 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..1fb3f13 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -30,6 +30,9 @@
@TableField("wrk_no")
private Integer wrkNo;
+ @ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ private String taskType;
+
@ApiModelProperty(value= "")
@TableField("inv_wh")
private String invWh;
@@ -92,14 +95,14 @@
*/
@ApiModelProperty(value= "鐩爣绔�")
@TableField("sta_no")
- private Integer staNo;
+ private String staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
@TableField("source_sta_no")
- private Integer sourceStaNo;
+ private String sourceStaNo;
/**
* 婧愬簱浣�
@@ -373,6 +376,16 @@
return null;
}
+ public String getTaskType$(){
+ if (Cools.isEmpty(this.taskType)){return null;}
+ if (taskType.equals("agv")) {
+ return "AGV浠诲姟";
+ } else {
+ return "鍫嗗灈鏈轰换鍔�";
+ }
+ }
+
+
public String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
BasDevp basDevp = service.selectById(this.staNo);
@@ -481,12 +494,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