1.获取同一个库位 bug修改

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

@@ -230,7 +230,7 @@ public class RobotBoxHandler extends  BaseDeviceHandler {
     @PostMapping(value = "/service/store/robotBox/emptyPosForPutin")
     @PostMapping(value = "/service/store/robotBox/emptyPosForPutin")
     @ResponseBody
     @ResponseBody
     @AnonymousAccess
     @AnonymousAccess
-    public Map<String, Object> emptyPosForPutin(HttpServletRequest request) {
+    public synchronized Map<String, Object> emptyPosForPutin(HttpServletRequest request) {
         String code = request.getParameter("code");
         String code = request.getParameter("code");
         String cids = request.getParameter("cids");
         String cids = request.getParameter("cids");
 
 
@@ -262,7 +262,7 @@ public class RobotBoxHandler extends  BaseDeviceHandler {
         List<String> cidList=new ArrayList<>();
         List<String> cidList=new ArrayList<>();
         //if (Strings.isNullOrEmpty(cids)) {
         //if (Strings.isNullOrEmpty(cids)) {
             //自动获取在线的料仓列表
             //自动获取在线的料仓列表
-             cidList=dataCache.getAvailableStorageIds(this.getDeviceType());
+             cidList=dataCache.getAvailableStorageCids(this.getDeviceType());
         //} else {
         //} else {
             //cidList = Lists.newArrayList(cids.split(","));
             //cidList = Lists.newArrayList(cids.split(","));
         //}
         //}

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

@@ -660,7 +660,7 @@ public class DataCache {
         }
         }
         return availableStorageIds;
         return availableStorageIds;
     }
     }
-    public List<String> getAvailableStorageIds(DeviceType deviceType){
+    public List<String> getAvailableStorageCids(DeviceType deviceType){
         List<String> availableStorageIds = new ArrayList<>();
         List<String> availableStorageIds = new ArrayList<>();
         for (Storage storage : getAllStorage().values()) {
         for (Storage storage : getAllStorage().values()) {
 
 
@@ -670,7 +670,7 @@ public class DataCache {
                     continue;
                     continue;
                 }
                 }
                 //if (bean.getStatus() == 1) {
                 //if (bean.getStatus() == 1) {
-                    availableStorageIds.add(storage.getId());
+                    availableStorageIds.add(storage.getCid());
                 //}
                 //}
             }
             }
         }
         }

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

@@ -502,7 +502,7 @@ public class TaskService {
      */
      */
     public Collection<String> excludePosIds() {
     public Collection<String> excludePosIds() {
         //排除掉正在执行的仓位
         //排除掉正在执行的仓位
-        Collection<DataLog> allTasks = taskMap.values();
+        Collection<DataLog> allTasks = getAllTasks();
         Collection<String> operatingPosIds = ReelLockPosUtil.getAllLockPosIds();
         Collection<String> operatingPosIds = ReelLockPosUtil.getAllLockPosIds();
         for (DataLog task : allTasks) {
         for (DataLog task : allTasks) {
             String posId = task.getPosId();
             String posId = task.getPosId();