bug

warewms-ams/src/main/java/com/ruoyi/ams/business/BusinessServiceImpl.java

@@ -322,9 +322,6 @@ public class BusinessServiceImpl implements IBusinessService {
                     if (!b.getStockStatus().equals("00") || !b.getIsEmpty().equals("Y") || redisCache.checkIsLock(RedisKey.LOCK_LOCATION + b.getId())) {
                         continue;
                     }
-                    if (!redisCache.lockCacheObject(RedisKey.LOCK_LOCATION + b.getId(), b.getId().toString(), token)) {
-                        continue;
-                    }
                     // 根据起始库位判断目标是否可放
                     Boolean canPut = checkLocCanPut(locationFrom, b);
                     if (!canPut) {
@@ -339,6 +336,9 @@ public class BusinessServiceImpl implements IBusinessService {
                     if (!iscan) {
                         continue;
                     }
+                    if (!redisCache.lockCacheObject(RedisKey.LOCK_LOCATION + b.getId(), b.getId().toString(), token)) {
+                        continue;
+                    }
 
                     locationInfo = b;
                     break;
@@ -349,14 +349,14 @@ public class BusinessServiceImpl implements IBusinessService {
                         if (!b.getStockStatus().equals("00") || !b.getIsEmpty().equals("Y") || redisCache.checkIsLock(RedisKey.LOCK_LOCATION + b.getId())) {
                             continue;
                         }
-                        if (!redisCache.lockCacheObject(RedisKey.LOCK_LOCATION + b.getId(), b.getId().toString(), token)) {
-                            continue;
-                        }
                         // 根据起始库位判断目标是否可放
                         Boolean canPut = checkLocCanPut(locationFrom, b);
                         if (!canPut) {
                             continue;
                         }
+                        if (!redisCache.lockCacheObject(RedisKey.LOCK_LOCATION + b.getId(), b.getId().toString(), token)) {
+                            continue;
+                        }
                         locationInfo = b;
                         break;
                     }