tisoshi

ZY

2024-08-30 74f0906251b6e8ab090ae5e8e525c80eebb49704

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

@@ -170,7 +170,7 @@
                        continue;
                    }
                    staProtocol.setWorkNo(wrkNo);
                    News.info("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                    News.info("{}PLC入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                    wrkNo++;
                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -188,7 +188,7 @@
                        News.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);

                        staProtocol.setWorkNo(wrkNo);
                        News.info("{}入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                        News.info("{}barcode入库回退：{}，任务号：{}", inSta.getStaNo(), errMsg,wrkNo);
                        wrkNo++;
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -208,23 +208,23 @@
                            }
                            continue;
                        }
                        barcodeThread.setBarcode("");
                        staProtocol.setWorkNo(wrkMast.getWrkNo());
                        staProtocol.setStaNo(RouteUtils.SouStaEnd(null,wrkMast.getSourceStaNo()));
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        log.info("输送线下发(存在设备上走的工作档，直接下发！))："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());

                        ledThread.errorReset();
                        log.info("组托请求后LED错误清除");

                        if (!result) {
                            News.error(methodName + ":更新plc站点信息失败");
                            log.error("输送线下发(存在设备上走的工作档，直接下发！)==>更新plc站点信息失败");

//                            throw new CoolException("更新plc站点信息失败");
                            continue;
                        }
//                        barcodeThread.setBarcode("");
//                        staProtocol.setWorkNo(wrkMast.getWrkNo());
//                        staProtocol.setStaNo(RouteUtils.SouStaEnd(null,wrkMast.getSourceStaNo()));
//                        devpThread.setPakMk(staProtocol.getSiteId(), false);
//                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                        log.info("输送线下发(存在设备上走的工作档，直接下发！))："+wrkMast.getWrkNo()+","+wrkMast.getStaNo());
//
//                        ledThread.errorReset();
//                        log.info("组托请求后LED错误清除");
//
//                        if (!result) {
//                            News.error(methodName + ":更新plc站点信息失败");
//                            log.error("输送线下发(存在设备上走的工作档，直接下发！)==>更新plc站点信息失败");
//
////                            throw new CoolException("更新plc站点信息失败");
//                            continue;
//                        }

                    }
                    WrkMast checkPick = wrkMastService.selectOne(new EntityWrapper<WrkMast>()