1

zhangchao

2024-09-06 7c19244bba9b88c5993794b1c775a6c322c16d9a

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

@@ -267,6 +267,27 @@
                                throw new CoolException("更新plc站点信息失败");
                            }
                        } else {
                            if (jsonObject.getString("msg").equals("工作档已存在")) {
                                //工作档已存在    再次进去
                                wrkMast = wrkMastMapper.selectPakInStepBarcode(barcode);
                                if (wrkMast != null) {
                                    barcodeThread.setBarcode("");
                                    staProtocol.setWorkNo(wrkMast.getWrkNo());
                                    //staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
                                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                    log.error("输送线下发2：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
                                    ledThread.errorReset();
                                    log.error("组托请求后LED错误清除");
                                    if (!result) {
                                        News.error(methodName + ":更新plc站点信息失败");

                                        throw new CoolException("更新plc站点信息失败");
                                    }
                                }
                                continue;
                            }
                            staProtocol.setWorkNo(wrkNo);
                            wrkNo++;
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -1660,7 +1681,9 @@
                }
                // 获取工作档数据
                WrkMast wrkMast = wrkMastMapper.selectById(staProtocol.getWorkNo());
                if (null == wrkMast) { continue; }
                if (null == wrkMast) {
                    continue;
                }
                wrkMasts.add(wrkMast);
                // 组装命令
                LedCommand ledCommand = new LedCommand();
@@ -1770,7 +1793,9 @@
            for (Integer staNo : led.getStaArr()) {
                // 获取叉车站点
                StaProtocol staProtocol = devpThread.getStation().get(staNo);
                if (staProtocol == null) { continue; }
                if (staProtocol == null) {
                    continue;
                }
                if (staProtocol.getWorkNo() != 0 || staProtocol.isErr()) {
                    reset = false;
                    break;
@@ -2227,9 +2252,11 @@
    public synchronized void autoEmptyOut() {
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        List<Integer> list = new ArrayList<>();
        list.add(101);list.add(112);
        list.add(101);
        list.add(112);
        Map<Integer,Integer> map = new HashMap<>();
        map.put(101,102);map.put(112,111);
        map.put(101, 102);
        map.put(112, 111);
        for (Integer site:list){
            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("sta_no", map.get(site)));
            if (!Cools.isEmpty(wrkMast)){
@@ -2283,7 +2310,8 @@
    public synchronized void autoEmptyIn() {
        SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
        List<Integer> list = new ArrayList<>();
        list.add(153);list.add(157);
        list.add(153);
        list.add(157);
        for (Integer site:list){
            StaProtocol staProtocol = devpThread.getStation().get(site);
            if (staProtocol == null) {
@@ -2428,7 +2456,6 @@
                    }



                }
            }
        }catch (Exception e){
@@ -2510,7 +2537,8 @@
                            log.error("rgv任务完成给输送线下发命令,但未查询到工作档");
                            // 下发站点信息
                            Map<Integer,Integer> map = new HashMap<>();
                            map.put(101,102);map.put(112,111);
                                map.put(101, 102);
                                map.put(112, 111);
                            map.put(100,100);
                            staProtocol.setWorkNo(rgvProtocol.getTaskNo1().intValue());
                            staProtocol.setStaNo(map.get(rgvProtocol.getRgvPosI()).shortValue());
@@ -2537,9 +2565,7 @@
                        basRgvMap.setNowRoute(rgvProtocol.getRgvPosI());
                        rgvMapUpdate(basRgvMap,basRgvMap.getStartRoute(),basRgvMap.getStartRoute(),"2471");
                        rgvThread.setPakMk(true);
                    }

                    else {
                        } else {
                        log.error("小车复位失败，小车号{},等待wcs确认但是没有工作号！",rgvProtocol.getRgvNo());
                    }
                }
@@ -2549,6 +2575,7 @@
            log.error("小车复位线程报错！"+e);
        }
    }

    /**
     * 执行小车搬运任务
     */
@@ -2632,6 +2659,7 @@
            log.error("3875行"+e);
        }
    }

    /**
     * 执行小车搬运任务
     */