From 7f9fa6378436a22a6b7df8c8ddb3af83f42c7d8b Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 13:40:11 +0800 Subject: [PATCH] #优化修改 1. 再次收货,先收货30再次收货30累加才对 2. 批次号整个流程走不通 3. 任务工作档排序,最新的永远在最上面 --- rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java | 51 ++++++++++++++++++++++++--------------------------- 1 files changed, 24 insertions(+), 27 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java index 53568c0..47c79d8 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/entity/enums/TaskStsType.java @@ -2,17 +2,14 @@ public enum TaskStsType { - GENERATE_IN(1L, "鍒涘缓鍏ュ簱浠诲姟"), - WCS_EXECUTE_IN(2L, "RCS浠诲姟宸蹭笅鍙�"), - WCS_CONTAINER_RECEIVE(3L, "RCS瀹瑰櫒鍒拌揪"), - - WCS_CONVEYOR_START(4L, "RCS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"), - - WCS_TOTE_LOAD(5L, "RCS鍙栫瀹屾垚"), - - WCS_TOTE_UNLOAD(6L, "RCS鏀剧瀹屾垚"), - - WCS_PUTAWAY_SUCESS(7L, "RCS浠诲姟瀹屾垚"), + //浠诲姟鐘舵�� + 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_PUTAWAY_FAILED(11L, "浠诲姟澶辫触"), // @@ -20,36 +17,36 @@ // // WCS_PUTAWAY_SUSPEND(13L, "鍏ュ簱浠诲姟鎸傝捣"), - COMPLETE_IN(99L, "鍏ュ簱瀹屾垚"), + COMPLETE_IN("99", "鍏ュ簱瀹屾垚"), - UPDATED_IN(100L, "搴撳瓨鏇存柊瀹屾垚"), + UPDATED_IN("100", "搴撳瓨鏇存柊瀹屾垚"), - GENERATE_OUT(101L, "鍒涘缓鍑哄簱浠诲姟"), + GENERATE_OUT("101", "鍒涘缓鍑哄簱浠诲姟"), - WCS_EXECUTE_OUT(102L, "RCS鍑哄簱浠诲姟宸蹭笅鍙�"), + WCS_EXECUTE_OUT("102", "RCS鍑哄簱浠诲姟宸蹭笅鍙�"), - WCS_EXECUTE_OUT_TOTE_LOAD(103L, "RCS鍙栫瀹屾垚"), + WCS_EXECUTE_OUT_TOTE_LOAD("103", "RCS鍙栫瀹屾垚"), - WCS_EXECUTE_OUT_TOTE_UNLOAD(104L, "RCS鏀剧瀹屾垚"), + WCS_EXECUTE_OUT_TOTE_UNLOAD("104", "RCS鏀剧瀹屾垚"), - WCS_EXECUTE_OUT_TASK_DONE(105L, "RCS浠诲姟瀹屾垚"), + WCS_EXECUTE_OUT_TASK_DONE("105", "RCS浠诲姟瀹屾垚"), - WCS_EXECUTE_OUT_ARRIVED(106L, "RCS瀹瑰櫒宸插埌杈�"), + WCS_EXECUTE_OUT_ARRIVED("106", "RCS瀹瑰櫒宸插埌杈�"), - WCS_EXECUTE_OUT_CONVEYOR(107L, "RCS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"), + WCS_EXECUTE_OUT_CONVEYOR("107", "RCS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"), - GENERATE_WAVE_SEED(197L, "绛夊緟瀹瑰櫒鍒拌揪"), - WAVE_SEED(198L, "鎾涓�"), + GENERATE_WAVE_SEED("197", "绛夊緟瀹瑰櫒鍒拌揪"), + WAVE_SEED("198", "鎾涓�"), - COMPLETE_OUT(199L, "鍑哄簱瀹屾垚"), - UPDATED_OUT(200L, "搴撳瓨鏇存柊瀹屾垚"), + COMPLETE_OUT("199", "鍑哄簱瀹屾垚"), + UPDATED_OUT("200", "搴撳瓨鏇存柊瀹屾垚"), ; - public Long id; + public Short id; public String desc; - TaskStsType(Long id, String desc) { - this.id = id; + TaskStsType(String id, String desc) { + this.id = Short.parseShort(id); this.desc = desc; } -- Gitblit v1.9.1