From 3a49654f51096d4f9f95f4a5e8198e168e38a0c5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期六, 16 八月 2025 08:34:13 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
index 60b8eaf..841ada0 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java
@@ -57,9 +57,20 @@
/**
* 浼樺厛绾�
+ * The large the value, the earlier it will be executed
*/
@ApiModelProperty(value= "浼樺厛绾�")
private Integer priority;
+ /**
+ * 鍙栬繕鏄斁锛�1鍙栵紝2鏀�
+ */
+ @ApiModelProperty(value= "鍙栬繕鏄斁锛�1鍙栵紝2鏀�")
+ private Integer askType;
+ /**
+ * 鏄惁璇㈤棶绔欑偣
+ */
+ @ApiModelProperty(value= "鏄惁璇㈤棶绔欑偣")
+ private String askSta;
/**
* 鍚嶇О
@@ -181,6 +192,9 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ public Action() {
+ }
+
public Action(String uuid, Long busId, Long taskId, String seqNum, Integer priority, String name, Double val, String code, String params, Long actionType, Long actionSts, Long agvId, Date ioTime) {
this.uuid = uuid;
this.busId = busId;
@@ -197,11 +211,29 @@
this.ioTime = ioTime;
}
+ public Action(String uuid, Long busId, Long taskId, String seqNum, Integer priority, String name, Double val, String code, String params, Long actionType, Long actionSts, Long agvId, Date ioTime,Integer askType,String askSta) {
+ this.uuid = uuid;
+ this.busId = busId;
+ this.taskId = taskId;
+ this.seqNum = seqNum;
+ this.priority = priority;
+ this.name = name;
+ this.val = val;
+ this.code = code;
+ this.params = params;
+ this.actionType = actionType;
+ this.actionSts = actionSts;
+ this.agvId = agvId;
+ this.ioTime = ioTime;
+ this.askType = askType;
+ this.askSta = askSta;
+ }
+
public String getBusId$(){
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;
}
--
Gitblit v1.9.1