#

luxiaotao1123

2022-10-10 e99caac6b8d8af3a2deb98ab131e9c5305fe4eff

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

@@ -314,9 +314,9 @@

                    try {
                        // 保存工作明细档历史档
                        if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
                            throw new CoolException("保存工作明细档历史档失败");
                        }
//                        if (wrkMastMapper.saveWrkDetlLog(wrkMast.getWrkNo()) == 0) {
//                            throw new CoolException("保存工作明细档历史档失败");
//                        }
                        // 保存工作主档历史档
                        if (wrkMastMapper.saveWrkMastLog(wrkMast.getWrkNo()) == 0) {
                            throw new CoolException("保存工作主档历史档失败");
@@ -527,6 +527,12 @@
                continue;
            }

            // 过滤
            if (null != wrkMastMapper.selectPakout(slave.getId(), null)) {
                log.error("{}入库任务无法作业，因存在出库中任务!", wrkMast.getWrkNo());
                continue;
            }

            // 置顶任务
            wrkMast.setIoPri((double) 9999);
            wrkMastMapper.updateById(wrkMast);
@@ -539,6 +545,9 @@
                if (steNo != null) {
                    // 小车行走到堆垛机待搬移点
                    if (wrkMast.getWrkSts() == 2L && wrkMast.getSteNo() == null) {
//                        if (null != wrkMastMapper.selectPakin(slave.getId(), steNo)) {
//                            continue;
//                        }
                        this.letCarBeReady(wrkMast, steNo, wrkMast.getLocNo());
                    }
                    // 小车搬走
@@ -702,6 +711,12 @@
                    continue;
                }

                // 过滤
                if (null != wrkMastMapper.selectPakin(slave.getId(), null)) {
                    log.error("{}出库任务无法作业，因存在入库中任务!", wrkMast.getWrkNo());
                    continue;
                }

                // 置顶任务
                wrkMast.setIoPri((double) 9999);
                wrkMastMapper.updateById(wrkMast);