From d7bb8c43b17253b46c6a466cff5545e8b4bcaad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:10:46 +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 | 6 +++---
1 files changed, 3 insertions(+), 3 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 8e01b64..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
@@ -16,16 +16,16 @@
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