From 3e3590ecd8305c6bb9815dc940221296b0f08011 Mon Sep 17 00:00:00 2001 From: zjj <3272660260@qq.com> Date: 星期三, 25 六月 2025 10:34:00 +0800 Subject: [PATCH] #出库完成变为等待确认 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java | 2 +- rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java | 2 ++ rsf-server/src/main/java/com/vincent/rsf/server/manager/enums/TaskStsType.java | 2 ++ 3 files changed, 5 insertions(+), 1 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java index 6a6da7e..c54f46d 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/mcp/McpController.java @@ -43,6 +43,8 @@ QueryWrapper<LocItem> locItemQueryWrapper = new QueryWrapper<>(); if (null != map.get("matnr") && !Cools.isEmpty(map.get("matnr"))){ locItemQueryWrapper.eq("matnr_code", map.get("matnr")); + }else if(null != map.get("maktx") && !Cools.isEmpty(map.get("maktx"))){ + locItemQueryWrapper.eq("maktx", map.get("maktx")); }else { return R.error("鐗╂枡缂栫爜涓虹┖"); } 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 b0db724..d057354 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 @@ -37,6 +37,8 @@ WCS_EXECUTE_OUT_CONVEYOR("107", "RCS瀹瑰櫒娴佸姩浠诲姟宸蹭笅鍙�"), + AWAIT("196","绛夊緟纭"), + GENERATE_WAVE_SEED("197", "绛夊緟瀹瑰櫒鍒拌揪"), WAVE_SEED("199", "鎾涓�/鐩樼偣涓�"), diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java index f9b04ba..8b0bba2 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java @@ -464,7 +464,7 @@ // if (task.getTaskType().equals(TaskType.TASK_TYPE_LOC_MOVE.type)) { // task.setTaskStatus(TaskStsType.COMPLETE_OUT.id); // } else { - task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.COMPLETE_OUT.id); + task.setTaskStatus(task.getTaskType() < 100 ? TaskStsType.COMPLETE_IN.id : TaskStsType.AWAIT.id); // } if (!this.updateById(task)) { throw new CoolException("瀹屾垚浠诲姟澶辫触"); -- Gitblit v1.9.1