#

yxFwq

2024-12-26 0306ec76b20c4ee96f7b726155c4e0c9ce43d47d

#

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

@@ -5967,9 +5967,9 @@
                if (!basJarMastListOther.isEmpty() && basJarMastListOther.size() < basJarOther.getJarCount()){
                    return false;
                }
                if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && !basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(), 4).equals(basJarOther.getJarCount() )){
                    return false;
                }
//                if (basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(),4)!=0 && !basJarMastService.selectJarMastOperation(jarSlave.getJarOtherId(), 4).equals(basJarOther.getJarCount() )){
//                    return false;
//                }

//                //临时
//                if (basJar.getJarCode()==1){

 src/main/java/com/zy/core/thread/JarThread.java

@@ -189,6 +189,23 @@
                    jarProtocol.setCloseDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
                }

                if (!jarProtocol.rightDoorClose.equals(jarProtocol.leftDoorClose)) {
                    if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){
                        if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){
                            jarProtocol.setLeftDoorClose(0);//close the left door  //进料门
                            jarProtocol.setRightDoorClose(0);//close the right door  //出料门
                        }
                    }
                }
                if (!jarProtocol.rightDoorOpen.equals(jarProtocol.leftDoorOpen)) {
                    if (jarProtocol.rightDoorOpen == 0 || jarProtocol.leftDoorOpen == 0){
                        if (jarProtocol.rightDoorOpen == 2 || jarProtocol.leftDoorOpen == 2){
                            jarProtocol.setLeftDoorOpen(0);//open the left door  //进料门
                            jarProtocol.setRightDoorOpen(0);//open the right door  //出料门
                        }
                    }
                }

                jarProtocol.setUpStatus(jarProtocol.getStatus());
//
//                jarProtocol.setMode(2);//模式