whycq
2024-11-21 c370397fe6c7552bb63f2580233c4b233f0ff56c
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -514,6 +514,32 @@
                            || 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;
                                }
                            }
                        }
                    }
                    // 拣、盘、并 作业站转换
//                    int stnNo = 0;