From 424d1e76b26151d125cd4ea1d3bebd74cac75559 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E6=B1=9F=E7=8E=AE?= Date: Sat, 8 Oct 2022 16:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nl/hand/andxy/service/impl/NdxyHandServiceImpl.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java b/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java index 046a194..1fe670e 100644 --- a/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java +++ b/hd/nladmin-system/src/main/java/org/nl/hand/andxy/service/impl/NdxyHandServiceImpl.java @@ -915,11 +915,8 @@ public class NdxyHandServiceImpl implements NdxyHandService { // 获取驱动 NdxySpecialDeviceDriver driver = (NdxySpecialDeviceDriver) deviceObj.getDeviceDriver(); - // 只有在设备为空且无故障无选择的情况下才是绿灯 - int hasGoods = driver.getHasGoods();// 是否有货 - int error = driver.getError();// 是否故障 - int actoin = driver.getActoin();// 是否允许取放 - if (hasGoods == 0 && error == 0 && actoin == 1) { + // 判断是否允许取放 + if (driver.getActoin() == 1) { deviceStatus.put("status", "1"); } }