*

lsh

2025-02-14 83def9d705c2883cc3a50f7ffeff5596b43fe437

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

@@ -4662,14 +4662,19 @@
                    staProtocol = staProtocol.clone();
                }

                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0){
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo() == 0 && staProtocol.isPakMk()){
                    RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("armNo"+staNo);
                    if (!Cools.isEmpty(rgvOneSign) && rgvOneSign.getRgvOneSign() == 1){
                        int workNo = commonService.getWorkNo(6);

                        StaProtocol staProtocolnew = new StaProtocol();
                        staProtocolnew.setSiteId(staNo);
                        staProtocolnew.setWorkNo(workNo);
                        staProtocolnew.setStaNo(staNo==215? 217:221);
                        boolean result1 = MessageQueue.offer(SlaveType.Devp, 2, new Task(3, staProtocolnew));

                        devpThread.setPakMk(staProtocolnew.getSiteId(), false);

                        boolean result2 = MessageQueue.offer(SlaveType.Devp, 2, new Task(2, staProtocolnew));
                        if (!result2) {
                            log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", 2);
@@ -4677,6 +4682,9 @@
                        if (!staProtocol.isLoading()){
                            updateRgvOneSign("armNo"+staNo,0);
                        }


                        boolean result3 = MessageQueue.offer(SlaveType.Devp, 2, new Task(4, staProtocolnew));
                    }
                }
            }catch (Exception e){