NL料架亮灯bug修改

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

@@ -94,7 +94,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
                     }
                     }
                 }
                 }
                 statusBean.addData("open",queueTask.getPosName()+"="+color.name());
                 statusBean.addData("open",queueTask.getPosName()+"="+color.name());
-                log.info("库位[" + queueTask.getPosName() + "]+亮灯:" + color.name());
+                log.info("库位[" + queueTask.getPosName() + "]["+queueTask.getType()+"]+亮灯:" + color.name());
             }
             }
         }
         }
 
 
@@ -119,7 +119,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
                 log.info(  psession+ "关闭上一个操作库位:"+ posToClose.getPosName());
                 log.info(  psession+ "关闭上一个操作库位:"+ posToClose.getPosName());
                 operateBean.setPosToClose(null);
                 operateBean.setPosToClose(null);
                 shelfPutInBeanMap.put(sessionId, operateBean);
                 shelfPutInBeanMap.put(sessionId, operateBean);
-                opPosLight("close", posToClose, "");
+                opPosLight("close", posToClose, "",false);
             }
             }
         }
         }
 
 
@@ -147,12 +147,24 @@ public class NLShelfHandler extends BaseDeviceHandler {
      * @param pos
      * @param pos
      * @param colorStr
      * @param colorStr
      */
      */
-    private void opPosLight(String opKey, StoragePos pos, String colorStr){
+    private void opPosLight(String opKey, StoragePos pos, String colorStr,boolean neeCheck){
+
         String opStr = pos.getPosName();
         String opStr = pos.getPosName();
         if(!Strings.isNullOrEmpty(colorStr)){
         if(!Strings.isNullOrEmpty(colorStr)){
             opStr =opStr+ "=" + colorStr;
             opStr =opStr+ "=" + colorStr;
         }
         }
         Storage storage = dataCache.getStorageById(pos.getStorageId());
         Storage storage = dataCache.getStorageById(pos.getStorageId());
+        if(neeCheck){
+            //判断库位是否有料，若已有料，不需要处理
+            StoragePos newPos=storagePosManager.get(pos.getId());
+            if(newPos.getBarcode()!=null){
+                log.info("自动关闭库位:"+ pos.getPosName()+"时，库位已有料，不需要处理自动关闭");
+                return;
+            }else{
+                log.info("自动关闭库位:"+ pos.getPosName());
+            }
+        }
+
         DevicesStatusUtil.appendOp(storage.getCid(), opKey , opStr);
         DevicesStatusUtil.appendOp(storage.getCid(), opKey , opStr);
         //log.info("操作库位["+pos.getPosName()+"]" + opKey + " : " + opStr);
         //log.info("操作库位["+pos.getPosName()+"]" + opKey + " : " + opStr);
     }
     }
@@ -175,8 +187,8 @@ public class NLShelfHandler extends BaseDeviceHandler {
             public void run() {
             public void run() {
                 try {
                 try {
                     Thread.sleep(delayCloseTime);
                     Thread.sleep(delayCloseTime);
-                    log.info("自动关闭库位:"+ pos.getPosName());
-                    opPosLight("close", pos, "");
+//                    log.info("自动关闭库位:"+ pos.getPosName());
+                    opPosLight("close", pos, "",true);
                 }catch (Exception e){
                 }catch (Exception e){
 
 
                 }
                 }
@@ -321,7 +333,7 @@ public class NLShelfHandler extends BaseDeviceHandler {
                                     }
                                     }
                                 }
                                 }
                             taskService.addTaskToFinished(inPos, null, loginUser);
                             taskService.addTaskToFinished(inPos, null, loginUser);
-                            opPosLight("close", inPos, null);
+                            opPosLight("close", inPos, null,false);
                             log.info(barcode.getBarcode() + " 出库完成, 库位[" + inPos.getPosName() + "]灭灯");
                             log.info(barcode.getBarcode() + " 出库完成, 库位[" + inPos.getPosName() + "]灭灯");
                             return ResultBean.newOkResult( "smfcore.shelf.msg.outConfirm", "出库完成, 库位[{0}]灭灯", new String[]{inPos.getPosName()} );
                             return ResultBean.newOkResult( "smfcore.shelf.msg.outConfirm", "出库完成, 库位[{0}]灭灯", new String[]{inPos.getPosName()} );
                         }
                         }