输送线指令优化

zhangchao

2024-09-07 af106fa3c1b10682c5c409d72c9219fe1e3d2901

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

@@ -234,22 +234,25 @@
                    }
                    if (wrkMast != null) {
                        News.error("" + mark + " - 4" + " - 工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        staProtocol.setWorkNo((short) 9999);
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        Integer wrkNo = wrkMast.getWrkNo();
                        barcodeThread.setBarcode("");
                        staProtocol.setWorkNo(Short.parseShort(wrkNo + ""));
                        staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        if (!result) {
                            throw new CoolException("更新plc站点信息失败");
                        }
                        log.info("输送线下发(存在设备上走的工作档，直接下发！))：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());

                        // led 异常显示
                        if (ledThread != null) {
                            String errorMsg = "工作档已存在该条码号===>>" + barcode;
                            MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(5, errorMsg));
                        ledThread.errorReset();
                        log.info("组托请求后LED错误清除");

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


                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);