#

lsh

2024-09-13 e0bea9f0574395c23d6c34fa59bbb4be262fba45

#

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

@@ -5863,21 +5863,21 @@
                    return false;
                }

                //临时
                if (basJar.getJarCode()==1){
                    JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
                    JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
                    if (jarOtherProtocol == null) {
                        return false;
                    }

                    if (!jarOtherProtocol.isAutoing() || jarOtherProtocol.jarErr!=0
                            || !jarOtherProtocol.isLeftDoor() || !jarOtherProtocol.isRightDoor()
                            || jarOtherProtocol.leftDoorOpen==1  || jarOtherProtocol.leftDoorClose==1 || jarOtherProtocol.rightDoorOpen==1  || jarOtherProtocol.rightDoorClose==1){
                        log.error("{}号硫化罐查询设备不满足前往冷却池条件，代号2硫化罐门没开！！！",jarOtherProtocol.getJarNo());
                        return false;
                    }
                }
//                //临时
//                if (basJar.getJarCode()==1){
//                    JarThread jarOtherThread = (JarThread) SlaveConnection.get(SlaveType.Jar, jarSlave.getJarOtherId());
//                    JarProtocol jarOtherProtocol = jarOtherThread.getJarProtocol();
//                    if (jarOtherProtocol == null) {
//                        return false;
//                    }
//
//                    if (!jarOtherProtocol.isAutoing() || jarOtherProtocol.jarErr!=0
//                            || !jarOtherProtocol.isLeftDoor() || !jarOtherProtocol.isRightDoor()
//                            || jarOtherProtocol.leftDoorOpen==1  || jarOtherProtocol.leftDoorClose==1 || jarOtherProtocol.rightDoorOpen==1  || jarOtherProtocol.rightDoorClose==1){
//                        log.error("{}号硫化罐查询设备不满足前往冷却池条件，代号2硫化罐门没开！！！",jarOtherProtocol.getJarNo());
//                        return false;
//                    }
//                }

                //门作业  无
//                if (jarProtocol.isAutoing() && jarProtocol.statusType == JarStatusType.WAITING4 && jarProtocol.jarErr==0