输送线指令优化

zhangchao

2024-09-07 326284994ae0730ecb6b876bded39dec1d10c00d

输送线指令优化

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

@@ -224,20 +224,20 @@
                    }

                    // 判断重复工作档
                    WrkMast wrkMast = wrkMastMapper.selectPakInStep1(inSta.getStaNo(), barcode);
                    //过滤判断，防止拣料再入库货物，经过入库站再入库时，被退回到退库站
                    WrkMast wrkMast1 = wrkMastMapper.selectPakInStepBarcode(barcode);
                    if (wrkMast1 != null) {
                        if (wrkMast1.getIoType() == 103 || wrkMast1.getIoType() == 107 || wrkMast1.getIoType() == 104) {
                    WrkMast wrkMast = wrkMastMapper.selectPakInStepBarcode(barcode);
                    if (wrkMast != null && wrkMast.getWrkSts() == 2) {
                        int wrkNo1 = basDevpService.count(new QueryWrapper<BasDevp>().eq("wrk_no", wrkMast.getWrkNo()));
                        if (wrkNo1 != 0) {
                            News.error(barcode + "条码已存在状态为（ 2.设备上走 ）的数据,请查看WCS输送线界面,工作号={}", wrkMast.getWrkNo());
                            if (ledThread != null) {
                                News.error(":扫码失败，请重试");
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, barcode + "条码已存在状态为（ 2.设备上走 ）的任务,工作号=" + wrkMast.getWrkNo()));
                            }
                            continue;
                        }
                    }
                    if (wrkMast != null) {
                        News.error("" + mark + " - 4" + " - 工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        Integer wrkNo = wrkMast.getWrkNo();
                        barcodeThread.setBarcode("");
                        staProtocol.setWorkNo(Short.parseShort(wrkNo + ""));
                        staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                        staProtocol.setWorkNo(Short.parseShort(wrkMast.getWrkNo() + ""));
                        staProtocol.setStaNo(Short.parseShort(wrkMast.getStaNo() + ""));
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        log.info("输送线下发(存在设备上走的工作档，直接下发！))：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
@@ -246,12 +246,19 @@
                        log.info("组托请求后LED错误清除");

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

                    }
                    WrkMast checkPick = wrkMastMapper.selectOne(new QueryWrapper<WrkMast>()
                            .eq("barcode", barcode)
                            .in("io_type", 107, 103, 57));
                    if (!Cools.isEmpty(checkPick)) {
                        continue;
                    }

                    try {
                        LocTypeDto locTypeDto = new LocTypeDto(staProtocol);