pang.jiabao
2025-07-10 c59bcfa4429a5d67842ebaa492db1fa11a3e97fc
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -181,17 +181,23 @@
                        }
                        storageEscalationParam.setBarcode(BoxNo);
                        storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
                        storageEscalationParam.setFullPlt(staProtocol.isFullPlt() ? 1 : 0);
                        log.info("组托入库={}", storageEscalationParam);
                        TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
                        if (taskWrk == null) {
                            log.error("入库请求wms创建任务工作档为空:{}", storageEscalationParam);
                            continue;
                        } else {
                            if (-1 == taskWrk.getWrkNo()) {
                                back = true;
                            }
                        }
                        if (back) {
                            staProtocol.setWorkNo((short)9991);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.info("组托入库托盘退回命令推送输送线队列成功==>{},{}", BoxNo, errMsg);
                            log.info("组托入库托盘退回命令推送输送线队列成功==>{},{},{}", BoxNo, errMsg, taskWrk.getWrkNo());
                        } else {
                            StaDesc staDesc = staDescService.selectOne(new EntityWrapper<StaDesc>()
                                    .eq("crn_no", taskWrk.getCrnNo()).eq("type_no", 1).eq("stn_no", staProtocol.getSiteId()));
@@ -354,16 +360,16 @@
                    continue;
                }
                LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
                if (!locMast.getLocSts().equals("O")) {
                    if (taskWrk.getWrkSts() == 2) {
                        log.error("入库WMS分配库位{}有误,库位状态为{}", locMast.getLocNo(), locMast.getLocSts());
                        taskWrk.setWrkSts(5);
                        taskWrk.setMemo("WMS分配库位有误");
                        taskWrkService.updateById(taskWrk);
                    }
                    continue;
                }
//                LocMast locMast = locMastService.selectByLocNo(taskWrk.getTargetPoint());
//                if (!locMast.getLocSts().equals("O")) {
//                    if (taskWrk.getWrkSts() == 2) {
//                        log.error("入库WMS分配库位{}有误,库位状态为{}", locMast.getLocNo(), locMast.getLocSts());
//                        taskWrk.setWrkSts(5);
//                        taskWrk.setMemo("WMS分配库位有误");
//                        taskWrkService.updateById(taskWrk);
//                    }
//                    continue;
//                }
                // 堆垛机控制过滤
                if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {