#

zjj

2025-04-22 2bedde4d5aff244f0a95af47de70e98def96abc2

#

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

@@ -877,7 +877,7 @@
            short staNo = 1012;
            if (wrkMast.getSourceStaNo() == 1022) {
                staNo = 1023;
            } else if (wrkMast.getSourceStaNo() == 1032) {
            } else if (wrkMast.getSourceStaNo() == 1031) {
                staNo = 1032;
            }

@@ -945,6 +945,8 @@
            Integer sourceStaNo = wrkMast.getSourceStaNo();
            if (wrkMast.getSourceStaNo() == 1022) {
                sourceStaNo = 1023;
            } else if (wrkMast.getSourceStaNo() == 1031) {
                sourceStaNo = 1032;
            }

            StaProtocol staProtocol = station.get(sourceStaNo);
@@ -972,7 +974,7 @@
                    return false;
                }
            } else if (sourceStaNo == 1032) {
                if (staProtocol.getWorkNo().intValue() != wrkMast.getWrkNo()) {
                if (staProtocol.getFinishWorkNo().intValue() != wrkMast.getWrkNo()) {
                    News.info("{}任务，{}站点，任务号不一致", wrkMast.getWrkNo(), staProtocol.getSiteId());
                    return false;
                }
@@ -2150,10 +2152,16 @@
    }

    private void shuttleMoveExecuteTransportLift(WrkMast wrkMast) {
        LiftThread liftThread = LiftUtils.getRecentLift(wrkMast.getLocNo());
        WrkMast wrkMast1 = wrkMastService.selectByWorkNo(wrkMast.getMainWrkNo());
        LiftThread liftThread;
        if (wrkMast1 != null && wrkMast1.getLiftNo() != null) {
            liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, 1);
        } else {
            liftThread = LiftUtils.getRecentLift(wrkMast.getLocNo());
        if (liftThread == null) {
            return;
        }
        }
        //liftThread = (LiftThread) SlaveConnection.get(SlaveType.Lift, wrkMast1.getLiftNo());
        String liftLocNo = liftThread.getLiftLocNo(Utils.getLev(wrkMast.getLocNo()));
        if (Utils.getRow(liftLocNo) == Utils.getRow(wrkMast.getSourceLocNo()) && Utils.getBay(liftLocNo) == Utils.getBay(wrkMast.getSourceLocNo())) {