1.修改库存的时候加个锁

2.未完成/未取消的任务,获取库位的时候,也进行排除

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

@@ -699,7 +699,7 @@ public class DataCache {
     /**
     /**
      * 修改库存,出库为负,入库为正
      * 修改库存,出库为负,入库为正
      */
      */
-    public int updateInventory(StoragePos pos, Barcode barcode) {
+    public synchronized int updateInventory(StoragePos pos, Barcode barcode) {
         Storage storage = getStorageById(pos.getStorageId());
         Storage storage = getStorageById(pos.getStorageId());
         String cid = storage.getCid();
         String cid = storage.getCid();
         String partNumber = barcode.getPartNumber();
         String partNumber = barcode.getPartNumber();

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

@@ -610,6 +610,18 @@ public class TaskService {
                 operatingPosIds.add(task.getPosId());
                 operatingPosIds.add(task.getPosId());
             }
             }
         }
         }
+        //未完成的任务,也排除
+        Collection<DataLog> finishTasks = theFinishedTaskMap.values();
+        if (finishTasks != null && !finishTasks.isEmpty()){
+            for (DataLog finishTask : finishTasks) {
+                String posId = finishTask.getPosId();
+                if (StringUtils.isNotEmpty(posId)){
+                    if (!finishTask.isCancel() && !finishTask.isFinished()){
+                        operatingPosIds.add(posId);
+                    }
+                }
+            }
+        }
         return operatingPosIds;
         return operatingPosIds;
     }
     }