From 1de6b39bfe3967916dcab8122be0d69fbaba8cca Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 30 五月 2025 17:29:06 +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/manager/enums/TaskType.java | 8 +++-----
1 files changed, 3 insertions(+), 5 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 8ee875c..33337d3 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,24 +10,22 @@
public enum TaskType {
TASK_TYPE_IN("1", "鍏ュ簱"),
- TASK_TYPE_FLAT_WAREHOUSE_IN("2", "骞冲簱涓婃灦"),
- TASK_TYPE_AGV_IN("3", "AGV鍏ュ簱"),
TASK_TYPE_EMPITY_IN("10", "绌烘澘鍏ュ簱"),
TASK_TYPE_LOC_MOVE("11", "搴撴牸绉昏浇"),
TASK_TYPE_PICK_IN("53", "鎷ｆ枡鍐嶅叆搴�"),
TASK_TYPE_MERGE_IN("54", "骞舵澘鍐嶅叆搴�"),
TASK_TYPE_CHECK_IN("57", "鐩樼偣鍐嶅叆搴�"),
TASK_TYPE_OUT("101", "鍑哄簱"),
- TASK_TYPE_PICK_AGAIN_IN("103", "鎷ｆ枡鍏ュ簱"),
+ TASK_TYPE_PICK_AGAIN_OUT("103", "鎷ｆ枡鍑哄簱"),
TASK_TYPE_MERGE_OUT("104", "骞舵澘鍑哄簱"),
TASK_TYPE_CHECK_OUT("107", "鐩樼偣鍑哄簱"),
TASK_TYPE_EMPITY_OUT("110", "绌烘澘鍑哄簱"),
;
- public Short type;
+ public Integer type;
public String desc;
TaskType(String type, String desc) {
- this.type = Short.parseShort(type);
+ this.type = Integer.parseInt(type);
this.desc = desc;
}
}
--
Gitblit v1.9.1