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 | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 142a023..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;
@@ -22,21 +23,19 @@
private static final long serialVersionUID = 1L;
- private Long id;
-
/**
* 宸ヤ綔鍙�
*/
@ApiModelProperty(value= "宸ヤ綔鍙�")
@TableField("wrk_no")
- @TableId(value = "wrk_no", type = IdType.AUTO)
+ @TableId(value = "wrk_no")
private Integer wrkNo;
@ApiModelProperty("浠诲姟绫诲瀷锛� agv, crn")
private String taskType;
@ApiModelProperty("浠诲姟缂栫爜")
- @TableField("wrk_code")
+ @TableField(value = "wrk_code", strategy = FieldStrategy.IGNORED)
private String wrkCode;
@ApiModelProperty(value= "")
@@ -309,6 +308,10 @@
@TableField("ctn_no")
private String ctnNo;
+ @ApiModelProperty("鏄惁浣欐枡")
+ @TableField("is_suplus")
+ private Integer isSuplus;
+
/**
* 婊℃澘
*/
@@ -391,6 +394,15 @@
}
}
+ 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);
--
Gitblit v1.9.1