1

zhang

6 天以前 18d5978429d9a6ba97ef82eacc72b191821ad838

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

@@ -635,7 +635,7 @@
                        }
                        String sourceLocNo = "1200305";
                        String locNo = "1100105";
                        if (i == 0) {
                        if (wrkMast.getShuttleNo() == 1) {
                            if (wrkMast.getStaNo() == 1013) {
                                sourceLocNo = "1200301";
                                locNo = "1100101";
@@ -660,7 +660,9 @@
                                }
                            }
                        }

                        if (loc.contains(locNo)) {
                            locNo = "0900105";
                        }

                        boolean dispatchShuttle = shuttleDispatchUtils.shuttleMoveGenerate(wrkMast.getWrkNo(), sourceLocNo, locNo, wrkMast.getShuttleNo(), null, false);
                        if (!dispatchShuttle) {
@@ -2498,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()) + 1, Utils.getBay(basShuttleCharge.getWaitLocNo()), Utils.getLev(basShuttleCharge.getWaitLocNo()));
                    basShuttleCharge.setWaitLocNo(locNo);
                }
            } catch (Exception e) {
                log.error("寻找新的待机位,{}", e);
            }

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