From 590a64af2cdd33427ed8eda2eb983b07dd60ab8b Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 16 一月 2026 12:05:12 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java | 35 ++++++++++++++++++++++++++---------
1 files changed, 26 insertions(+), 9 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java
index 6eff33b..6fd7636 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/domain/TaskPosDto.java
@@ -19,6 +19,8 @@
private Long codeId;
+ private Long segId;
+
private Double[] xy = new Double[2];
private PosType posType;
@@ -30,24 +32,39 @@
}
public enum PosType {
- MOVE(0),
- ORI_LOC(0),
- ORI_STA(0),
- DEST_LOC(INF),
- DEST_STA(INF),
- TO_CHARGE(INF * 10),
- TO_STANDBY(INF * 10),
+ MOVE(0, "MOVE"),
+ ORI_LOC(0, "ORIGIN"),
+ ORI_STA(0, "ORIGIN"),
+ DEST_LOC(INF, "DESTINATION"),
+ DEST_STA(INF, "DESTINATION"),
+ TO_CHARGE(INF * 10, "TO_CHARGE"),
+ TO_STANDBY(INF * 10, "TO_STANDBY"),
;
public int compOffset;
+ public String brief;
- PosType(int compOffset) {
+ PosType(int compOffset, String brief) {
this.compOffset = compOffset;
+ this.brief = brief;
}
+
+ public static PosType of(String posTypeStr) {
+ if (Cools.isEmpty(posTypeStr)) {
+ return null;
+ }
+ for (PosType type : PosType.values()) {
+ if (type.toString().equals(posTypeStr)) {
+ return type;
+ }
+ }
+ throw new IllegalArgumentException(posTypeStr);
+ }
+
}
public static void packagePosGroup(Map<String, List<TaskPosDto>> groups, Task task, Code code, PosType posType, String sameGroupXy) {
- String key = ("Y".equals(sameGroupXy) ? code.getY() : code.getX()) + posType.toString();
+ String key = ("Y".equals(sameGroupXy) ? code.getY() : code.getX()) + posType.brief;
Long taskId = task == null ? 0L : task.getId();
TaskPosDto taskPosDto = new TaskPosDto(taskId, new Double[]{code.getX(), code.getY()}, posType);
taskPosDto.setCodeId(code.getId());
--
Gitblit v1.9.1