#

luxiaotao1123

2023-02-15 f5a6d4be5334f706ae73a08943a6667cd196bb78

#

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

@@ -2561,24 +2561,24 @@
                                break;
                            }
                        }
                        if (!devpThread.charge1) {
                            SteChargeType second = SteChargeType.SECOND;
                            locNo = second.locNo;
                            if (basSteService.hasCarOfLocNo(locNo) == null
                                && wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
                                steCharge = second;
                                break;
                            }
                        }
                        if (!devpThread.charge2) {
                            SteChargeType third = SteChargeType.THIRD;
                            locNo = third.locNo;
                            if (basSteService.hasCarOfLocNo(locNo) == null
                                && wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
                                steCharge = third;
                                break;
                            }
                        }
//                        if (!devpThread.charge1) {
//                            SteChargeType second = SteChargeType.SECOND;
//                            locNo = second.locNo;
//                            if (basSteService.hasCarOfLocNo(locNo) == null
//                                && wrkChargeService.selectWorkingOfCharge(second.ssbm) == null) {
//                                steCharge = second;
//                                break;
//                            }
//                        }
//                        if (!devpThread.charge2) {
//                            SteChargeType third = SteChargeType.THIRD;
//                            locNo = third.locNo;
//                            if (basSteService.hasCarOfLocNo(locNo) == null
//                                && wrkChargeService.selectWorkingOfCharge(third.ssbm) == null) {
//                                steCharge = third;
//                                break;
//                            }
//                        }
                        break;
                    } while (false);

@@ -2839,6 +2839,7 @@
    /**
     * 轮询充电桩是否有空闲小车
     */
    @Deprecated
    public synchronized void queryChargeLocOfComplete() {
        // 与充电任务不同步进行
        if (null != wrkChargeService.selectWorking(null, WrkChargeType.charge)) { return; }
@@ -2915,6 +2916,7 @@
    /**
     * 小车从充电桩 至 待机库位
     */
    @Deprecated
    public synchronized void steFromChargeToIdleLoc() {
        WrkCharge wrkCharge = wrkChargeService.selectWorking(null, WrkChargeType.reset);
        if (wrkCharge == null) { return; }

 src/main/java/com/zy/core/MainProcess.java

@@ -73,8 +73,8 @@
                    // 间隔
                    Thread.sleep(200);
                    // 穿梭车 ===>> 小车复位至待机库位
                    mainService.queryChargeLocOfComplete();
                    mainService.steFromChargeToIdleLoc();
//                    mainService.queryChargeLocOfComplete();
//                    mainService.steFromChargeToIdleLoc();

                } catch (Exception e) {
                    e.printStackTrace();

 src/main/java/com/zy/core/enums/SteChargeType.java

@@ -5,8 +5,8 @@
public enum SteChargeType {

    FIRST(1, "0100101"),
    SECOND(2, "0100201"),
    THIRD(3, "0100301"),
//    SECOND(2, "0100201"),
//    THIRD(3, "0100301"),
    ;

    SteChargeType(int ssbm, String locNo) {