NL料架BUG修改

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

@@ -9,12 +9,15 @@ import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.device.api.IOpAuthApi;
 import com.neotel.smfcore.core.device.api.IOpAuthApi;
 import com.neotel.smfcore.core.device.bean.NLShelfOperateBean;
 import com.neotel.smfcore.core.device.bean.NLShelfOperateBean;
 import com.neotel.smfcore.core.device.bean.StatusBean;
 import com.neotel.smfcore.core.device.bean.StatusBean;
+import com.neotel.smfcore.core.device.enums.OP_STATUS;
 import com.neotel.smfcore.core.inList.util.InListCache;
 import com.neotel.smfcore.core.inList.util.InListCache;
+import com.neotel.smfcore.core.order.enums.ORDER_COLOR;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.manager.ILiteOrderManager;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.order.service.po.LiteOrder;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.enums.DeviceType;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
+import com.neotel.smfcore.core.system.bean.OrderSetting;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.service.po.DataLog;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
@@ -58,10 +61,48 @@ public class NLShelfHandler extends BaseDeviceHandler {
         handleMsg(statusBean);
         handleMsg(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
         statusBean = saveAlarmAndHumidity(statusBean);
 
 
-        if(statusBean != null){
+
+        OrderSetting orderSetting = dataCache.getOrderSetting();
+        boolean openZhiYin = orderSetting.getShelfLightType().equals(1);
+        Map<String, List<DataLog>> outMap = new HashMap<>();
+
+        if (statusBean != null) {
             Map<String, String> opMap = DevicesStatusUtil.getAndRemoveOp(statusBean.getCid());
             Map<String, String> opMap = DevicesStatusUtil.getAndRemoveOp(statusBean.getCid());
             statusBean.addOp(opMap);
             statusBean.addOp(opMap);
         }
         }
+
+        //亮灯
+        Collection<DataLog> queueTasks = taskService.getQueueTasks(statusBean.getCid());
+        for (DataLog queueTask : queueTasks) {
+            if (queueTask.isWait()) {
+                queueTask.setStatus(OP_STATUS.EXECUTING.name());
+                taskService.updateQueueTask(queueTask);
+                String rgb = queueTask.getLightColor();
+                ORDER_COLOR color = ORDER_COLOR.fromRgb(rgb);
+                if (color == null) {
+                    if (queueTask.isPutInTask()) {
+                        color = ORDER_COLOR.DARKGREEN;
+                    } else if (openZhiYin && ObjectUtil.isNotEmpty(queueTask.getSourceId())) {
+                        List<DataLog> dataLogList = outMap.get(queueTask.getSourceId());
+                        if (dataLogList == null) {
+                            dataLogList = new ArrayList<>();
+                        }
+                        dataLogList.add(queueTask);
+                        outMap.put(queueTask.getSourceId(), dataLogList);
+                    } else {
+                        color = ORDER_COLOR.BLUE;
+                    }
+                }
+                statusBean.addData("open",queueTask.getPosName()+"="+color.name());
+                log.info("库位[" + queueTask.getPosName() + "]+亮灯:" + color.name());
+            }
+        }
+
+        List<DataLog> dataLogs = getLightGuideTask(outMap);
+        for (DataLog task :
+                dataLogs) {
+            statusBean.addData("open", task.getPosName() + "=" + ORDER_COLOR.fromRgb(task.getLightColor()).name());
+        }
         return statusBean;
         return statusBean;
     }
     }