1

zhang

6 天以前 24f29309b230f8311130a13cc22d1892e8007a04

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

@@ -602,7 +602,7 @@
    /**
     * 出库到出库口
     */
    public synchronized void stnToOutStn() {
    public synchronized void stnToOutStn(int i) {
        ShuttleThread shuttleThread1 = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, 1);
        ShuttleThread shuttleThread2 = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, 2);
        ShuttleProtocol status1 = shuttleThread1.getStatus();
@@ -633,19 +633,35 @@
                        if (wrkMast == null) {
                            continue;
                        }

                        String sourceLocNo = "1200305";
                        String locNo = "1300105";
                        if (wrkMast.getStaNo() == 1013) {
                            sourceLocNo = "1200301";
                            locNo = "1300101";
                            if (loc.contains(locNo)) {
                        String locNo = "1100105";
                        if (wrkMast.getShuttleNo() == 1) {
                            if (wrkMast.getStaNo() == 1013) {
                                sourceLocNo = "1200301";
                                locNo = "1100101";
                                if (loc.contains(locNo)) {
                                    locNo = "1100101";
                                }
                            } else {
                                if (loc.contains(locNo)) {
                                    locNo = "1100105";
                                }
                            }
                        } else {
                            if (loc.contains(locNo)) {
                                locNo = "1100105";
                            if (wrkMast.getStaNo() == 1013) {
                                sourceLocNo = "1200301";
                                locNo = "1000101";
                                if (loc.contains(locNo)) {
                                    locNo = "1000101";
                                }
                            } else {
                                if (loc.contains(locNo)) {
                                    locNo = "1000105";
                                }
                            }
                        }
                        if (loc.contains(locNo)) {
                            locNo = "0900105";
                        }

                        boolean dispatchShuttle = shuttleDispatchUtils.shuttleMoveGenerate(wrkMast.getWrkNo(), sourceLocNo, locNo, wrkMast.getShuttleNo(), null, false);
@@ -2484,6 +2500,22 @@
            if (basShuttleCharge == null) {
                return false;
            }
            try {
                ShuttleThread shuttleThread2 = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, wrkMast.getShuttleNo() == 1 ? 2 : 1);
                if (shuttleThread2 == null) {
                    return false;
                }
                ShuttleProtocol shuttleProtocol2 = shuttleThread2.getStatus();
                if (shuttleProtocol2 == null) {
                    return false;
                }
                if (shuttleProtocol2.getCurrentLocNo().equals(basShuttleCharge.getWaitLocNo())) {
                    String locNo = Utils.getLocNo(Utils.getRow(basShuttleCharge.getWaitLocNo()), Utils.getBay(basShuttleCharge.getWaitLocNo()) - 1, Utils.getLev(basShuttleCharge.getWaitLocNo()));
                    basShuttleCharge.setWaitLocNo(locNo);
                }
            } catch (Exception e) {
                log.error("寻找新的待机位,{}", e);
            }

            //调度小车去待机位
            boolean dispatched = shuttleDispatchUtils.dispatchShuttle(wrkMast.getWrkNo(), basShuttleCharge.getWaitLocNo(), wrkMast.getShuttleNo());