NLM有出库任务时不自动灭灯

src/main/java/com/neotel/smfcore/core/device/handler/impl/NLMShelfHandler.java

@@ -204,14 +204,33 @@ public class NLMShelfHandler extends BaseDeviceHandler  {
             @Override
             @Override
             public void run() {
             public void run() {
                 try {
                 try {
+                    final List<String> myPos=new ArrayList<>(posNameList);
+                    Thread.sleep(delayCloseTime);
                     String allCloseStr = "";
                     String allCloseStr = "";
-                    for (final String posName : posNameList) {
-                        Thread.sleep(delayCloseTime);
+                    for (final String posName : myPos) {
 //                        log.info(storage.getName() + "[" + cid + "]库位[" + posName + "]灭灯");
 //                        log.info(storage.getName() + "[" + cid + "]库位[" + posName + "]灭灯");
-                        DevicesStatusUtil.appendOp(cid, "close", posName);
-                        allCloseStr += posName + ",";
+
+                        boolean hasOut=false;
+                        //如果有出库任务，不灭灯
+                        List<DataLog> logs=  taskService.getAllTasks();
+                        for (DataLog log :
+                                logs) {
+                            if (log.getPosName().equals(posName) && log.isCheckOutTask()) {
+                                hasOut = true;
+                                break;
+                            }
+                        }
+                        if (hasOut){
+                            log.info(storage.getName() + "[" + cid + "]库位[" + posName + "]有出库任务，不需要自动灭灯");
+                        }else{
+                            DevicesStatusUtil.appendOp(cid, "close", posName);
+                            allCloseStr += posName + ",";
+                        }
+
+                    }
+                    if(!ObjectUtil.isEmpty(allCloseStr)){
+                        log.info(storage.getName() + "[" + cid + "]库位[" + allCloseStr + "]自动灭灯");
                     }
                     }
-                    log.info(storage.getName() + "[" + cid + "]库位[" + allCloseStr + "]灭灯");
                 } catch (Exception e) {
                 } catch (Exception e) {
 
 
                 }
                 }