Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java

@@ -225,6 +225,7 @@
        }
        agvTaskCreateParam.setTaskCode(agvWrkMast.getWrkNo().toString());
        switch (agvWrkMast.getIoType()) {
            case 114:
            case 108:
            case 12:
                agvTaskCreateParam.setTaskTyp("F06");
@@ -284,16 +285,16 @@
            int code = Integer.parseInt(jsonObject.get("code").toString());
            if(code != 0){
                //TODO 张超
                //throw new CoolException("调用AGV响应错误");
                return code;
                throw new CoolException("调用AGV响应错误");
                //return code;
            }
            success = true;
            return code;
        }catch (Exception e){
            log.error(e.getMessage());
            //TODO 张超
            //throw new CoolException("调用AGV响应错误");
            return 1;
            throw new CoolException("调用AGV响应错误");
            //return 1;
        }finally {
            apiLogService.save(
                    namespace,