1105和罐装出库优先级一样(先出选取)

pjb

2025-07-21 ad0afa43ef0ec3001122420df245607e4837da3a

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

@@ -379,7 +379,7 @@
            for (WrkMast wrkMast : wrkMasts) {
                Integer rgvSstaNo = wrkMast.getRgvSstaNo();
                // 1090，1089,1086,1083 按1083站点位置计算，能取1083，就能取1090，1089，1086，避免任务延迟下发方案一直给1083发
                if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086) {
                if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086 || rgvSstaNo == 1105) {
                    rgvSstaNo = 1083;
                }
                BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", rgvSstaNo)); // 站点
@@ -498,7 +498,7 @@
                        log.error("未查到小车执行任务！" + rgvProtocol.getTaskNo1());
                        continue;
                    } else if(wrkMast.getWrkSts() != 10) {
                        log.error("执行任务状态不符合！" + rgvProtocol.getTaskNo1());
                        log.warn("执行任务状态不符合！" + rgvProtocol.getTaskNo1());
                        continue;
                    }
                    boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
@@ -538,7 +538,7 @@
                        log.error("未查到小车执行任务！" + rgvProtocol.getTaskNo1());
                        continue;
                    } else if(wrkMast.getWrkSts() != 10) {
                        log.error("执行任务状态不符合！" + rgvProtocol.getTaskNo1());
                        log.warn("执行任务状态不符合！" + rgvProtocol.getTaskNo1());
                        continue;
                    }
                    boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());