From 0d5321b4a070862fc9862af9ca17251b1f441c4b Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 15 十月 2024 14:01:58 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java | 51 +++++++++++++++++++++++++++++++++------------------
1 files changed, 33 insertions(+), 18 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
index 6084e4a..6f11eef 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Task.java
@@ -173,13 +173,13 @@
* 绉熸埛
*/
@ApiModelProperty(value= "绉熸埛")
- private Integer tenantId;
+ private Long tenantId;
/**
* 娣诲姞浜哄憳
*/
@ApiModelProperty(value= "娣诲姞浜哄憳")
- private Integer createBy;
+ private Long createBy;
/**
* 娣诲姞鏃堕棿
@@ -191,7 +191,7 @@
* 淇敼浜哄憳
*/
@ApiModelProperty(value= "淇敼浜哄憳")
- private Integer updateBy;
+ private Long updateBy;
/**
* 淇敼鏃堕棿
@@ -207,7 +207,7 @@
public Task() {}
- public Task(String uuid,Long busId,String seqNum,Integer priority,String name,Long taskSts,Long taskType,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,Long oriSta,Long oriLoc,Long destSta,Long destLoc,String emptyMk,String zpallet,String phase,String errDesc,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
+ public Task(String uuid,Long busId,String seqNum,Integer priority,String name,Long taskSts,Long taskType,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,Long oriSta,Long oriLoc,Long destSta,Long destLoc,String emptyMk,String zpallet,String phase,String errDesc,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.uuid = uuid;
this.busId = busId;
this.seqNum = seqNum;
@@ -273,7 +273,7 @@
BusService service = SpringUtils.getBean(BusService.class);
Bus bus = service.getById(this.busId);
if (!Cools.isEmpty(bus)){
- return String.valueOf(bus.getUuid());
+ return String.valueOf(bus.getBusNo());
}
return null;
}
@@ -368,29 +368,44 @@
return null;
}
- public String getStatus$(){
+ public Boolean getStatusBool(){
if (null == this.status){ return null; }
switch (this.status){
case 1:
- return "姝ｅ父";
+ return true;
case 0:
- return "鍐荤粨";
+ return false;
default:
- return String.valueOf(this.status);
+ return null;
}
}
- public String getDeleted$(){
- if (null == this.deleted){ return null; }
- switch (this.deleted){
- case 1:
- return "鏄�";
- case 0:
- return "鍚�";
- default:
- return String.valueOf(this.deleted);
+ public String getOriDesc() {
+ String oriDesc = "";
+ if (null != this.oriSta) {
+ oriDesc = "STA" + " - " + this.getOriSta$();
}
+ if (null != this.oriLoc) {
+ oriDesc = "LOC" + " - " + this.getOriLoc$();
+ }
+ if (!Cools.isEmpty(oriDesc) && null != this.oriCode) {
+ oriDesc = oriDesc + " (" + this.getOriCode$() + ")";
+ }
+ return oriDesc;
}
+ public String getDestDesc() {
+ String destDesc = "";
+ if (null != this.destSta) {
+ destDesc = "STA" + " - " + this.getDestSta$();
+ }
+ if (null != this.destLoc) {
+ destDesc = "LOC" + " - " + this.getDestLoc$();
+ }
+ if (!Cools.isEmpty(destDesc) && null != this.destCode) {
+ destDesc = destDesc + " (" + this.getDestCode$() + ")";
+ }
+ return destDesc;
+ }
}
--
Gitblit v1.9.1