From 95d473bc8c09ef41e1455f93dec49c5ee6ac548f Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 18 六月 2024 08:23:38 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java
index 04eb896..afdf5f5 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java
@@ -3,6 +3,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.asrs.wcs.core.service.BusService;
import com.zy.asrs.wcs.core.service.TaskCtgService;
import com.zy.asrs.wcs.core.service.TaskStsService;
@@ -189,7 +190,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -254,9 +254,22 @@
@ApiModelProperty(value= "AGV鍙�")
private Integer agvNo;
+ /**
+ * 鏄惁璁板綍搴撲綅淇℃伅
+ */
+ @ApiModelProperty(value= "鏄惁璁板綍搴撲綅淇℃伅")
+ private String recordLoc;
+
+ /**
+ * WMS浠诲姟鍙�
+ */
+ @ApiModelProperty(value= "WMS浠诲姟鍙�")
+ private String wmsTaskNo;
+
+
public Task() {}
- public Task(String uuid, Long busId, String taskNo, String serialNum, String title, Long taskSts, Long taskCtg, Integer priority, String originSite, String originLoc, String destSite, String destLoc, Integer emptyMk, String zpallet, String phase, Date ioTime, Date startTime, Date endTime, Date exceptionTime, String exceptionDesc, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Integer shuttleNo, Integer liftNo, Integer crnNo, Integer rgvNo, Integer agvNo) {
+ public Task(String uuid, Long busId, String taskNo, String serialNum, String title, Long taskSts, Long taskCtg, Integer priority, String originSite, String originLoc, String destSite, String destLoc, Integer emptyMk, String zpallet, String phase, Date ioTime, Date startTime, Date endTime, Date exceptionTime, String exceptionDesc, Long hostId, Integer status, Integer deleted, Date createTime, Long createBy, Date updateTime, Long updateBy, String memo, Integer shuttleNo, Integer liftNo, Integer crnNo, Integer rgvNo, Integer agvNo, String recordLoc, String wmsTaskNo) {
this.uuid = uuid;
this.busId = busId;
this.taskNo = taskNo;
@@ -290,6 +303,8 @@
this.crnNo = crnNo;
this.rgvNo = rgvNo;
this.agvNo = agvNo;
+ this.recordLoc = recordLoc;
+ this.wmsTaskNo = wmsTaskNo;
}
// Task task = new Task(
@@ -334,7 +349,9 @@
public String getTaskSts$(){
TaskStsService service = SpringUtils.getBean(TaskStsService.class);
- TaskSts taskSts = service.getById(this.taskSts);
+ TaskSts taskSts = service.getOne(new LambdaQueryWrapper<TaskSts>()
+ .eq(TaskSts::getUuid, String.valueOf(this.taskSts))
+ .eq(TaskSts::getHostId, this.hostId));
if (!Cools.isEmpty(taskSts)){
return String.valueOf(taskSts.getName());
}
--
Gitblit v1.9.1