From 0306ec76b20c4ee96f7b726155c4e0c9ce43d47d Mon Sep 17 00:00:00 2001 From: yxFwq <1> Date: 星期四, 26 十二月 2024 16:12:03 +0800 Subject: [PATCH] # --- src/main/java/com/zy/core/thread/JarThread.java | 17 +++++++++++++++++ src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 6 +++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java index e13029d..b10f3dc 100644 --- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java +++ b/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){ diff --git a/src/main/java/com/zy/core/thread/JarThread.java b/src/main/java/com/zy/core/thread/JarThread.java index 24186b4..ae6c33d 100644 --- a/src/main/java/com/zy/core/thread/JarThread.java +++ b/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);//妯″紡 -- Gitblit v1.9.1