#标记

yxFwq

2024-08-12 a395c37ac600ec6c73fed890ba94ede9fec5cc68

#标记

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

@@ -5441,7 +5441,9 @@
            if (basJarMastList.size() != jarMaxLoc){
                return false;
            }
            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0&&(basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7)){
            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=0
                    && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=7
                    && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),5)!=14){
                return false;
            }

@@ -5528,7 +5530,7 @@
            if (basJarMastList10.size()==jarMaxLoc){
                return false;
            }
            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0){
            if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=7){
                return false;
            }

@@ -5574,6 +5576,22 @@
                    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
                if (jarProtocol.isAutoing() && jarProtocol.jarErr==0

 src/main/java/com/zy/asrs/task/JarBurialEscalationScheduler.java

@@ -34,7 +34,7 @@
        }
    }

//    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/3 * * * * ? ")
    private void execute2(){//上传开式冷却信号
        int[] jarList =new int[]{1,2,3,4,5,6};
        for (int jarNo : jarList){