#12

whycq

2025-04-05 283a36ddcad185bd89415eb4991282583227f1fa

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

@@ -154,10 +154,7 @@
                    back = true;
                }

                //拣料、盘点任务，不进入新板入库方法，直接跳出
                if(staProtocol.getWorkNo()>=3001 && staProtocol.getWorkNo()<=6000){
                    continue;
                }


                // 退回
                if (back) {
@@ -180,7 +177,10 @@
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errMsg));
                }

                //拣料、盘点任务，不进入新板入库方法，直接跳出
                if(staProtocol.getWorkNo()>=3001 && staProtocol.getWorkNo()<=6000){
                    continue;
                }
                // 判断是否满足入库条件
                if (staProtocol.isAutoing()
                        && staProtocol.isLoading()
@@ -459,7 +459,7 @@


//                    log.info("{}号条码扫描器检测条码信息：{}", pickSta.getBarcode(), barcode);
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode) && staProtocol.isPakMk()) {
                        if ("NG".endsWith(barcode) || "NoRead".equals(barcode)  && staProtocol.isPakMk()) {
                            if (!staProtocol.isLoading()) {
                                continue;
                            }
@@ -514,30 +514,7 @@
                            || Cools.isEmpty(wrkMast.getStaNo()) || Cools.isEmpty(wrkMast.getSourceStaNo())) {
                        continue;
                    }
//                    如果是并板入库
                    if (wrkMast.getIoType() == 104) {
                        LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("barcode", barcode));
                        if (Cools.isEmpty(locMast1)) {
                            continue;
                        } else {
                            if (locMast1.getLocType1().equals((short)2)) {
                                if (staProtocol.isWeight()) {
                                    staProtocol.setWorkNo(wrkNo);
                                    wrkNo++;
                                    staProtocol.setStaNo(pickSta.getBackSta().shortValue());
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                    // led 异常显示
                                    if (ledThread != null) {
                                        String errorMsg = "并板入库重量大于库位重量，请重新调整";
                                        News.error(methodName + ":并板入库重量大于库位重量，请重新调整");
                                        MessageQueue.offer(SlaveType.Led, pickSta.getLed(), new Task(3, errorMsg));
                                    }
                                    continue;
                                }
                            }
                        }
                    }
                    LocMast locMast1 = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", wrkMast.getSourceLocNo()));



@@ -1934,7 +1911,7 @@
                    News.error("{}号LED命令下发失败！！！[ip：{}] [port：{}]", led.getId(), led.getIp(), led.getPort());
                    continue;
                } else {
                    News.info("{}号LED命令下发成功！！！[ip：{}] [port：{}] [port：{}]", led.getId(), led.getIp(), led.getPort(),commands);
//                    News.info("{}号LED命令下发成功！！！[ip：{}] [port：{}] [port：{}]", led.getId(), led.getIp(), led.getPort(),commands);
                }
            }