#

luxiaotao1123

2022-12-13 23a198f11b870a619c57282eb3c2c22d274b4155

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

@@ -692,6 +692,15 @@
//                log.error("{}站点查询无待入库数据 工作号={}", crnStn.getStaNo(), staProtocol.getWorkNo());
                continue;
            }

            // 同库位组进行校验
            List<String> groupLocNo = Utils.getGroupLocNo(wrkMast.getLocNo());
            if (!Cools.isEmpty(groupLocNo)) {
                if (null != wrkMastMapper.selectPakoutWorkingByGroupLoc(groupLocNo)) {
                    continue;
                }
            }

            if (wrkMast.getWrkSts() < 3) {
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() > 0 && staProtocol.isInEnable()
                        && staDetl.getCanining()!=null && staDetl.getCanining().equals("Y")) {
@@ -967,6 +976,14 @@
                continue;
            }

            // 同库位组进行校验
            List<String> groupLocNo = Utils.getGroupLocNo(wrkMast.getSourceLocNo());
            if (!Cools.isEmpty(groupLocNo)) {
                if (null != wrkMastMapper.selectPakinWorkingByGroupLoc(groupLocNo)) {
                    continue;
                }
            }

            // 判断是否有同库位组的出库任务，如果有，则暂停
            List<String> outsideLoc = Utils.getGroupOutsideLoc(wrkMast.getSourceLocNo());
            if (!Cools.isEmpty(outsideLoc)) {