From 076cd7a73eb60c86d43eda67c5625704576d44cc Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期二, 03 二月 2026 17:32:03 +0800
Subject: [PATCH] 实现mes空托和agv任务接口
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java | 48 +++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 47 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
index 6ef59ff..81f7e45 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/Task.java
@@ -34,7 +34,7 @@
import java.io.Serializable;
import java.util.Date;
import java.util.stream.Collectors;
-
+import com.vincent.rsf.server.manager.service.BasStationService;
@Data
@Accessors(chain = true)
@TableName("man_task")
@@ -154,6 +154,9 @@
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
+ @ApiModelProperty(value = "浠诲姟鏉ユ簮锛宮es銆乪rp")
+ private String taskOrigin;
+
/**
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@@ -206,6 +209,18 @@
*/
@ApiModelProperty(value= "璺緞ID")
private Long deviceSiteId;
+
+ /**
+ * 姝ュ簭璧风偣
+ */
+ @ApiModelProperty(value= "姝ュ簭璧风偣")
+ private String souStep;
+
+ /**
+ * 姝ュ簭缁堢偣
+ */
+ @ApiModelProperty(value= "姝ュ簭缁堢偣")
+ private String endStep;
public Task() {}
@@ -378,5 +393,36 @@
return null;
}
}
+ /**
+ * 鑾峰彇婧愮珯鐐瑰悕绉帮紙绔欑偣缂栧彿 + 绔欑偣鍚嶇О锛�
+ */
+ public String getOrgSite$(){
+ if (Cools.isEmpty(this.orgSite)) {
+ return this.orgSite;
+ }
+ BasStationService basStationService = SpringUtils.getBean(BasStationService.class);
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, this.orgSite));
+ if (!Cools.isEmpty(station) && !Cools.isEmpty(station.getStationId())) {
+ return this.orgSite + "(" + station.getStationId() + ")";
+ }
+ return this.orgSite;
+ }
+
+ /**
+ * 鑾峰彇鐩爣绔欑偣鍚嶇О锛堢珯鐐圭紪鍙� + 绔欑偣鍚嶇О锛�
+ */
+ public String getTargSite$(){
+ if (Cools.isEmpty(this.targSite)) {
+ return this.targSite;
+ }
+ BasStationService basStationService = SpringUtils.getBean(BasStationService.class);
+ BasStation station = basStationService.getOne(new LambdaQueryWrapper<BasStation>()
+ .eq(BasStation::getStationName, this.targSite));
+ if (!Cools.isEmpty(station) && !Cools.isEmpty(station.getStationId())) {
+ return this.targSite + "(" + station.getStationId() + ")";
+ }
+ return this.targSite;
+ }
}
--
Gitblit v1.9.1