1.感应料架亮灯指引bug修复

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

@@ -242,32 +242,32 @@ public class NLPShelfHandler extends BaseDeviceHandler {
 
 
         //亮灯
         //亮灯
         Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
         Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
+
         for (DataLog queueTask : queueTasks) {
         for (DataLog queueTask : queueTasks) {
-            if (queueTask.isWait() && queueTask.isCheckOutTask()) {
-                queueTask.setStatus(OP_STATUS.EXECUTING.name());
-                taskService.updateQueueTask(queueTask);
+            if (!openZhiYin || StringUtils.isBlank(queueTask.getSourceId())) {
+                if (queueTask.isWait()) {
                     String rgb = queueTask.getLightColor();
                     String rgb = queueTask.getLightColor();
                     ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
                     ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
                     if (color == null) {
                     if (color == null) {
-                    if (openZhiYin && ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
+                        if (queueTask.isPutInTask()) {
+                            color = ORDER_COLOR.FORESTGREEN;
+                        } else {
+                            color = ORDER_COLOR.BLUE;
+                        }
+                    }
+                    queueTask.setStatus(OP_STATUS.EXECUTING.name());
+                    taskService.updateQueueTask(queueTask);
+                    statusBean.addData("open", queueTask.getPosName() + "=" + color.name());
+                    log.info("库位[" + queueTask.getPosName() + "][" + queueTask.getType() + "]+亮灯:" + color.name());
+                }
+            } else {
+                if (queueTask.isWait() || queueTask.isExecuting()) {
                     List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
                     List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
                     if (dataLogList == null) {
                     if (dataLogList == null) {
                         dataLogList = new ArrayList<>();
                         dataLogList = new ArrayList<>();
                     }
                     }
                     dataLogList.add(queueTask);
                     dataLogList.add(queueTask);
                     outMap.put(queueTask.getSourceId(), dataLogList);
                     outMap.put(queueTask.getSourceId(), dataLogList);
-                    } else {
-                        if (StringUtils.isNotBlank(rgb)){
-                            log.info(queueTask.getPosName() + "库位亮灯:" + "#" + rgb);
-                            statusBean.addData("open", queueTask.getPosName() + "=#" + rgb);
-                        } else {
-                            color = ORDER_COLOR.BLUE;
-                        }
-                    }
-                }
-                if (color != null){
-                    statusBean.addData("open", queueTask.getPosName() + "=" + color.name());
-                    log.info("库位[" + queueTask.getPosName() + "]+亮灯:" + color.name());
                 }
                 }
             }
             }
         }
         }