需求更新

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();// 是否有货
+                if (driver.getActoin() == 1) {
-                int error = driver.getError();// 是否故障
-                int actoin = driver.getActoin();// 是否允许取放
-                if (hasGoods == 0 && error == 0 && actoin == 1) {
                     deviceStatus.put("status", "1");
                 }
             }