自动化立体仓库 - WMS系统
zhangchao
2024-11-21 f4214b3e0764ab116fc6975dbbc5bb4fc80f9fcd
src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.util.*;
import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
@Slf4j
@@ -48,7 +49,7 @@
        add(101);
        add(12);
        add(53);
        add(101);
        add(103);
        add(108);
        add(111);
        add(112);
@@ -59,6 +60,8 @@
    @Value("${agvBasDev.maxWorkNum}")
    private int maxWrokNum;
    @Value("${mes.report}")
    private Boolean flag;
    @Value("${mes.url}")
    private String url;
    @Value("${mes.getTokenUrl}")
@@ -353,11 +356,7 @@
        }
        //TODO
        //暂时加上trycatch
        try {
            reportMes(agvWrkMast, agvWrkDetlListOld);
        } catch (Exception e) {
            e.printStackTrace();
        }
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }
@@ -517,7 +516,7 @@
            log.error("" + e.getMessage());
        }
        //TODO 张超
        //reportMes(agvWrkMast, agvWrkDetlListOld);
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }
@@ -542,7 +541,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            //log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
        }
        return FAIL;
    }
@@ -692,13 +691,19 @@
    }
    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);
@@ -742,9 +747,9 @@
            } else {
                MesPakinReportParam mesPakinReportParam = new MesPakinReportParam();
                mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
                //mesPakinReportParam.setInboundOrderCode(agvWrkDetl.getOrderNo());
                mesPakinReportParam.setBizType("0");
                mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(agvWrkDetl.getThreeCode().trim(), agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
                mesPakinReportParam.setInventoryAttr(new MesPakinReportParam.InventoryAttr(null, agvWrkDetl.getMatnr(), agvWrkMast.getLocNo()));
                mesPakinReportParam.setNoQrCodeExecAmount(new MesPakinReportParam.NoQrCodeExecAmount(agvWrkDetl.getAnfme(), agvWrkDetl.getUnit(), null));
                doHttpRequest(mesPakinReportParam, getMesTokenInfo(), "上报mes入库信息", url, pakinReportPath, null, "127.0.0.1");
@@ -864,13 +869,13 @@
        boolean success = false;
        try {
            response = new HttpHandler.Builder().setUri(url).setPath(path).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
            response = new HttpHandler.Builder().setUri(url).setPath(path).setTimeout(30, TimeUnit.SECONDS).setHeaders(headParam).setJson(JSONObject.toJSONString(requestParam)).setHttps(true).build().doPost();
            JSONObject jsonObject = JSON.parseObject(response);
            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;