#

lsh

2022-10-07 a1739f5c4a9421a583a546f7420bac1a94f3a54b

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

@@ -2001,12 +2001,12 @@
                                break;
                            case 3://完成测试信号
                                olsStatus = 3;
                                newStatus = 5;
                                newStatus = 4;
                                newSingle = 0;//测试完成，寄存器地址清零，3===>>0
                                break;
                            case 5://暂停信号
                                olsStatus = 5;//plc给出暂停信号
                                newStatus = 6;//WCS收到暂停信号后，更新testMast
                                newStatus = 0;//WCS收到暂停信号后，更新testMast
                                newSingle = 6;//暂停测试，寄存器地址，5===>>6
                                break;
                        }
@@ -2027,7 +2027,8 @@
                            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;
                            }