#

Junjie

2025-06-26 5a6915652f10c12fc6a7847627594a0b47251f07

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

@@ -2206,13 +2206,16 @@
        ArrayList<Integer> list = new ArrayList<Integer>(){{add(2003);add(2002);}};
        for (Integer staNo : list) {
            Integer devpId = null;
            Integer rgvStaNoDevpId = null;
            Integer rgvStaNo = null;
            if (staNo == 2003) {
                devpId = 1;
                rgvStaNo = 2002;
                rgvStaNoDevpId = 2;
            }else {
                devpId = 2;
                rgvStaNo = 2003;
                rgvStaNoDevpId = 1;
            }

            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, devpId);
@@ -2239,6 +2242,38 @@
                }

                if (wrkMast.getWrkSts() == 201) {
                    continue;
                }

                SiemensDevpThread devpThread2 = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, rgvStaNoDevpId);
                if (devpThread2 == null) {
                    continue;
                }
                StaProtocol staProtocolRgvStaNo = devpThread2.getStation().get(rgvStaNo);
                if (staProtocolRgvStaNo == null) {
                    continue;
                }

                if (!staProtocolRgvStaNo.isAutoing()) {
                    continue;
                }

                if (staProtocolRgvStaNo.isLoading()) {
                    continue;
                }

                // 获取RGV信息
                RgvThread rgvThread = (RgvThread) SlaveConnection.get(SlaveType.Rgv, 1);
                if (rgvThread == null) {
                    continue;
                }

                RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
                if (rgvProtocol == null) {
                    continue;
                }

                if (rgvProtocol.statusType1 != RgvStatusType.IDLE && rgvProtocol.getTaskNo1() != 0) {
                    continue;
                }

@@ -2293,6 +2328,10 @@
                    continue;
                }

                if (wrkMast.getWrkSts() != 201) {
                    continue;
                }

                Integer devpId = null;
                Integer devpStaNo = null;
                String locNo = null;