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/TaskStsType.java |   83 +++++++++++++++++++++++++++--------------
 1 files changed, 55 insertions(+), 28 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
index fdadc82..416fec2 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java
@@ -1,15 +1,16 @@
 package com.vincent.rsf.server.manager.enums;
 
 public enum TaskStsType {
-
     //浠诲姟鐘舵��
+
+    MISSION_INITIAL("0", "璺緞瑙勫垝涓�"),
     GENERATE_IN("1", "鍒涘缓鍏ュ簱浠诲姟"),
-    WCS_EXECUTE_IN("2", "RCS浠诲姟宸蹭笅鍙�"),
-    WCS_CONTAINER_RECEIVE("3", "RCS瀹瑰櫒鍒拌揪"),
-    WCS_CONVEYOR_START("4", "RCS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"),
-    WCS_TOTE_LOAD("5", "RCS鍙栫瀹屾垚"),
-    WCS_TOTE_UNLOAD("6", "RCS鏀剧瀹屾垚"),
-    WCS_PUTAWAY_SUCESS("7", "RCS浠诲姟瀹屾垚"),
+    WCS_EXECUTE_IN("2", "WCS銆丷CS浠诲姟宸蹭笅鍙�"),
+    WCS_CONTAINER_RECEIVE("3", "WCS銆丷CS瀹瑰櫒鍒拌揪"),
+    WCS_CONVEYOR_START("4", "WCS銆丷CS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"),
+    WCS_TOTE_LOAD("5", "WCS銆丷CS鍙栫瀹屾垚"),
+    WCS_TOTE_UNLOAD("6", "WCS銆丷CS鏀剧瀹屾垚"),
+    WCS_PUTAWAY_SUCESS("7", "WCS銆丷CS浠诲姟瀹屾垚"),
 
 //    WCS_PUTAWAY_FAILED(11L, "浠诲姟澶辫触"),
 //
@@ -18,37 +19,63 @@
 //    WCS_PUTAWAY_SUSPEND(13L, "鍏ュ簱浠诲姟鎸傝捣"),
 
     COMPLETE_IN("98", "鍏ュ簱瀹屾垚"),
-
     REPORT_IN("99", "涓婃姤瀹屾垚"),
-
     UPDATED_IN("100", "搴撳瓨鏇存柊瀹屾垚"),
-
     GENERATE_OUT("101", "鍒涘缓鍑哄簱浠诲姟"),
-
-    WCS_EXECUTE_OUT("102", "RCS鍑哄簱浠诲姟宸蹭笅鍙�"),
-
-    WCS_EXECUTE_OUT_TOTE_LOAD("103", "RCS鍙栫瀹屾垚"),
-
-    WCS_EXECUTE_OUT_TOTE_UNLOAD("104", "RCS鏀剧瀹屾垚"),
-
-    WCS_EXECUTE_OUT_TASK_DONE("105", "RCS浠诲姟瀹屾垚"),
-
-    WCS_EXECUTE_OUT_ARRIVED("106", "RCS瀹瑰櫒宸插埌杈�"),
-
-    WCS_EXECUTE_OUT_CONVEYOR("107", "RCS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"),
-
+    WCS_EXECUTE_OUT("102", "WCS銆丷CS鍑哄簱浠诲姟宸蹭笅鍙�"),
+    WCS_EXECUTE_OUT_TOTE_LOAD("103", "WCS銆丷CS鍙栫瀹屾垚"),
+    WCS_EXECUTE_OUT_TOTE_UNLOAD("104", "WCS銆丷CS鏀剧瀹屾垚"),
+    WCS_EXECUTE_OUT_TASK_DONE("105", "WCS銆丷CS浠诲姟瀹屾垚"),
+    WCS_EXECUTE_OUT_ARRIVED("106", "WCS銆丷CS瀹瑰櫒宸插埌杈�"),
+    WCS_EXECUTE_OUT_CONVEYOR("107", "WCS銆丷CS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"),
+    AWAIT("196","绛夊緟纭"),
     GENERATE_WAVE_SEED("197", "绛夊緟瀹瑰櫒鍒拌揪"),
-    WAVE_SEED("198", "鎾涓�"),
-
-    COMPLETE_OUT("199", "鍑哄簱瀹屾垚"),
+    COMPLETE_OUT("198", "鍑哄簱瀹屾垚"),
+    WAVE_SEED("199", "鎾涓�/鐩樼偣涓�/寰呯‘璁�"),
     UPDATED_OUT("200", "搴撳瓨鏇存柊瀹屾垚"),
+
+
+
+    MISSION_TEMPLATE_EXECUTE_WCS_ONE1("1001", "1001.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_ONE2("1002", "1002.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE1("1003", "1003.RCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE2("1004", "1004.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_TWO1("1005", "1005.RCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_TWO2("1006", "1006.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_TWO1("1007", "1007.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_TWO2("1008", "1008.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_THREE1("1009", "1009.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_THREE2("1010", "1010.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_FOUR1("1011", "1011.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_FOUR2("1012", "1012.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_FIVE1("1013", "1013.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_FIVE2("1014", "1014.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_THREE1("1015", "1015.RCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_THREE2("1016", "1016.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_SIX1("1017", "1017.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_SIX2("1018", "1018.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_SEVEN1("1019", "1019.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_SEVEN2("1020", "1020.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_FOUR1("1021", "1021.RCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_FOUR2("1022", "1022.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_FIVE1("1023", "1023.RCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_FIVE2("1024", "1024.RCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_EIGHT1("1025", "1025.WCS璇锋眰涓嬪彂涓�"),
+    MISSION_TEMPLATE_EXECUTE_WCS_EIGHT2("1026", "1026.WCS浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+    MISSION_TEMPLATE_NO_EXECUTE1("1027", "1027.涓嶆墽琛屼换鍔�"),
+    MISSION_TEMPLATE_WEIGHING_ONE2("1028", "1028.绉伴噸浣滀笟涓瓑寰呬笂鎶ュ畬鎴�"),
+
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE3("1029", "1029.RCS缁戝畾鏁版嵁"),
+    MISSION_TEMPLATE_EXECUTE_HK_RCS_ONE4("1030", "1030.RCS瑙g粦鏁版嵁"),
+
+    MISSION_TRANSFER("9999", "9999.浠诲姟瀹屾垚涓�"),
     ;
 
-    public Short id;
+    public Integer id;
     public String desc;
 
     TaskStsType(String id, String desc) {
-        this.id = Short.parseShort(id);
+        this.id = Integer.parseInt(id);
         this.desc = desc;
     }
 

--
Gitblit v1.9.1