Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-02 68de8850d0c2fb4e5efef77ad92275ff05686708

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

@@ -5,6 +5,8 @@
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.*;
import com.zy.asrs.entity.param.MesBuyPakinReportParam;
@@ -105,6 +107,12 @@
    private DocTypeService docTypeService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private OrderDetlService orderDetlService;
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Autowired
    private FlowLogService flowLogService;

    @Transactional
    public ReturnT<String> completedPutWayWrk(AgvWrkMast agvWrkMast) {
@@ -112,6 +120,9 @@
        List<AgvWrkDetl> agvWrkDetlListOld = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));

        try {
        long flowId = snowflakeIdWorker.nextId();
        Date now = new Date();
        try{
            int wrkNo = agvWrkMast.getWrkNo();
            String barcode = agvWrkMast.getBarcode();
            String orderNo = getOrderNoByWrkNo(wrkNo);
@@ -169,7 +180,35 @@
                        AgvLocDetl agvLocDetl = agvLocDetlService.selectByMatnrAndBatchAndCsocodeAndisoCode(agvWrkMast.getLocNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getBatch(), agvWrkDetl.getThreeCode(), agvWrkDetl.getDeadTime());
                        if (!Cools.isEmpty(agvLocDetl)) {
                            double updateAnfme = agvLocDetl.getAnfme() - agvWrkDetl.getAnfme();
                            agvLocDetlService.updateAnfme(updateAnfme, agvLocDetl.getLocNo(), agvLocDetl.getMatnr(), agvLocDetl.getBatch(), agvLocDetl.getThreeCode(), agvLocDetl.getDeadTime());
//                            OrderDetl orderDetl = orderDetlService.selectItem(agvWrkDetl.getOrderNo(), agvWrkDetl.getMatnr(), agvWrkDetl.getThreeCode());
//                            FlowLog flowLog = new FlowLog();
//                            flowLog.setFid(String.valueOf(flowId));
//                            flowLog.setSpare2(String.valueOf(agvWrkMast.getWrkNo()));
//                            flowLog.setLocNo(agvWrkMast.getLocNo());
//                            flowLog.setSpare1(agvWrkDetl.getSuppCode());
//                            flowLog.setOpType(53L);
//                            flowLog.setOrderNo(agvWrkDetl.getOrderNo());
//                            flowLog.setThreeCode(agvWrkDetl.getThreeCode());
//                            flowLog.setMatnr(agvWrkDetl.getMatnr());
//                            flowLog.setMaktx(agvWrkDetl.getMaktx());
//
//                            flowLog.setOrderPrevious(orderDetl.getAnfme());
//                            flowLog.setOrderCurrent(orderDetl.getAnfme());
//                            flowLog.setOrderChanged(0.0);
//
//                            flowLog.setQtyPrevious(orderDetl.getQty());
//                            flowLog.setQtyCurrent(updateAnfme);
//                            flowLog.setQtyChanged(agvWrkDetl.getAnfme());
//
//                            flowLog.setLocPrevious(agvLocDetl.getAnfme());
//                            flowLog.setLocCurrent(updateAnfme);
//                            flowLog.setLocChanged(agvWrkDetl.getAnfme());
//
//                            flowLog.setAppeTime(now);
//                            if (!flowLogService.insert(flowLog)) {
//                                throw new CoolException("同步半成品调拨单流水记录失败");
//                            }
                            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());

@@ -178,7 +217,6 @@
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    break;
                case 57:
                    Date now = new Date();
                    // 更新库存明细
                    List<AgvWrkDetl> wrkDetlList = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                    wrkDetlList.forEach(agvWrkDetl -> {
@@ -192,60 +230,60 @@
                        }
                    });
                    // 更新站点 + 库位状态     源库位是站点
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    break;
                case 58:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
                    break;
                case 108:
                case 114:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    //更新库存明细
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
                    //修改源库位状态为O
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                    break;
                case 109:
                    // 库位 -- 接驳位 / 库位
                    if (agvWrkMast.getLocNo().substring(0, 2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    if (agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                        // 接驳位 -- 库位
                    } else {
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    }
                    // 接驳位 -- 库位
                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
                        // 库位 -- 接驳位 / 库位
                    } else {
                        //修改源库位状态为O
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                    }
                    break;
                case 111:
                    // 库位 -- 接驳位 / 库位
                    if (agvWrkMast.getLocNo().substring(0, 2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    if (agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                        // 接驳位 -- 库位
                    } else {
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    }

                    // 接驳位 -- 库位
                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
                        // 库位 -- 接驳位 / 库位
                    } else {
                        //修改源库位状态为O
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                        //更新目标库位明细 101.出库 删除源库位库存明细
                        agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvWrkMast.getSourceLocNo()));
                        agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
                    }
                    break;
                case 112:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
                    for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
                        AgvLocDetl locDetl = new AgvLocDetl();
@@ -255,27 +293,27 @@
                        agvLocDetlService.insert(locDetl);
                    }
                    // 接驳位 -- 库位
                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
                        // 库位 -- 接驳位 / 库位
                    } else {
                        //修改源库位状态为O
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                    }
                    break;
                case 113:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "D", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    // 接驳位 -- 库位
                    if (agvWrkMast.getSourceLocNo().substring(0, 2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(), "O", "", (short) 0);
                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
                    }
                    break;
                case 121:
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(), "F", agvWrkMast.getBarcode(), agvWrkMast.getWhsType().shortValue());
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
                    //更新库存明细
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(), agvWrkMast.getLocNo());
                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
                    //修改源库位状态为O
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", agvWrkMast.getWhsType().shortValue(), "", (short) 0);
                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                    break;

                default:
@@ -285,7 +323,7 @@
                //删除AGV工作档
                agvWrkMastService.deleteById(wrkNo);
                //删除AGV工作明细档
                agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
                agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
            }
//            else {
//                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
@@ -295,14 +333,14 @@
//                agvWrkMastService.updateById(agvWrkMast);
//            }

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

@@ -345,11 +383,11 @@
            agvWrkMastService.updateById(agvWrkMast);
            //修改源库位状态为O
            if (agvWrkMast.getIoType() == 110) {
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
            }
            if (agvWrkMast.getIoType() == 101) {
            if(agvWrkMast.getIoType() == 101){
                //更新目标库位明细 101.出库 删除源库位库存明细
                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvWrkMast.getSourceLocNo()));
                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
                //生成空板入库任务
                Short containerType = Short.valueOf(agvWrkMast.getBarcode().substring(0, 2));
                try {
@@ -375,6 +413,7 @@
                    wrkMast.setAppeTime(now);
                    wrkMast.setModiUser(9527L);
                    wrkMast.setModiTime(now);
                    wrkMast.setPltType(agvWrkMast.getPltType());
                    wrkMast.setLogErrMemo("completedCarryWrk");
                    if (!agvWrkMastService.insertByIncrease(wrkMast)) {
                        throw new CoolException("保存工作档失败");
@@ -388,7 +427,7 @@
                    agvBasDevp.setLocSts("R");
                    agvBasDevp.setLocType2(Short.valueOf(agvWrkMast.getBarcode().substring(0, 2)));
                    agvBasDevpService.updateById(agvBasDevp);
                } catch (Exception e) {
                }catch (Exception e){
                    e.printStackTrace();
                    log.error(e.getMessage());
                }
@@ -401,15 +440,15 @@
            //删除AGV工作档
            agvWrkMastService.deleteById(wrkNo);
            //删除AGV工作明细档
            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
            if (!isJSON(orderNo)) {
            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
            if(!isJSON(orderNo)){
                //检查订单是否已完成
                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
            } else {
                orderService.checkComplete(orderNo);
            }else{
                List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                maps.forEach(map -> {
                    String o = map.get("orderNo").toString();
                    orderService.checkComplete(o, agvWrkMast.getLocNo());
                    orderService.checkComplete(o, agvWrkMast.getPltType());
                });
            }

@@ -425,6 +464,7 @@
        reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }


    @Transactional
    public ReturnT<String> completedCarryWrk2(AgvWrkMast agvWrkMast) {
@@ -445,10 +485,10 @@
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
            //修改源库位状态为O
            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(), "O", "", null);
            if (agvWrkMast.getIoType() == 101) {
            agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
            if(agvWrkMast.getIoType() == 101){
                //更新目标库位明细 101.出库 删除源库位库存明细
                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", agvWrkMast.getSourceLocNo()));
                agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
            }

            //生成AGV工作历史档
@@ -458,15 +498,15 @@
            //删除AGV工作档
            agvWrkMastService.deleteById(wrkNo);
            //删除AGV工作明细档
            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", wrkNo));
            if (!isJSON(orderNo)) {
            agvWrkDetlService.delete(new EntityWrapper<AgvWrkDetl>().eq("wrk_no",wrkNo));
            if(!isJSON(orderNo)){
                //检查订单是否已完成
                orderService.checkComplete(orderNo, agvWrkMast.getLocNo());
            } else {
                orderService.checkComplete(orderNo);
            }else{
                List<Map> maps = JSONArray.parseArray(orderNo, Map.class);
                maps.forEach(map -> {
                    String o = map.get("orderNo").toString();
                    orderService.checkComplete(o, agvWrkMast.getLocNo());
                    orderService.checkComplete(o);
                });
            }
            //上报mes
@@ -479,7 +519,8 @@
        } catch (Exception e) {
            log.error("" + e.getMessage());
        }
        reportMes(agvWrkMast, agvWrkDetlListOld);
        //TODO 张超
        //reportMes(agvWrkMast, agvWrkDetlListOld);
        return SUCCESS;
    }

@@ -487,23 +528,24 @@
    @Synchronized
    public ReturnT<String> startPutWayWrk(AgvWrkMast agvWrkMast) throws IOException {

        try {
        try{
            //下发任务
            int startWrkCode = agvWrkMastService.startWrk(agvWrkMast);
            if (startWrkCode != 0) {
            if(startWrkCode != 0){
                throw new CoolException("任务下发失败");
            }

            agvWrkMast.setWrkSts(202L);
            agvWrkMast.setModiTime(new Date());
            agvWrkMastService.updateById(agvWrkMast);
            if (agvWrkMast.getIoType() == 1) {
            if(agvWrkMast.getIoType() == 1){
                //修改AGV入库通知档状态入出状态为Y
                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(), "Y");
                agvWaitPakinService.updateIoStatus(agvWrkMast.getWrkNo(),"Y");
            }
            return SUCCESS;
        } catch (Exception e) {
            log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
            //TODO
            //log.error("修改AGV入库通知档状态入出状态为Y" + e.getMessage());
        }
        return FAIL;
    }
@@ -511,16 +553,16 @@
    @Transactional
    @Synchronized
    public ReturnT<String> startAllcationIn(AgvWrkMast agvWrkMast) throws IOException {

        
        //下发任务
        try {
        try{
            int startWrkCode = agvWrkMastService.startAllcationIn(agvWrkMast);
            if (startWrkCode != 0) {
            if(startWrkCode != 0){
                throw new CoolException("任务下发失败");
            }
            return SUCCESS;
        } catch (Exception e) {
            log.error("任务下发失败" + e.getMessage());
        }catch (Exception e){
            log.error("任务下发失败"+e.getMessage());
        }
        return FAIL;

@@ -559,11 +601,11 @@
            List<Map<String, Object>> devNoMaps = agvBasDevpService.selectDevNoAndNumBystationCode(agvWrkMast.getLocNo());
            //取第一个暂存位，并查询其次数与配置的次数做比较
            Map<String, Object> devNoMap = devNoMaps.get(0);
            if ((int) devNoMap.get("num") < maxWrokNum) {
            if((int)devNoMap.get("num") < maxWrokNum){
                agvWrkMast.setLocNo(devNoMap.get("dev_no").toString());
                agvWrkMast.setModiTime(new Date());
                agvWrkMastService.updateById(agvWrkMast);
                log.info("after：" + devNoMap.toString() + ", wrkNo:" + agvWrkMast.getWrkNo() + ", locNo: " + agvWrkMast.getLocNo());
                log.info("after：" + devNoMap.toString()  +  ", wrkNo:" + agvWrkMast.getWrkNo() + ", locNo: " + agvWrkMast.getLocNo());
            }
        });

@@ -602,10 +644,10 @@
        }
    }

    private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList) {
    private List<AgvWrkMast> filter(List<AgvWrkMast> agvWrkMastList){
        return agvWrkMastList.stream().filter(agvWrkMast -> {
            AgvWrkMast agvWrkMastWroking = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("source_loc_no", agvWrkMast.getLocNo()));
            if (!Cools.isEmpty(agvWrkMastWroking) && agvWrkMastWroking.getWrkSts() <= 202) {
            if(!Cools.isEmpty(agvWrkMastWroking) && agvWrkMastWroking.getWrkSts()<=202){
                System.out.println("source_loc_no > 1");
                return false;
            }
@@ -618,7 +660,7 @@
    /*
  生成工作档
   */
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor) {
    private AgvWrkMast createWrkMast(int ioType, long wrkSts, String sourceLocNo, String locNo, String barcode, Date now, Long userId, int containerType, int floor){
        AgvWrkMast wrkMast = new AgvWrkMast();
        //工作状态
        wrkMast.setWrkSts(wrkSts);
@@ -647,7 +689,7 @@
            throw new CoolException("保存工作档失败");
        }

        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no", sourceLocNo).eq("barcode", barcode).orderBy("modi_time", false));
        wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>().eq("loc_no", locNo).eq("source_loc_no",sourceLocNo).eq("barcode",barcode).orderBy("modi_time",false));

        return wrkMast;
    }
@@ -825,18 +867,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).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) {
                throw new CoolException(jsonObject.get("dsc").toString());
                log.info("mes接口调用失败，返回信息：" + jsonObject);
                //TODO 张超
                //throw new CoolException("mes接口调用失败，返回信息:" + jsonObject);
            }
            success = true;
            return jsonObject;
@@ -853,15 +890,7 @@
            log.error(e.getMessage());
            throw new CoolException(e.getMessage());
        } finally {
            apiLogService.save(
                    namespace,
                    url + path,
                    appkey,
                    ip,
                    JSON.toJSONString(JSONObject.toJSONString(requestParam)),
                    response,
                    success
            );
            apiLogService.save(namespace, url + path, appkey, ip, JSON.toJSONString(JSONObject.toJSONString(requestParam)), response, success);
        }

    }