1.NLM有出库任务的时候,不关闭库位灯

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

@@ -269,8 +269,20 @@ public class NLMShelfHandler extends BaseDeviceHandler  {
             }
             }
             StoragePos lastPutinPos = lastPutinPosMap.get(currentStorage.getCid());
             StoragePos lastPutinPos = lastPutinPosMap.get(currentStorage.getCid());
             if (lastPutinPos != null) {
             if (lastPutinPos != null) {
-                log.info("扫码时关闭上一个库位:" + lastPutinPos.getPosName());
-                opPosLight("close", currentStorage, lastPutinPos, "");
+                boolean hasTask = false;
+                //判断有没有出库任务
+                Collection<DataLog> queueTasks = taskService.getQueueTasks();
+                if (queueTasks != null && !queueTasks.isEmpty()){
+                    for (DataLog queueTask : queueTasks) {
+                        if (lastPutinPos.getId().equals(queueTask.getPosId()) && queueTask.isCheckOutTask()){
+                            hasTask = true;
+                        }
+                    }
+                }
+                if (!hasTask) {
+                    log.info("扫码时关闭上一个库位:" + lastPutinPos.getPosName());
+                    opPosLight("close", currentStorage, lastPutinPos, "");
+                }
             }
             }
             groupId = currentStorage.getGroupId();
             groupId = currentStorage.getGroupId();
         }
         }