From 84026ccb613df98417ab3063a6e7ac2a9151487f Mon Sep 17 00:00:00 2001
From: DELL <DELL@qq.com>
Date: 星期五, 28 十一月 2025 15:16:58 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 68 +++++++++++++++++++--------------
1 files changed, 39 insertions(+), 29 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 18bfcc7..2d87a39 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -3,10 +3,12 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasDevpService;
+import com.zy.asrs.mapper.BasWrkIotypeMapper;
+import com.zy.asrs.mapper.BasWrkStatusMapper;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.utils.Synchro;
@@ -135,8 +137,8 @@
private String errorMemo;
@ApiModelProperty(value= "")
- @TableField("memo_m")
- private String memoM;
+ @TableField("memo")
+ private String memo;
/**
* 鏉＄爜
@@ -145,26 +147,52 @@
private String barcode;
/**
- * 鍥涘悜绌挎杞﹀彿
+ * 鍫嗗灈鏈哄彿
*/
- @ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
- @TableField(value = "shuttle_no")
- private Integer shuttleNo;
+ @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
+ @TableField(value = "crn_no")
+ private Integer crnNo;
/**
- * 鎻愬崌鏈哄彿
+ * RGV鍙�
*/
- @ApiModelProperty(value= "鎻愬崌鏈哄彿")
- @TableField(value = "lift_no")
- private Integer liftNo;
+ @ApiModelProperty(value= "RGV鍙�")
+ @TableField(value = "rgv_no")
+ private Integer rgvNo;
/**
* WMS浠诲姟鍙�
*/
@ApiModelProperty(value= "WMS浠诲姟鍙�")
+ @TableField(value = "wms_wrk_no")
private String wmsWrkNo;
+ /**
+ * 绯荤粺娑堟伅
+ */
+ @ApiModelProperty(value= "绯荤粺娑堟伅")
+ @TableField(value = "system_msg")
+ private String systemMsg;
+
public WrkMastLog() {}
+
+ public String getWrkSts$(){
+ BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
+ BasWrkStatus entity = mapper.selectById(this.wrkSts);
+ if (entity != null) {
+ return entity.getWrkDesc();
+ }
+ return null;
+ }
+
+ public String getIoType$(){
+ BasWrkIotypeMapper mapper = SpringUtils.getBean(BasWrkIotypeMapper.class);
+ BasWrkIotype entity = mapper.selectById(this.ioType);
+ if (entity != null) {
+ return entity.getIoDesc();
+ }
+ return null;
+ }
public String getWrkNo$(){
WrkMastService service = SpringUtils.getBean(WrkMastService.class);
@@ -180,24 +208,6 @@
LocMast locMast = service.selectById(this.locNo);
if (!Cools.isEmpty(locMast)){
return String.valueOf(locMast.getLocNo());
- }
- return null;
- }
-
- public String getStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.staNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
- }
- return null;
- }
-
- public String getSourceStaNo$(){
- BasDevpService service = SpringUtils.getBean(BasDevpService.class);
- BasDevp basDevp = service.selectById(this.sourceStaNo);
- if (!Cools.isEmpty(basDevp)){
- return String.valueOf(basDevp.getDevNo());
}
return null;
}
--
Gitblit v1.9.1