#

Junjie

2025-03-19 9e11195bec00e665b6acecc547616647fe64b080

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

@@ -1118,6 +1118,10 @@
                        continue;//小车和充电桩不在同一层
                    }

                    if (charge.getStatus() == 0) {
                        continue;//充电桩被禁用
                    }

                    //小车和充电桩在同一层
                    if (wrkMastService.selectChargeWorkingByChargeSta(charge.getChargeId()) == null) {
                        shuttleCharge = charge;
@@ -1130,14 +1134,19 @@
                    //小车同楼层没有充电桩，只要充电桩可用就生成充电任务
                    for (BasShuttleCharge charge : charges) {
                        if (wrkMastService.selectChargeWorkingByChargeSta(charge.getChargeId()) == null) {
                            //判断当前充电桩楼层是否有小车，如有小车，不分配该充电桩
                            int chargeLev = Utils.getLev(charge.getLocNo());//充电桩楼层
                            boolean checkLevHasShuttle = Utils.checkLevHasShuttle(chargeLev);//检测楼层是否有穿梭车
                            if (checkLevHasShuttle) {
                                //当前充电桩楼层有穿梭车，不分配该充电桩
                            //判断当前充电桩是否有小车，如有小车，不分配该充电桩
                            ArrayList<String> locs = new ArrayList<>();
                            locs.add(charge.getLocNo());
                            Integer checkHasShuttle = Utils.checkGroupLocHasShuttle(locs);
                            if(checkHasShuttle != null) {
                                //当前充电桩有穿梭车，不分配该充电桩
                                continue;
                            }

                            if (charge.getStatus() == 0) {
                                continue;//充电桩被禁用
                            }

                            shuttleCharge = charge;
                            break;
                        }