合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

 src/main/java/com/zy/asrs/task/handler/AutoMoveTwoAndThreeGoOneHandler.java

@@ -130,13 +130,16 @@

            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                throw new CoolException("调用AGV响应错误");
                //TODO 张超
                //throw new CoolException("调用AGV响应错误");
                return code;
            }
            success = true;
            return code;
        }catch (Exception e){
            log.error(e.getMessage());
            throw new CoolException("调用AGV响应错误");
            //throw new CoolException("调用AGV响应错误");
            return 1;
        }finally {
            apiLogService.save(
                    namespace,