#

lsh

2024-06-22 d4daea691450958841e393fe56ae20472c9a9382

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

@@ -4627,9 +4627,9 @@
                                break;
                            }
                        case 3:
//                            if (jarWrkMastExecuteGenerate2(jarSlave,sign)){
//                                break;
//                            }
                            if (jarWrkMastExecuteGenerate2(jarSlave,sign)){
                                break;
                            }
                    }
                }
            } catch (Exception e){
@@ -4653,6 +4653,33 @@
                add(2);
            }});
            for (BasJarMast basJarMast : basJarMastList){
                JarSlave.StaStn staStn = null;
                for (JarSlave.StaStn staStn1 : jarSlave.getJarInSta()){
                    if (staStn1.getStaNo().equals(basJarMast.getEnterStaNo())){
                        staStn = staStn1;
                    }
                }
                if (Cools.isEmpty(staStn)){
                    continue;
                }
                //检测站点状态
                DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, staStn.getDevpPlcId());
                StaProtocol staProtocol = devpThread.getStation().get(staStn.getStaNo());
                if (staProtocol == null) {
                    continue;
                } else {
                    staProtocol = staProtocol.clone();
                }
                if (staProtocol.isAutoing() && staProtocol.isLoading() && staProtocol.getWorkNo()==basJarMast.getWrkNo().intValue()){

                    //检测RGV状态
                    StaProtocol staProtocolRGV = devpThread.getStation().get(staStn.getRgvNo());
                    if (staProtocolRGV == null) {
                        continue;
                    } else {
                        staProtocolRGV = staProtocolRGV.clone();
                    }
                    if (staProtocolRGV.isRGV1() && !staProtocolRGV.isRGV2() && !staProtocolRGV.isRGV3() && !staProtocolRGV.isRGV4() && !staProtocolRGV.isRGV5() && !staProtocolRGV.isRGV6()){
                // 获取硫化罐信息
                JarThread jarThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getId());
                JarProtocol jarProtocol = jarThread.getJarProtocol();
@@ -4700,7 +4727,13 @@
                    }
                }
                return false;
                    } else {
                        log.error("JarWrkMastExecute任务创建===>执行异常===》RGV不满足条件，等待===》异常数据：BasJar:"+ JSON.toJSONString(staProtocolRGV)+";BasJarMast:"+JSON.toJSONString(basJarMast));
                        return false;
            }
                }
            }

        } catch (Exception e){
            log.error("{}号硫化罐JarWrkMastExecute任务创建异常,异常原因={}",jarSlave.getId(),e.getMessage());
        }