From 44b6b79dd5dee0ebbd2d11b08abbc2be275bed58 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期一, 09 二月 2026 16:10:17 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 49 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 42 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 83298e9..a389c76 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;
/**
* 婧愬簱浣�
@@ -107,6 +115,14 @@
@ApiModelProperty(value= "婧愬簱浣�")
@TableField("source_loc_no")
private String sourceLocNo;
+
+ /**
+ * N : 寰呯敓鎴愬叆搴撲换鍔�
+ * Y : 鎴愬姛鐢熸垚鍏ュ簱浠诲姟
+ */
+ @ApiModelProperty(value= "鐢熸垚璺ㄥ尯鍏ュ簱浠诲姟鏍囪")
+ @TableField("online_yn")
+ private String onlineYn;
@ApiModelProperty(value= "")
@TableField("loc_sts")
@@ -121,10 +137,6 @@
@ApiModelProperty(value= "")
@TableField("link_mis")
private String linkMis;
-
- @ApiModelProperty(value= "")
- @TableField("online_yn")
- private String onlineYn;
@ApiModelProperty(value= "")
@TableField("upd_mk")
@@ -300,6 +312,10 @@
@TableField("ctn_no")
private String ctnNo;
+ @ApiModelProperty("鏄惁浣欐枡")
+ @TableField("is_suplus")
+ private Integer isSuplus;
+
/**
* 婊℃澘
*/
@@ -373,6 +389,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);
BasDevp basDevp = service.selectById(this.staNo);
--
Gitblit v1.9.1