From f2e7521e7740f32fa84d236405f6a78786eaaed1 Mon Sep 17 00:00:00 2001 From: gtsxc <3272660260@qq.com> Date: 星期五, 28 二月 2025 08:52:11 +0800 Subject: [PATCH] #新增方法calcWhiteList,把结束节点设置白名单 --- zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/entity/Task.java | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 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 4c1da09..6c3c8c7 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.annotation.*; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.zy.asrs.wcs.core.service.BusService; import com.zy.asrs.wcs.core.service.TaskCtgService; @@ -16,16 +17,12 @@ import java.util.Date; import java.text.SimpleDateFormat; import java.util.Date; -import com.baomidou.mybatisplus.annotation.TableLogic; import java.text.SimpleDateFormat; import java.util.Date; import java.text.SimpleDateFormat; import java.util.Date; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; -import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -260,10 +257,16 @@ @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, String recordLoc) { + 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; @@ -298,6 +301,7 @@ this.rgvNo = rgvNo; this.agvNo = agvNo; this.recordLoc = recordLoc; + this.wmsTaskNo = wmsTaskNo; } // Task task = new Task( -- Gitblit v1.9.1