Merge remote-tracking branch 'origin/master'

src/main/java/com/neotel/smfcore/core/device/util/EquipmentCache.java

@@ -34,7 +34,7 @@ public class EquipmentCache {
                             map.put(equipment.getCid(), equipment);
                         }
                         allEquipment = map;
-                        log.info("加载所有料仓["+all.size()+"]信息到缓存");
+                        log.info("加载所有设备["+all.size()+"]信息到缓存");
                     }
                 }
             }

src/main/java/com/neotel/smfcore/core/inList/rest/InListController.java

@@ -210,7 +210,7 @@ public class InListController {
                         storage.setInListName(inListName);
                         log.info("设置组[" + groupId + "]料架[" + storage.getName() + "]的入库单为：[" + inListName + "]");
                         storageManager.save(storage);
-                        dataCache.reloadStorage(storage,storage.getCid());
+                        dataCache.reloadStorage(storage,"");
                     }
                 }
 
@@ -222,7 +222,7 @@ public class InListController {
                     storage.setInListName(inListName);
                     log.info("设置料架[" + storage.getName() + "]的入库单为：[" + inListName + "]");
                     storageManager.save(storage);
-                    dataCache.reloadStorage(storage,storage.getCid());
+                    dataCache.reloadStorage(storage,"");
                 }
             }
         }

src/main/java/com/neotel/smfcore/core/selfAudit/rest/SelfAuditDeviceController.java

@@ -141,7 +141,7 @@ public class SelfAuditDeviceController {
                             log.info(opUser + "盘点完成，清理库位[" + storagePos.getPosName() + "]中的库存" + barcode.getBarcode());
                             taskService.addTaskToFinished(storagePos, null, opUser + "-clear");
                             Storage storage = dataCache.getStorageById(storagePos.getStorageId());
-                            dataCache.reloadStorage(storage, storage.getCid());
+                            dataCache.reloadStorage(storage, "");
                         }
 
                         //更新状态

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

@@ -177,7 +177,7 @@ public class StoragePosController {
             }
         }
 
-        dataCache.reloadStorage(storage, storage.getCid());
+        dataCache.reloadStorage(storage, "");
         return ResultBean.newOkResult("");
 
     }
@@ -203,7 +203,7 @@ public class StoragePosController {
                         log.info(opUser + "清理库位[" + storagePos.getPosName() + "]中的库存" + barcode.getBarcode());
                         taskService.addTaskToFinished(storagePos, null, opUser + "-clear");
                         Storage storage = dataCache.getStorageById(storagePos.getStorageId());
-                        dataCache.reloadStorage(storage, storage.getCid());
+                        dataCache.reloadStorage(storage,"");
                     }
 
                     return ResultBean.newOkResult("");
@@ -235,7 +235,7 @@ public class StoragePosController {
         DeviceMessageUtil.addEnabledPosMessage(pos,SecurityUtils.getCurrentUsername());
         Storage storage = dataCache.getStorageById(pos.getStorageId());
         if(storage != null){
-            dataCache.reloadStorage(storage,storage.getCid());
+            dataCache.reloadStorage(storage,"");
         }
         return ResultBean.newOkResult("");
     }
@@ -257,7 +257,7 @@ public class StoragePosController {
             DeviceMessageUtil.addEnabledPosMessage(pos, SecurityUtils.getCurrentUsername());
         }
         for (Storage storage : dataCache.getAllStorage().values()) {
-            dataCache.reloadStorage(storage, storage.getCid());
+            dataCache.reloadStorage(storage, "");
         }
         return ResultBean.newOkResult("");
     }

src/main/java/com/neotel/smfcore/core/system/util/TaskService.java

@@ -279,7 +279,7 @@ public class TaskService {
                     DeviceMessageUtil.addEnabledPosMessage(pos, SecurityUtils.getCurrentUsername());
                     Storage storage = dataCache.getStorageById(pos.getStorageId());
                     if (storage != null) {
-                        dataCache.reloadStorage(storage, storage.getCid());
+                        dataCache.reloadStorage(storage, "");
                     }
                 }
             }

src/main/java/com/neotel/smfcore/custom/micron20031/MicronSpLoadController.java

@@ -107,7 +107,7 @@ public class MicronSpLoadController {
         storage.setInListName(matReqNo);
         log.info("设置料仓[" + storage.getName() + "]的入库单为：[" + matReqNo + "],同时更新入库单开始时间");
         storageManager.save(storage);
-        dataCache.reloadStorage(storage, storage.getCid());
+        dataCache.reloadStorage(storage, "");
         return ResultBean.newOkResult(matReqNo);
     }
 
@@ -124,7 +124,7 @@ public class MicronSpLoadController {
         storage.setInListName("");
         log.info("设置料仓[" + storage.getName() + "]开始 return ");
         storageManager.save(storage);
-        dataCache.reloadStorage(storage, storage.getCid());
+        dataCache.reloadStorage(storage,"");
         return ResultBean.newOkResult("");
     }