#

LSH

2022-11-28 0956cd2d3f2840f2f26855f05a83165d63dd7ba1

#

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

@@ -2014,10 +2014,14 @@
                                newStatus = 3;
                                newSingle = 2;//测试复核，寄存器地址，1===>>2
                                break;
                            case 3://完成测试信号
                            case 2://完成测试信号
                                olsStatus = 3;
                                newStatus = 3;
                                newSingle = 3;//测试完成，寄存器地址清零，2===>>3
                            case 4://完成测试信号
                                olsStatus = 3;
                                newStatus = 4;
                                newSingle = 0;//测试完成，寄存器地址清零，3===>>0
                                newSingle = 0;//测试完成，寄存器地址清零，4===>>0
                                break;
                            case 5://暂停信号
                                olsStatus = 99;//plc给出暂停信号
@@ -2067,6 +2071,24 @@
                            } else {
                                devpThread.startSignal[i] = newSingle;
                            }
                        }else if (null != testMast && devpThread.startSignal[i] == 2){
                            if (testMast.getStatus()==3){
                                LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>()
                                        .eq("channel",(i+1)));
                                if (locMast.getLocSts().equals("F") && locMast.getPackStatus()==3){
                                    //复位PLC信号，借用输送站点实体类
                                    StaProtocol staProtocol = new StaProtocol();
                                    staProtocol.setSiteId(i*2);//寄存器地址
                                    staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,2==>3
                                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                                    if(!result){
                                        log.error("更新测试信号失败===>>[channel:{},locNo:{},barcode:{}]", i+1, testMast.getLocNo(), testMast.getBarcode());
//                                throw new CoolException("更新测试信号失败===>>" + i);
                                    } else {
                                        devpThread.startSignal[i] = newSingle;
                                    }
                                }
                            }
                        }else if (devpThread.startSignal[i] == 5){
                            SearchLocParam param = new SearchLocParam();
                            param.setBarcode(i+1+"");