#

luxiaotao1123

2022-12-01 16fccfe881459f27f1549d35f19e05333e606a45

#

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

@@ -2535,7 +2535,7 @@
                            SteChargeType first = SteChargeType.FIRST;
                            locNo = first.locNo;
                            if (basSteService.hasCarOfLocNo(locNo) == null
                                && wrkChargeService.selectWorkingOfCharge(first.ssbm) != null) {
                                && wrkChargeService.selectWorkingOfCharge(first.ssbm) == null) {
                                steCharge = first;
                                break;
                            }
@@ -2544,7 +2544,7 @@
                            SteChargeType second = SteChargeType.SECOND;
                            locNo = second.locNo;
                            if (basSteService.hasCarOfLocNo(locNo) == null
                                && wrkChargeService.selectWorkingOfCharge(second.ssbm) != null) {
                                && wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
                                steCharge = second;
                                break;
                            }
@@ -2553,7 +2553,7 @@
                            SteChargeType third = SteChargeType.THIRD;
                            locNo = third.locNo;
                            if (basSteService.hasCarOfLocNo(locNo) == null
                                && wrkChargeService.selectWorkingOfCharge(third.ssbm) != null) {
                                && wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
                                steCharge = third;
                                break;
                            }
@@ -2792,6 +2792,12 @@
                if (steProtocol.getCharge() < 99) {
                    continue;
                }
                if (steProtocol.getMode() == 0) {
                    continue;
                }
                if (!steProtocol.getStatusType().equals(SteStatusType.IDLE)) {
                    continue;
                }
//                // 1号充电桩
//                if (value.equals(SteChargeType.FIRST) && devpThread.charge0) {
//                    continue;