From 17f9f7d74b7f2f3344b335441f9bf1653cff03f0 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 15:38:52 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java | 28 +++++++++++++++------------- 1 files changed, 15 insertions(+), 13 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java index 7d80e4b..c5cbfd6 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskType.java @@ -8,22 +8,24 @@ * @create 2025/3/29 17:02 */ public enum TaskType { - TASK_TYPE_EMPITY_IN(10L, "绌烘澘鍏ュ簱"), - TASK_TYPE_LOC_MOVE(11L, "搴撴牸绉昏浇"), - TASK_TYPE_PICK_IN(53L, "鎷f枡鍐嶅叆搴�"), - TASK_TYPE_MERGE_IN(54L, "骞舵澘鍐嶅叆搴�"), - TASK_TYPE_CHECK_IN(57L, "鐩樼偣鍐嶅叆搴�"), - TASK_TYPE_OUT(101L, "鍑哄簱"), - TASK_TYPE_PICK_AGAIN_IN(103L, "鎷f枡鍏ュ簱"), - TASK_TYPE_MERGE_OUT(104L, "骞舵澘鍑哄簱"), - TASK_TYPE_CHECK_OUT(107L, "鐩樼偣鍑哄簱"), - TASK_TYPE_EMPITY_OUT(110L, "绌烘澘鍑哄簱"), + + TASK_TYPE_IN("1", "鍏ュ簱"), + TASK_TYPE_EMPITY_IN("10", "绌烘澘鍏ュ簱"), + TASK_TYPE_LOC_MOVE("11", "搴撴牸绉昏浇"), + TASK_TYPE_PICK_IN("53", "鎷f枡鍐嶅叆搴�"), + TASK_TYPE_MERGE_IN("54", "骞舵澘鍐嶅叆搴�"), + TASK_TYPE_CHECK_IN("57", "鐩樼偣鍐嶅叆搴�"), + TASK_TYPE_OUT("101", "鍑哄簱"), + TASK_TYPE_PICK_AGAIN_IN("103", "鎷f枡鍏ュ簱"), + TASK_TYPE_MERGE_OUT("104", "骞舵澘鍑哄簱"), + TASK_TYPE_CHECK_OUT("107", "鐩樼偣鍑哄簱"), + TASK_TYPE_EMPITY_OUT("110", "绌烘澘鍑哄簱"), ; - public Long type; + public Short type; public String desc; - TaskType(Long type, String desc) { - this.type = type; + TaskType(String type, String desc) { + this.type = Short.parseShort(type); this.desc = desc; } } -- Gitblit v1.9.1