pang.jiabao
2025-07-10 c59bcfa4429a5d67842ebaa492db1fa11a3e97fc
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -193,6 +193,7 @@
                            }
                        }
                        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));
@@ -359,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) {