1

zhang

5 天以前 939982c26431a7f5c192028ab15a0121ac7eb65c

 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,20 +633,36 @@
                        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);
                        if (!dispatchShuttle) {