From 1a518d788ee36886af92b2adfcbe9e79e83ef08e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期四, 22 一月 2026 09:44:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java | 75 +++++++++----------------------------
1 files changed, 18 insertions(+), 57 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
index c39f2f7..3c333fa 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Travel.java
@@ -3,9 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.zy.acs.framework.common.Cools;
-import com.zy.acs.framework.common.SpringUtils;
-import com.zy.acs.manager.manager.service.AgvService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -62,6 +59,18 @@
private String taskIds;
/**
+ * 婊氱瓛绾跨瓑寰� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "婊氱瓛绾跨瓑寰� 1: 鏄� 0: 鍚� ")
+ private Integer rollerWaiting;
+
+ /**
+ * 婊氱瓛绾跨瓑寰呭湴鐮�
+ */
+ @ApiModelProperty(value= "婊氱瓛绾跨瓑寰呭湴鐮�")
+ private Long rollerWaitingCode;
+
+ /**
* 杩涘害
*/
@ApiModelProperty(value= "杩涘害")
@@ -115,65 +124,17 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
- public Travel() {}
-
- public Travel(String uuid,String travelId,Long agvId,Long currSeg,String taskContent,String taskIds,String state,Integer status,Integer deleted,Long tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
- this.uuid = uuid;
- this.travelId = travelId;
- this.agvId = agvId;
- this.currSeg = currSeg;
- this.taskContent = taskContent;
- this.taskIds = taskIds;
- this.state = state;
- this.status = status;
- this.deleted = deleted;
- this.tenantId = tenantId;
- this.createBy = createBy;
- this.createTime = createTime;
- this.updateBy = updateBy;
- this.updateTime = updateTime;
- this.memo = memo;
- }
-
-// Travel travel = new Travel(
-// null, // 缂栧彿
-// null, // 缁勭紪鍙�
-// null, // AGV
-// null, // 褰撳墠鑺傜偣
-// null, // 鍐呭
-// null, // 浠诲姟鍒楄〃
-// null, // 杩涘害
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getAgvId$(){
- AgvService service = SpringUtils.getBean(AgvService.class);
- Agv agv = service.getById(this.agvId);
- if (!Cools.isEmpty(agv)){
- return String.valueOf(agv.getUuid());
- }
- return null;
- }
-
- public String getStatus$(){
- if (null == this.status){ return null; }
- switch (this.status){
+ public Boolean rollerWaitingBool(){
+ if (null == this.rollerWaiting){ return null; }
+ switch (this.rollerWaiting){
case 1:
- return "姝ｅ父";
+ return true;
case 0:
- return "鍐荤粨";
+ return false;
default:
- return String.valueOf(this.status);
+ return null;
}
}
-
public Boolean getStatusBool(){
if (null == this.status){ return null; }
--
Gitblit v1.9.1