分配库位 A/B面 交叉分配

src/main/java/com/neotel/smfcore/core/storage/service/manager/IStoragePosManager.java

@@ -41,7 +41,7 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
 
 
     StoragePos getEmptyPosByStorage(Storage storage, Barcode barcode, Collection<String> excludePosIds) throws ValidateException;
     StoragePos getEmptyPosByStorage(Storage storage, Barcode barcode, Collection<String> excludePosIds) throws ValidateException;
 
 
-    StoragePos getEmptyPosByStorage(Storage storage, Barcode barcode, Collection<String> excludePosIds, String lastPosId) throws ValidateException;
+    StoragePos getEmptyPosByStorage(Storage storage, Barcode barcode, Collection<String> excludePosIds, String lastPosId,String logotype) throws ValidateException;
 
 
     List<StoragePos> findNotEmpty();
     List<StoragePos> findNotEmpty();
 
 

src/main/java/com/neotel/smfcore/core/storage/service/manager/impl/StoragePosManagerImpl.java

@@ -7,6 +7,8 @@ import com.google.common.collect.Maps;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.bean.PageData;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.exception.ValidateException;
 import com.neotel.smfcore.common.utils.PointUtil;
 import com.neotel.smfcore.common.utils.PointUtil;
+import com.neotel.smfcore.common.utils.QueryHelp;
+import com.neotel.smfcore.common.utils.StringUtils;
 import com.neotel.smfcore.core.barcode.bean.PlateSizeBean;
 import com.neotel.smfcore.core.barcode.bean.PlateSizeBean;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.barcode.service.po.Barcode;
 import com.neotel.smfcore.core.storage.bean.InventoryItem;
 import com.neotel.smfcore.core.storage.bean.InventoryItem;
@@ -30,6 +32,7 @@ import org.springframework.stereotype.Service;
 
 
 import java.util.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.regex.Pattern;
 
 
 @Service
 @Service
 @Slf4j
 @Slf4j
@@ -373,7 +376,7 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     }
     }
 
 
     @Override
     @Override
-    public StoragePos getEmptyPosByStorage(Storage storage, Barcode barcode, Collection<String> excludePosIds,String lastPosId) throws ValidateException {
+    public StoragePos getEmptyPosByStorage(Storage storage, Barcode barcode, Collection<String> excludePosIds,String lastPosId,String logotype) throws ValidateException {
 
 
         Criteria c = Criteria.where("storageId").is(storage.getId());
         Criteria c = Criteria.where("storageId").is(storage.getId());
 
 
@@ -395,6 +398,12 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         if (excludePosIds != null && !excludePosIds.isEmpty()) {
         if (excludePosIds != null && !excludePosIds.isEmpty()) {
             c = c.and("id").nin(excludePosIds);
             c = c.and("id").nin(excludePosIds);
         }
         }
+
+        //分AB面
+        if (StringUtils.isNotBlank(logotype)){
+            c = c.and("posName").regex(Pattern.compile(QueryHelp.escapeExprSpecialWord(logotype),Pattern.CASE_INSENSITIVE));
+        }
+
         Query query = new Query(c);
         Query query = new Query(c);
         String msg = "";
         String msg = "";
 
 

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

@@ -32,6 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
 import java.util.*;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 
 
 /**
 /**
  * Created by sunke on 2021/7/13.
  * Created by sunke on 2021/7/13.
@@ -56,6 +57,12 @@ public class TaskService {
     private SmfApi smfApi;
     private SmfApi smfApi;
 
 
     /**
     /**
+     * key 为料仓id
+     * value 为A,B面
+     */
+    private static Map<String,String> logotypeMap = new ConcurrentHashMap<>();
+
+    /**
      * 任务队列,Key 为dataLog的ID，value 为本区域待执行的任务
      * 任务队列,Key 为dataLog的ID，value 为本区域待执行的任务
      */
      */
     private static Map<String, DataLog> taskMap = Maps.newConcurrentMap();
     private static Map<String, DataLog> taskMap = Maps.newConcurrentMap();
@@ -661,7 +668,34 @@ public class TaskService {
             try {
             try {
                 Collection<String> operatingPosIds = excludePosIds();
                 Collection<String> operatingPosIds = excludePosIds();
                 log.debug("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找空位");
                 log.debug("尝试从[" + storage.getCid() + "]中为[" + barcode.getBarcode() + "]查找空位");
-                StoragePos pos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds, lastPosId);
+                StoragePos pos = null;
+                if (!storage.isXLC()) {
+                    //如果为空的话 先查询A面
+                    String logotype = "";
+                    if (logotypeMap.get(storage.getCid()) == null) {
+                        logotype = "AA";
+                    } else {
+                        logotype = logotypeMap.get(storage.getCid());
+                    }
+                    if ("AA".equals(logotype)) {
+                        logotype = "BB";
+                    } else {
+                        logotype = "AA";
+                    }
+                    pos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds, lastPosId, logotype);
+                    if (pos == null) {
+                        if ("AA".equals(logotype)) {
+                            logotype = "BB";
+                        } else {
+                            logotype = "AA";
+                        }
+                    }
+                    pos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds, lastPosId, logotype);
+                    logotypeMap.put(storage.getCid(), logotype);
+                }
+                if (pos == null) {
+                    pos = storagePosManager.getEmptyPosByStorage(storage, barcode, operatingPosIds, lastPosId, null);
+                }
                 if (pos != null) {
                 if (pos != null) {
                     return pos;
                     return pos;
                 }
                 }