#

LSH

2023-06-01 3a2abcf340991b62b1ec5eeff185ff905401dc0b

#

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

@@ -2029,7 +2029,7 @@
                            case 3://测试完成
                                olsStatus = 4;//测试完成
                                newStatus = 4;//测试完成
                                newSingle = 4;//测试完成，寄存器地址，3===>>4
                                newSingle = 4;//（NG:4\OK:41）测试完成，寄存器地址，3===>>4\41
                                break;
                            case 5://NG测试信号
                            case 6://完成测试信号
@@ -2063,8 +2063,8 @@
                                newSingle = 0;//复位，寄存器地址，12===>>0
                                break;
                            default:
                                log.error("读取测试库位信号出错");
                                break;
                                log.info("读取通道"+(i+1)+"测试库位按钮信号:为"+devpThread.startSignal[i][0]);
                                continue;
                        }

                        TestMast testMast = testMastService.selectOne(new EntityWrapper<TestMast>()
@@ -2073,11 +2073,26 @@
                        boolean sign=false;
                        switch (devpThread.startSignal[i][0]){
                            case 0:
                                if (!Cools.isEmpty(testMast)){
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
                                        sign=true;
                                    }
                                }
                                break;
                            case 3:
                                if (!Cools.isEmpty(testMast)){
                                    locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("channel",(i+1)));
                                    if (!Cools.isEmpty(locMast) && locMast.getLocSts().equals("F")){
                                        sign=true;
                                        if (locMast.getPackStatus()==3){
                                            newSingle=41;
                                        }else if (locMast.getPackStatus()==4){
                                            newSingle=4;
                                        }else {
                                            log.info("读取通道"+(i+1)+"测试库位按钮信号:为"+devpThread.startSignal[i][0]+"通道库位pack状态信息异常"+locMast.getPackStatus());
                                            sign=false;
                                        }
                                    }
                                }
                                break;
@@ -2182,7 +2197,7 @@
                                sign=true;
                                break;
                            default:
                                log.error("读取测试库位信号出错");
                                log.info("读取通道"+(i+1)+"测试库位按钮信号:为"+devpThread.startSignal[i][0]);
                                continue;
                        }
                        if (sign){