#

lsh

2022-10-12 f6decf71aa936d019a7732970744c6c33f5e6175

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

@@ -2022,7 +2022,7 @@
                            case 11://入库前判断充电线是否放好
                                olsStatus = 99;
                                newStatus = 0;
                                newSingle = 11;//不变
                                newSingle = 11;//
                                break;
                            case 12://充电线放好
                                olsStatus = 99;
@@ -2123,27 +2123,19 @@
                                locMast.setLocSts("O");
                                locMastService.update(locMast,new EntityWrapper<LocMast>()
                                        .eq("channel",(i+1)));
                                //复位PLC信号，借用输送站点实体类
                                StaProtocol staProtocol = new StaProtocol();
                                staProtocol.setSiteId(i*2);//寄存器地址
                                staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,12==>0
                                boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                                if(!result){
                            }
                            //复位PLC信号，借用输送站点实体类
                            StaProtocol staProtocol = new StaProtocol();
                            staProtocol.setSiteId(i*2);//寄存器地址
                            staProtocol.setStaNo(newSingle);//修改PLC寄存器地址值,12==>0
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(3, staProtocol));
                            if(!result){
//                                log.error("更新库位紧急出库信号失败===>>[channel:{},locNo:{},barcode:{}]", i+1, locMast.getLocNo(), locMast.getBarcode());
//                                throw new CoolException("更新测试信号失败===>>" + i);
                                } else {
                                    devpThread.startSignal[i] = newSingle;
                                }
                            } else {
                                devpThread.startSignal[i] = newSingle;
                            }
                        }else { }
                        TestMast testMast0101804 = testMastService.selectOne(new EntityWrapper<TestMast>()
                                .eq("loc_no","0101804"));//查找原来的状态
                        if (!Cools.isEmpty(testMast0101804)){
                            if (testMast0101804.getChannel()>10240){

                            }
                        }

                    }

                }