#

1

昨天 1af93b3d4833dfead180264f41cfaa896ac7d24b

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

@@ -111,6 +111,8 @@
    private BasArmMastService basArmMastService;
    @Autowired
    private ApiLogService apiLogService;
    @Autowired
    private BasDevpOptService basDevpOptService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -201,6 +203,7 @@
                        MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                    }
                    staProtocol.setWorkNo(wrkNo);
                    staProtocol.setErrCode(errMsg);
                    News.info("异常判断{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                    wrkNo++;
                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -229,6 +232,7 @@
                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                        }
                        staProtocol.setWorkNo(wrkNo);
                        staProtocol.setErrCode(errMsg);
                        News.info("条码判断{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                        wrkNo++;
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -299,7 +303,6 @@
                    }
                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);

                        SearchLocParam param = new SearchLocParam();
                        param.setBarcode(barcode);
                        param.setIoType(1);
@@ -334,6 +337,10 @@
                            staProtocol.setWorkNo(wrkNo);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            switch (jsonObject.getInteger("code")){
                                case 700: staProtocol.setErrCode("未组托");break;
                                case 500: staProtocol.setErrCode("工作档/库存条码数据已存在");break;
                            }
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            News.info("任务下发判断{}入库回退：{}，错误编号{},任务号：{}", inSta.getStaNo(), errMsg,jsonObject.getInteger("code"),wrkNo);
                            wrkNo++;
@@ -2259,7 +2266,8 @@
                WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
                if (null == wrkMast) {
                    if(staProtocol.getWorkNo() > 9999){ //异常退出
                        MessageQueue.offer(SlaveType.Led, 2, new Task(3, "异常退出"));
                        String err = basDevpOptService.getErr(staProtocol.getWorkNo());
                        MessageQueue.offer(SlaveType.Led, led.getId(), new Task(3, err));
                    }
                    continue;
                }
@@ -2390,6 +2398,8 @@
            // 命令集合
            boolean reset = true;
            for (Integer staNo : led.getStaArr()) {
//                System.out.println("staArr = " + staNo);

                // 获取叉车站点
                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                if (staProtocol == null) { continue; }
@@ -3553,7 +3563,8 @@
            }
            if(rgvProtocol.getStatusType1() == RgvStatusType.WORKING){
                rgvThread.setPaking(true);
            }else if(rgvProtocol.getTaskNo1() == 0 && rgvProtocol.getTaskNo2() == 0 && rgvProtocol.getStatusType1() == RgvStatusType.IDLE){
            }
            if(rgvProtocol.getTaskNo1() == 0 && rgvProtocol.getTaskNo2() == 0 && rgvProtocol.getStatusType1() == RgvStatusType.IDLE){
                rgvThread.setPaking(true);
            }
            if(rgvProtocol.isLoaded1ing() && rgvProtocol.isLoaded2ing()){
@@ -4767,7 +4778,9 @@
//                        News.info("{}号站点存在任务执行中，请等待任务执行完毕：{}", outStaAgv.getStaNo(), barcode);
                        continue;
                    }

                    if(barcode.equals("0")){
                        continue;
                    }
                    List<LocMast> locMastList = locMastService.selectList(new EntityWrapper<LocMast>().eq("barcode", barcode));
                    if (!locMastList.isEmpty()) {
                        News.info("{}号站点条码信息重复：{}", outStaAgv.getStaNo(), barcode);
@@ -4873,6 +4886,52 @@
        }
    }

    /*
     * agv任务生成 异常送到入库口
     * */
    public synchronized void agvTaskCreateException() {
        // 根据输送线plc遍历
        for (DevpSlave devp : slaveProperties.getDevp()) {
            Integer outStaAgv = 1041;
            // 获取入库站信息
            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            StaProtocol staProtocol = devpThread.getStation().get(outStaAgv);
            if (staProtocol == null) {
                continue;
            } else {
                staProtocol = staProtocol.clone();
            }
            // 判断是否满足入库条件
            if (!staProtocol.isLoading()){
                continue;
            }

            if (staProtocol.isAutoing() && staProtocol.getWorkNo() > 10000) {

                // 判断重复工作档
                List<BasAgvMast> basAgvMastList = basAgvMastService.selectList(new EntityWrapper<BasAgvMast>().eq("sta_no", 1037));
                if (!basAgvMastList.isEmpty()) {
                    News.info("{}号站点存在任务执行中，等待任务执行完毕!!!", outStaAgv);
                    continue;
                }
                // 任务生成区 --------------------------------------------------------------------------

                BasAgvMast basAgvMast = new BasAgvMast();
                try {
                    basAgvMast.setTaskNo(staProtocol.getWorkNo());
                    basAgvMast.setSourceStaNo(1041);
                    basAgvMast.setStaNo(1037);
                    basAgvMast.setDevpId(devp.getId());
                    basAgvMast.setIoType(3);//输送==》输送线站点 3
                    basAgvMastService.insert(basAgvMast);
                    break;
                } catch (Exception e) {
                    News.error(JSON.toJSONString(e.getMessage()));
                }
            }
        }
    }


    /*
     * agv任务下发:AGV库位==》输送线站点
@@ -4916,6 +4975,8 @@
        }
    }



    /*
     * agv任务下发:AGV库位==》AGV库位
     * */