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/Segment.java | 76 +++++++++++++-------------------------
1 files changed, 26 insertions(+), 50 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
index 4a47d07..9f62586 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Segment.java
@@ -8,7 +8,6 @@
import com.zy.acs.manager.manager.service.AgvService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.TaskService;
-import com.zy.acs.manager.manager.service.TravelService;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -89,6 +88,30 @@
private Integer backpack;
/**
+ * 绠楁硶鑰楁椂
+ */
+ @ApiModelProperty(value= "绠楁硶鑰楁椂")
+ private Integer algoTime;
+
+ /**
+ * 寮�濮嬫椂闂�
+ */
+ @ApiModelProperty(value= "寮�濮嬫椂闂�")
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value= "缁撴潫鏃堕棿")
+ private Date endTime;
+
+ /**
+ * 婊氱瓛绾跨瓑寰� 1: 鏄� 0: 鍚�
+ */
+ @ApiModelProperty(value= "婊氱瓛绾跨瓑寰� 1: 鏄� 0: 鍚� ")
+ private Integer rollerWaiting;
+
+ /**
* 杩涘害
*/
@ApiModelProperty(value= "杩涘害")
@@ -144,53 +167,6 @@
public Segment() {}
- public Segment(String uuid,Long travelId,Long taskId,Long agvId,Integer serial,Long startNode,Long endNode,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.taskId = taskId;
- this.agvId = agvId;
- this.serial = serial;
- this.startNode = startNode;
- this.endNode = endNode;
- 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;
- }
-
-// Segment segment = new Segment(
-// null, // 缂栧彿
-// null, // 浠诲姟缁�
-// null, // 浠诲姟
-// null, // AGV
-// null, // 搴忓彿
-// null, // 璧峰鑺傜偣
-// null, // 鐩爣鑺傜偣
-// null, // 杩涘害
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null // 澶囨敞
-// );
-
- public String getTravelId$(){
- TravelService service = SpringUtils.getBean(TravelService.class);
- Travel travel = service.getById(this.travelId);
- if (!Cools.isEmpty(travel)){
- return String.valueOf(travel.getUuid());
- }
- return null;
- }
-
public String getTaskId$(){
TaskService service = SpringUtils.getBean(TaskService.class);
Task task = service.getById(this.taskId);
@@ -213,7 +189,7 @@
CodeService service = SpringUtils.getBean(CodeService.class);
Code code = service.getById(this.startNode);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
@@ -222,7 +198,7 @@
CodeService service = SpringUtils.getBean(CodeService.class);
Code code = service.getById(this.endNode);
if (!Cools.isEmpty(code)){
- return String.valueOf(code.getUuid());
+ return String.valueOf(code.getData());
}
return null;
}
--
Gitblit v1.9.1