#优化

whycq

2024-11-19 2fbf3adb37334f90c29b1f119f0652f37a2608dc

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

@@ -48,7 +48,7 @@
        add(101);
        add(12);
        add(53);
        add(101);
        add(103);
        add(108);
        add(111);
        add(112);
@@ -59,6 +59,8 @@

    @Value("${agvBasDev.maxWorkNum}")
    private int maxWrokNum;
    @Value("${mes.report}")
    private Boolean flag;
    @Value("${mes.url}")
    private String url;
    @Value("${mes.getTokenUrl}")
@@ -353,11 +355,7 @@
        }
        //TODO
        //暂时加上trycatch
        try {
            reportMes(agvWrkMast, agvWrkDetlListOld);
        } catch (Exception e) {
            e.printStackTrace();
        }
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

@@ -517,7 +515,7 @@
            log.error("" + e.getMessage());
        }
        //TODO 张超
        //reportMes(agvWrkMast, agvWrkDetlListOld);
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

@@ -542,7 +540,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            //log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
        }
        return FAIL;
    }
@@ -692,20 +690,26 @@
    }

    private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
        if (!flag) {
            return;
        }
        if (Cools.isEmpty(agvWrkDetls)) {
            return;
        }
        //区分不同任务类型的上报方式

        if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
            reportMesPakinOrder(agvWrkMast, agvWrkDetls);
            String barcode = agvWrkMast.getBarcode();
            if (barcode.startsWith("20") || barcode.startsWith("21") || barcode.startsWith("40")) {
                reportMesPakinOrder(agvWrkMast, agvWrkDetls);
            }
        }
        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
            reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
        }
        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
            generateMesParam(agvWrkMast, agvWrkDetls);
        }
//        if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
//            reportMesPakoutOrder(agvWrkMast, agvWrkDetls);
//        }
//        if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
//            generateMesParam(agvWrkMast, agvWrkDetls);
//        }
    }

    private void reportMesPakinOrder(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {
@@ -870,7 +874,7 @@
            if (Cools.isEmpty(jsonObject.get("code")) || Integer.parseInt(jsonObject.get("code").toString()) != 200) {
                log.info("mes接口调用失败，返回信息：" + jsonObject);
                //TODO 张超
                //throw new CoolException("mes接口调用失败，返回信息:" + jsonObject);
                throw new CoolException("mes接口调用失败，返回信息:" + jsonObject);
            }
            success = true;
            return jsonObject;