#

18516761980

2022-10-06 f24682c98c90aa275890e1f90623e42f314d0a6b

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

@@ -2013,7 +2013,8 @@

                        TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
                                .eq("channel",(i+1)).eq("status",olsStatus));//查找原来的状态
                        if(null != testMast && devpThread.startSignal[i] == 1){
                        if(null != testMast &&
                                (devpThread.startSignal[i] == 1 || devpThread.startSignal[i] == 3 || devpThread.startSignal[i] == 5)){
                            testMast.setStatus(newStatus);
                            testMast.setModiTime(new Date());
                            if(!testMastService.update(testMast,new EntityWrapper<TestMast>()
@@ -2023,10 +2024,11 @@
                            //复位PLC信号，借用输送站点实体类
                            StaProtocol staProtocol = new StaProtocol();
                            staProtocol.setSiteId(i*2);//寄存器地址
                            staProtocol.setStaNo((short)newSingle);//修改PLC寄存器地址值,从1改为2
                            staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,1==>2或3==>0,5==>6
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                            if(!result){
                                throw new CoolException("更新测试信号失败===>>" + i);
                                log.error("更新测试信号失败===>>[channel:{},locNo:{},barcode:{}]", i, testMast.getLocNo(), testMast.getBarcode());
//                                throw new CoolException("更新测试信号失败===>>" + i);
                            } else {
                                devpThread.startSignal[i] = newSingle;
                            }