手动出库和清空库位 料架灭灯

src/main/java/com/neotel/smfcore/core/storage/rest/MaterialController.java

@@ -24,6 +24,7 @@ import com.neotel.smfcore.core.storage.service.po.Label;
 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.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.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
 import com.neotel.smfcore.security.service.manager.IGroupManager;
 import com.neotel.smfcore.security.service.po.Group;
 import com.neotel.smfcore.security.service.po.Group;
@@ -364,6 +365,16 @@ public class MaterialController {
                     String opUser = SecurityUtils.getCurrentUsername();
                     String opUser = SecurityUtils.getCurrentUsername();
                     log.info(opUser + "清理库位[" + storagePos.getPosName() + "],条码[" + code + "]中的库存" + barcode.getBarcode());
                     log.info(opUser + "清理库位[" + storagePos.getPosName() + "],条码[" + code + "]中的库存" + barcode.getBarcode());
                     taskService.addTaskToFinished(storagePos, null, opUser + "-manual");
                     taskService.addTaskToFinished(storagePos, null, opUser + "-manual");
+                    //如果是料架，库位灭灯
+                    Storage storage = dataCache.getStorageById(storagePos.getStorageId());
+                    if (storage != null){
+                        if (storage.isShelf() || storage.isNLShelf() || storage.isNLPShelf() || storage.isNLMShelf()){
+                            String opKey = "close";
+                            String opStr = storagePos.getPosName();
+                            DevicesStatusUtil.appendOp(storage.getCid(), opKey , opStr);
+                            log.info("操作库位["+storagePos.getPosName()+"]" + opKey + " : " + opStr);
+                        }
+                    }
                 } else {
                 } else {
                     log.info("清理库位[" + storagePos.getPosName() + "],条码[" + code + "]，库位条码为空");
                     log.info("清理库位[" + storagePos.getPosName() + "],条码[" + code + "]，库位条码为空");
                 }
                 }

src/main/java/com/neotel/smfcore/core/storage/rest/StoragePosController.java

@@ -29,6 +29,7 @@ import com.neotel.smfcore.core.storage.rest.query.StoragePosQueryCriteria;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 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.util.DevicesStatusUtil;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.core.system.util.TaskService;
 import com.neotel.smfcore.custom.siemens.SiemensApi;
 import com.neotel.smfcore.custom.siemens.SiemensApi;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
 import com.neotel.smfcore.security.annotation.AnonymousAccess;
@@ -205,8 +206,17 @@ public class StoragePosController {
                         taskService.addTaskToFinished(storagePos, null, opUser + "-clear");
                         taskService.addTaskToFinished(storagePos, null, opUser + "-clear");
                         Storage storage = dataCache.getStorageById(storagePos.getStorageId());
                         Storage storage = dataCache.getStorageById(storagePos.getStorageId());
                         dataCache.reloadStorage(storage,"");
                         dataCache.reloadStorage(storage,"");
-                    }
 
 
+                        //如果是料架，库位灭灯
+                        if (storage != null){
+                            if (storage.isShelf() || storage.isNLShelf() || storage.isNLPShelf() || storage.isNLMShelf()){
+                                String opKey = "close";
+                                String opStr = storagePos.getPosName();
+                                DevicesStatusUtil.appendOp(storage.getCid(), opKey , opStr);
+                                log.info("操作库位["+storagePos.getPosName()+"]" + opKey + " : " + opStr);
+                            }
+                        }
+                    }
                     return ResultBean.newOkResult("");
                     return ResultBean.newOkResult("");
                 } catch (Exception e) {
                 } catch (Exception e) {
 //                return e.getMessage();
 //                return e.getMessage();