From 79843611908e58f9538f8d8ebac62d3f0d01712c Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期一, 02 二月 2026 17:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java | 28 ++++++++++++++++++++++++++--
1 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
index 33337d3..ad8549b 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskType.java
@@ -10,7 +10,7 @@
public enum TaskType {
TASK_TYPE_IN("1", "鍏ュ簱"),
- TASK_TYPE_EMPITY_IN("10", "绌烘澘鍏ュ簱"),
+ TASK_TYPE_EMPTY_IN("10", "绌烘澘鍏ュ簱"),
TASK_TYPE_LOC_MOVE("11", "搴撴牸绉昏浇"),
TASK_TYPE_PICK_IN("53", "鎷ｆ枡鍐嶅叆搴�"),
TASK_TYPE_MERGE_IN("54", "骞舵澘鍐嶅叆搴�"),
@@ -19,7 +19,8 @@
TASK_TYPE_PICK_AGAIN_OUT("103", "鎷ｆ枡鍑哄簱"),
TASK_TYPE_MERGE_OUT("104", "骞舵澘鍑哄簱"),
TASK_TYPE_CHECK_OUT("107", "鐩樼偣鍑哄簱"),
- TASK_TYPE_EMPITY_OUT("110", "绌烘澘鍑哄簱"),
+ TASK_TYPE_CROSS_DOCKING_OUT("109", "瓒婂簱"),
+ TASK_TYPE_EMPTY_OUT("110", "绌烘澘鍑哄簱"),
;
public Integer type;
public String desc;
@@ -28,4 +29,27 @@
this.type = Integer.parseInt(type);
this.desc = desc;
}
+
+ public static String getTypeDesc(Integer type) {
+ if (type == null) {
+ return null;
+ }
+ if (TaskType.TASK_TYPE_IN.type.equals(type)) {
+ return TaskType.TASK_TYPE_IN.desc;
+ } else if (TaskType.TASK_TYPE_EMPTY_IN.type.equals(type)) {
+ return TaskType.TASK_TYPE_EMPTY_IN.desc;
+ } else if (TaskType.TASK_TYPE_OUT.type.equals(type)) {
+ return TaskType.TASK_TYPE_OUT.desc;
+ } else if (TaskType.TASK_TYPE_PICK_IN.type.equals(type)) {
+ return TaskType.TASK_TYPE_PICK_IN.desc;
+ } else if (TaskType.TASK_TYPE_MERGE_IN.type.equals(type)) {
+ return TaskType.TASK_TYPE_MERGE_IN.desc;
+ } else if (TaskType.TASK_TYPE_CHECK_IN.type.equals(type)) {
+ return TaskType.TASK_TYPE_CHECK_IN.desc;
+ }
+
+ return null;
+ }
+
+
}
--
Gitblit v1.9.1