1

Administrator

2025-07-11 9c75abec22f0d4695f676fcb0e00dc832701c80c

1

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -96,9 +96,9 @@
                        .eq("loc_sts", "F")
                        .eq("loc_no", locNo)
                        .eq("barcode", param.getBarcode()));
//                if (Cools.isEmpty(locMast)) {
//                    return R.error("该库位不满足出库条件" + param.getTargetPoint());
//                }
                if (Cools.isEmpty(locMast)) {
                    return R.error("该库位不满足出库条件" + param.getTargetPoint());
                }
                if (!locNoList.contains(locMast.getLocNo())) {
                    locNoList.add(locMast.getLocNo());
                    paramList.add(param);

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

@@ -360,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) {

 src/main/java/com/zy/core/thread/SiemensDevpThread.java

@@ -778,19 +778,19 @@

        if (slave.getId() == 1 && this.ioModeOf2F1 != null) {
            if (!siemensS7Net.Write("DB105.10", this.ioModeOf2F1.id).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F2入出库模式失败。输送线plc编号={1}", slave.getId()));
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F1入出库模式失败。输送线plc编号={1}", slave.getId()));
                log.error("写入输送线2F1入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }
        if (slave.getId() == 1 && this.ioModeOf2F2 != null) {
            if (!siemensS7Net.Write("DB105.12", this.ioModeOf2F2.id).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F1入出库模式失败。输送线plc编号={1}", slave.getId()));
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F2入出库模式失败。输送线plc编号={1}", slave.getId()));
                log.error("写入输送线2F2入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }
        if (slave.getId() == 1 && this.ioModeOf2F3 != null) {
            if (!siemensS7Net.Write("DB105.14", this.ioModeOf2F3.id).IsSuccess) {
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线3F2入出库模式失败。输送线plc编号={1}", slave.getId()));
                OutputQueue.DEVP.offer(MessageFormat.format("【{0}】写入输送线2F3入出库模式失败。输送线plc编号={1}", slave.getId()));
                log.error("写入输送线2F3入出库模式失败。输送线plc编号={}", slave.getId());
            }
        }