rgv调动分配优化:判断当前任务取货站点后续小车任务放货完后能不能取当前任务
2个文件已修改
46 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/index.html 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -453,13 +453,14 @@
                            }
                        }
                    } else {
                        if (count != 0) {
                            break;
                        }
                        if (rgvProtocol.modeType == RgvModeType.AUTO
                                && (rgvProtocol.getStatusType() == RgvStatusType.IDLE || rgvProtocol.getStatusType() == RgvStatusType.ROAM)
                                && rgvProtocol.getTaskNo1() == 0
                                && rgvProtocol.getAlarm() == 0) {
                            if (count != 0) {
                                log.error("{}呼叫小车:{}号小车空闲,但工作档显示该小车有任务",wrkMast.getWrkNo(),rgvProtocol.getRgvNo());
                                break;
                            }
                            RgvCommand rgvCommand = new RgvCommand();
                            rgvCommand.setRgvNo(rgvProtocol.getRgvNo());
                            rgvCommand.setAckFinish1((short) 0);  // 工位1任务完成确认位
@@ -479,8 +480,23 @@
                            wrkMast.setRgvCreateTime(now);
                            wrkMastService.updateById(wrkMast);
                            break runRgv;
                        } else  if(rgvProtocol.modeType == RgvModeType.AUTO
                                && rgvProtocol.getTaskNo1() != 0){ // 当前小车放货目标位置在当前任务取货点之后,跳过任务分配,不再则判断下个小车目标位置
                            WrkMast wrkMast1 = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", rgvProtocol.getTaskNo1())); // 当前rgv任务
                            if(wrkMast1!= null && !Cools.isEmpty(wrkMast1.getRgvDstaNo())) {
                                // 当前rgv任务目标站点
                                BasDevpPosition rgvDstaNoDevPosition = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast1.getRgvDstaNo()));
                                long rgvDstaNoPosition = rgvDstaNoDevPosition.getPlcPosition(); // 当前rgv任务目标站点位置
                                if(rgvProtocol.getRgvPos() < rgvDstaNoPosition) { // 小车当前位置 < rgv目标位置
                                    if(!(rgvProtocol.getRgvPos() < position && position < rgvDstaNoPosition)) { // 这个任务位置是在当前rgv位置前面并且这个任务起点在当前rgv目标站点之后
                                        break; // 当前rgv放货完成后,可以取当前任务
                                    }
                        } else {
                            break ; // 只看最近的第一个小车
                                    if(!(rgvProtocol.getRgvPos() < position || position < rgvDstaNoPosition)) {
                                        break;
                                    }
                                }
                            }
                        }
                    }
                }
src/main/webapp/views/index.html
@@ -226,17 +226,17 @@
<!--            </div>-->
<!--             Stations on outer ring-->
            <div v-for="station in tableDataDev" class="station" :style="{ top: station.valueY + 'px', left: station.valueX + 'px' }">{{ station.index }}</div>
            <div>
                <el-switch
                        style="display: block"
                        v-model="valueSystem"
                        active-color="#13ce66"
                        inactive-color="#A64036"
                        active-text="系统运行中..."
                        inactive-text="系统已停止!"
                        @change='upDateValueSystem'>
                </el-switch>
            </div>
<!--            <div>-->
<!--                <el-switch-->
<!--                        style="display: block"-->
<!--                        v-model="valueSystem"-->
<!--                        active-color="#13ce66"-->
<!--                        inactive-color="#A64036"-->
<!--                        active-text="系统运行中..."-->
<!--                        inactive-text="系统已停止!"-->
<!--                        @change='upDateValueSystem'>-->
<!--                </el-switch>-->
<!--            </div>-->
            <!-- Buses -->
            <div v-for="bus in tableDataRgv" class="bus" :style="{ top: bus.valueY + 'px', left: bus.valueX + 'px' , borderColor: bus.modeColor, backgroundColor: bus.statusColor}">{{ bus.index }}</div>
        </div>