上报逻辑调整

ZY

2024-12-18 184a0722e53f64f40ddb2c88f11f26941f565a8c

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

@@ -5,7 +5,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
@@ -16,7 +15,6 @@
import com.zy.asrs.service.*;
import com.zy.asrs.task.AbstractHandler;
import com.zy.asrs.task.core.ReturnT;
import com.zy.common.utils.HttpHandler;
import lombok.Synchronized;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +46,7 @@
        add(101);
        add(12);
        add(53);
        add(101);
        add(103);
        add(108);
        add(111);
        add(112);
@@ -59,6 +57,8 @@

    @Value("${agvBasDev.maxWorkNum}")
    private int maxWrokNum;
    @Value("${mes.report}")
    private Boolean flag;
    @Value("${mes.url}")
    private String url;
    @Value("${mes.getTokenUrl}")
@@ -111,6 +111,10 @@
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private FlowLogService flowLogService;

    @Autowired
    private ReportDataService reportDataService;


    @Transactional
    public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
@@ -205,6 +209,7 @@
//                            if (!flowLogService.insert(flowLog)) {
//                                throw new CoolException("同步半成品调拨单流水记录失败");
//                            }
                            log.info("53添加库存日志:{},{}", updateAnfme, JSON.toJSON(agvLocDetl));
                            agvLocDetlService.updateAnfme(updateAnfme, agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
                        }
                        //AgvLocDetl agvLocDetl = agvLocDetlService.selectLocdetl(agvWrkMast.getLocNo(),agvWrkDetl.getMatnr(),agvWrkDetl.getBatch(),agvWrkDetl.getThreeCode(),agvWrkDetl.getDeadTime());
@@ -222,6 +227,7 @@
                        agvLocDetl.sync(agvWrkDetl);
                        agvLocDetl.setModiTime(now);
                        agvLocDetl.setAppeTime(now);
                        log.info("57添加库存日志:{}", JSON.toJSON(agvLocDetl));
                        if (!agvLocDetlService.insert(agvLocDetl)) {
                            throw new CoolException("保存工作明细失败");
                        }
@@ -287,6 +293,7 @@
                        locDetl.setLocNo(agvWrkMast.getLocNo());
                        locDetl.sync(agvWrkDetl);
                        locDetl.setModiTime(new Date());
                        log.info("112添加库存日志:{}", JSON.toJSON(locDetl));
                        agvLocDetlService.insert(locDetl);
                    }
                    // 接驳位 -- 库位
@@ -329,15 +336,22 @@
//                }
//                agvWrkMastService.updateById(agvWrkMast);
//            }

            Integer pltType = agvWrkMast.getPltType();
            if (Cools.isEmpty(pltType) && !Cools.isEmpty(agvWrkMast.getLocNo())) {
                AgvLocMast agvLocMast = agvLocMastService.selectById(agvWrkMast.getLocNo());
                if (agvLocMast != null) {
                    pltType = agvLocMast.getPltType();
                }
            }
            if (!isJSON(orderNo)) {
                //检查订单是否已完成
                orderService.checkComplete(orderNo, agvWrkMast.getPltType());
                orderService.checkComplete(orderNo, pltType);
            } else {
                List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                Integer finalPltType = pltType;
                maps.forEach(map -> {
                    String o = map.get("orderNo").toString();
                    orderService.checkComplete(o, agvWrkMast.getPltType());
                    orderService.checkComplete(o, finalPltType);
                });
            }

@@ -353,11 +367,7 @@
        }
        //TODO
        //暂时加上trycatch
        try {
            reportMes(agvWrkMast, agvWrkDetlListOld);
        } catch (Exception e) {
            e.printStackTrace();
        }
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

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

@@ -532,9 +542,16 @@
                throw new CoolException("任务下发失败");
            }

            agvWrkMast.setWrkSts(202L);
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
            //agvWrkMast.setWrkSts(202L);
            //agvWrkMast.setModiTime(new Date());
            //boolean b = agvWrkMastService.updateById(agvWrkMast);
            boolean b = agvWrkMastService.updateWrkStsByWrkNo(Math.abs(agvWrkMast.getWrkNo()), 202L);
            if (!b) {
                log.info("更新任务状态失败,{}", agvWrkMast.getWrkNo());
                throw new CoolException("更新任务状态失败");
            } else {
                log.info("更新任务状态成功,{}", agvWrkMast.getWrkNo());
            }
            if (agvWrkMast.getIoType() == 1) {
                //修改AGV入库通知档状态入出状态为Y
                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(), "Y");
@@ -542,7 +559,7 @@
            return SUCCESS;
        } catch (Exception e) {
            //TODO
            //log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            log.error("修改AGV入库通知档状态入出状态为Y,{}", e.getMessage());
        }
        return FAIL;
    }
@@ -692,21 +709,32 @@
    }

    private void reportMes(AgvWrkMast agvWrkMast, List<AgvWrkDetl> agvWrkDetls) {

        if (Cools.isEmpty(agvWrkDetls)) {
            return;
        }
        List<AgvWrkDetl> data = new ArrayList<>();
        //区分不同任务类型的上报方式
        for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
            if (agvWrkDetl.getMatnr().compareTo("39") <= 0) {
                data.add(agvWrkDetl);
            }
        }
        if (!data.isEmpty()) {
            if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
                reportMesPakinOrder(agvWrkMast, data);
            }
            if (OUT_TYPE_List.contains(agvWrkMast.getIoType())) {
                reportMesPakoutOrder(agvWrkMast, data);
            }
            if (MOVE_TYPE_List.contains(agvWrkMast.getIoType())) {
                generateMesParam(agvWrkMast, data);
            }
        }

        if (IN_TYPE_LIST.contains(agvWrkMast.getIoType())) {
            reportMesPakinOrder(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) {

@@ -742,9 +770,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");
@@ -827,17 +855,17 @@

    //获取mes token信息
    private Map<String, Object> getMesTokenInfo() {
        Map<String, String> param = new HashMap<>();
        param.put("appKey", appKey);
        param.put("appSecret", appSecret);
//        Map<String, String> param = new HashMap<>();
//        param.put("appKey", appKey);
//        param.put("appSecret", appSecret);
//
//        JSONObject jsonObject = doHttpRequest(param, null, "获取MesToken", getTokenUrl, getTokenPath, null, "127.0.0.1");
//
//        Map<String, Object> headParam = new HashMap<>();
//        headParam.put("X-AUTH", JSON.parseObject(jsonObject.get("data").toString()).get("appAccessToken").toString());

        JSONObject jsonObject = doHttpRequest(param, null, "获取MesToken", getTokenUrl, getTokenPath, null, "127.0.0.1");

        Map<String, Object> headParam = new HashMap<>();
        headParam.put("X-AUTH", JSON.parseObject(jsonObject.get("data").toString()).get("appAccessToken").toString());

        return headParam;

        //       return headParam;
        return null;
    }

    //根据楼层默认出库仓位
@@ -858,37 +886,45 @@
        return null;
    }

    private JSONObject doHttpRequest(Object requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
    private void doHttpRequest(Object requestParam, Map<String, Object> headParam, String namespace, String url, String path, String appkey, String ip) {
        //保证上报表
        ReportData reportData = new ReportData();
        reportData.setReportJson(JSONObject.toJSONString(requestParam));
        reportData.setMemo(namespace);
        reportData.setCreateTime(new Date());
        reportData.setReportType("MES");
        reportDataService.insert(reportData);

        String response = "";
        boolean success = false;

        try {
            response = new HttpHandler.Builder().setUri(url).setPath(path).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);
            }
            success = true;
            return jsonObject;

//            String succeed = jsonObject.get("succeed").toString();
//        String response = "";
//        boolean success = false;
//
//            int code = Cools.eq("0",succeed) ? 0 : 1;
//            if(code != 200){
//                throw new CoolException(jsonObject.get("dsc").toString());
//        try {
//            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);
//            }
//            success = true;

        } catch (Exception e) {
            log.error(e.getMessage());
            throw new CoolException(e.getMessage());
        } finally {
            apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
        }
//            return jsonObject;
//
////            String succeed = jsonObject.get("succeed").toString();
////
////            int code = Cools.eq("0",succeed) ? 0 : 1;
////            if(code != 200){
////                throw new CoolException(jsonObject.get("dsc").toString());
////            }
////            success = true;
//
//        } catch (Exception e) {
//            log.error(e.getMessage());
//            throw new CoolException(e.getMessage());
//        } finally {
//            apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
//        }

    }