#
yxFwq
2024-12-30 34045217b2ab791a01a6672cf5ab3830b55b900e
src/main/java/com/zy/core/thread/JarThread.java
@@ -183,13 +183,33 @@
//                } else
                if (jarProtocol.statusType .equals(JarStatusType.SOS2)){
                    jarProtocol.setHoldingSign(!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 == 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  //出料门
                            }
                        }
                    }
                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING3) || jarProtocol.statusType .equals(JarStatusType.WAITING4)){
                    jarProtocol.setOpenDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING5) || jarProtocol.statusType .equals(JarStatusType.OFF_LINE)){
                    jarProtocol.setCloseDoorSign(!jarProtocol.getStatus().equals(jarProtocol.getUpStatus()));
                }
                if (!jarProtocol.rightDoorClose.equals(jarProtocol.leftDoorClose)) {
                } else if (jarProtocol.statusType .equals(JarStatusType.WAITING1) || jarProtocol.statusType .equals(JarStatusType.MOVING)){
                    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  //出料门
                            }
                        }
                    }
                    if (jarProtocol.rightDoorClose == 0 || jarProtocol.leftDoorClose == 0){
                        if (jarProtocol.rightDoorClose == 2 || jarProtocol.leftDoorClose == 2){
                            jarProtocol.setLeftDoorClose(0);//close the left door  //进料门
@@ -197,14 +217,9 @@
                        }
                    }
                }
                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());
//