#

luxiaotao1123

2022-10-14 2d4c6a8ef2f3755ba980261362538361f99c2a2e

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

@@ -695,18 +695,22 @@
                continue;
            }

            // 过滤
            WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), null);
            if (null != pakoutWrkMast) {
                if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
                        && pakoutWrkMast.getWrkSts() == 17
                        && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
                ) {

                } else {
            // 检测是否存在出库任务
//            WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), null);
//            if (null != pakoutWrkMast) {
//                if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
//                        && pakoutWrkMast.getWrkSts() == 17
//                        && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
//                ) {
//
//                } else {
//                    log.error("{}入库任务无法作业，因存在出库中任务!", wrkMast.getWrkNo());
//                    continue;
//                }
//            }
            if (null != wrkMastMapper.selectPakout(slave.getId(), null)) {
                    log.error("{}入库任务无法作业，因存在出库中任务!", wrkMast.getWrkNo());
                    continue;
                }
            }

            // 置顶任务
@@ -1014,15 +1018,25 @@
                            SteThread steThread = queryIdleCar(wrkMast);
                            if (steThread != null) {
                                // 没有其他任务
                                WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), steNo);
                                if (null != pakoutWrkMast) {
                                    if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
                                            && pakoutWrkMast.getWrkSts() == 17
                                            && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
                                    ) {
//                                boolean hasPakout = true;
//                                WrkMast pakoutWrkMast = wrkMastMapper.selectPakout(slave.getId(), steNo);
//                                if (null != pakoutWrkMast) {
//                                    if ((pakoutWrkMast.getIoType() == 103 || pakoutWrkMast.getIoType() == 104 || pakoutWrkMast.getIoType() == 107)
//                                            && pakoutWrkMast.getWrkSts() == 17
//                                            && basDevpService.selectByWrkNo(pakoutWrkMast.getWrkNo()) != null
//                                    ) {
//                                        hasPakout = false;
//                                    }
//                                } else {
//                                    hasPakout = false;
//                                }
//                                if (!hasPakout) {
//                                    // 让小车等待搬运待续
//                                    this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
//                                }
                                if (null != wrkMastMapper.selectPakout(slave.getId(), steNo)) {
                                        // 让小车等待搬运待续
                                        this.letCarBeReady(wrkMast, steThread.getSlave().getId(), wrkMast.getSourceLocNo());
                                    }
                                }
                            }
                        }