rgv功能完善

pjb

2025-06-28 a609def9badafcb8e8ffa97e8d54962271b1e108

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

@@ -377,7 +377,12 @@

            runRgv:
            for (WrkMast wrkMast : wrkMasts) {
                BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", wrkMast.getRgvSstaNo())); // 站点
                Integer rgvSstaNo = wrkMast.getRgvSstaNo();
                // 1090，1089,1086,1083 按1083站点位置计算，能取1083，就能取1090，1089，1086，避免任务延迟下发方案一直给1083发
                if (rgvSstaNo == 1090 || rgvSstaNo == 1089 || rgvSstaNo == 1086) {
                    rgvSstaNo = 1083;
                }
                BasDevpPosition basDevpPositions = basDevpPositionService.selectOne(new EntityWrapper<BasDevpPosition>().eq("dev_no", rgvSstaNo)); // 站点
                long position = basDevpPositions.getPlcPosition(); // 起始站位置
                TreeMap<Long, RgvProtocol> map = new TreeMap<>();
                for (RgvProtocol rgvProtocol : rgvProtocolList) {
@@ -389,13 +394,13 @@
                    }
                    map.put(distance, rgvProtocol);
                }
                log.info("取货站点：{}，后面小车排序", basDevpPositions.getDevNo());
                StringBuilder sb = new StringBuilder();
                for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
                    RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
                    sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
                }
                log.info(sb.toString());
//                log.info("取货站点：{}，后面小车排序", basDevpPositions.getDevNo());
//                StringBuilder sb = new StringBuilder();
//                for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
//                    RgvProtocol rgvProtocol = rgvProtocolMap.getValue();
//                    sb.append("[").append(rgvProtocol.getRgvNo()).append(",").append(rgvProtocol.getStatusType().desc).append("]");
//                }
//                log.info(sb.toString());

                for (Map.Entry<Long, RgvProtocol> rgvProtocolMap : map.entrySet()) {
                    RgvProtocol rgvProtocol = rgvProtocolMap.getValue(); // 最近距离小车
@@ -562,7 +567,7 @@
                log.error("小车复位RGV命令下发失败，RGV号={}", rgvNo);
                return false;
            } else {
                log.info("RGV命令下发成功，RGV号={}", rgvNo);
                log.info("小车复位RGV命令下发成功，RGV号={}", rgvNo);
                return true;
            }
        } catch (Exception e) {