From 8ae2f2dcfe7e263d42c21ed7644641c780445b95 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 16 一月 2026 17:45:50 +0800
Subject: [PATCH] 空板改余料回库优化
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 49 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 40 insertions(+), 9 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..fff8f61 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.zy.asrs.service.*;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -26,9 +27,16 @@
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
- @TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
+ @TableId(value = "wrk_no")
private Integer wrkNo;
+
+ @ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
+ private String taskType;
+
+ @ApiModelProperty("浠诲姟缂栫爜")
+ @TableField(value = "wrk_code", strategy = FieldStrategy.IGNORED)
+ private String wrkCode;
@ApiModelProperty(value= "")
@TableField("inv_wh")
@@ -92,14 +100,14 @@
*/
@ApiModelProperty(value= "鐩爣绔�")
@TableField("sta_no")
- private Integer staNo;
+ private String staNo;
/**
* 婧愮珯
*/
@ApiModelProperty(value= "婧愮珯")
@TableField("source_sta_no")
- private Integer sourceStaNo;
+ private String sourceStaNo;
/**
* 婧愬簱浣�
@@ -300,6 +308,10 @@
@TableField("ctn_no")
private String ctnNo;
+ @ApiModelProperty("鏄惁浣欐枡")
+ @TableField("is_suplus")
+ private Integer isSuplus;
+
/**
* 婊℃澘
*/
@@ -372,6 +384,25 @@
}
return null;
}
+
+ public String getTaskType$(){
+ if (Cools.isEmpty(this.taskType)){return null;}
+ if (taskType.equals("agv")) {
+ return "AGV浠诲姟";
+ } else {
+ return "鍫嗗灈鏈轰换鍔�";
+ }
+ }
+
+ public String getIsSuplus$(){
+ if (Cools.isEmpty(this.isSuplus)){return null;}
+ if (isSuplus == 0) {
+ return "绌烘澘鍥炲簱";
+ } else {
+ return "浣欐枡鍥炲簱";
+ }
+ }
+
public String getStaNo$(){
BasDevpService service = SpringUtils.getBean(BasDevpService.class);
@@ -481,12 +512,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