#

Junjie

2025-08-11 059bea139016a08e1021a3df69895a900dcb60be

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

@@ -684,7 +684,7 @@
                staProtocol = staProtocol.clone();
            }

            if (staProtocol.isAutoing() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
            if (staProtocol.isAutoing() && staProtocol.isLoading() && (staProtocol.getWorkNo() == 0 || staProtocol.getStaNo() == null)) {
                CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, wrkMast.getCrnNo());
                CrnProtocol crnProtocol = crnThread.getCrnProtocol();

@@ -1653,7 +1653,10 @@
                        crnThread.setResetFlag(true);
                    }
                }else {
                    if (wrkMast.getWrkSts() != 14 || wrkMast.getWrkSts() != 15) {
                    List<Long> list = new ArrayList<>();
                    list.add(14L);
                    list.add(15L);
                    if (!list.contains(wrkMast.getWrkSts())) {
                        News.error("" + mark + " - 1" + " - 堆垛机处于等待确认但工作档状态未完成。堆垛机号={}，工作号={}", crn.getId(), crnProtocol.getTaskNo());
                        continue;
                    }