同一个料仓出一盘迈征的,出一盘其他的

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

@@ -437,6 +437,8 @@ public class TaskService {
         return false;
         return false;
     }
     }
 
 
+    Map<String,Boolean> cacheMaiZhengTaskMap = Maps.newConcurrentMap();
+
 
 
     /**
     /**
      * 为 box 分配出库任务
      * 为 box 分配出库任务
@@ -469,23 +471,34 @@ public class TaskService {
             }
             }
         }
         }
 
 
-        DataLog maiZhengTask = null;
-        for (DataLog task : allTasks) {//优先分配单盘任务和没有工单的任务
-            if (cid.equals(task.getCid()) && task.isCheckOutTask() && task.isWait()) {
-                String posName = task.getPosName();
-                if (!Strings.isNullOrEmpty(posName)) {//有库位号
-                    if (task.isMaiZhengOrder()) {
-                        //单盘优先出库
-                        if (maiZhengTask == null || task.getCreateDate().before(maiZhengTask.getCreateDate())) {
-                            maiZhengTask = task;
+        //如果上一次是迈征的,这一次则不出迈征的
+        Boolean isMaizheng = cacheMaiZhengTaskMap.get(cid);
+        if (isMaizheng == null){
+            isMaizheng = false;
+        }
+        //log.info(storage.getName() + "上一次分配任务是否为迈征工单:" + isMaizheng);
+
+
+        if (!isMaizheng) {
+            DataLog maiZhengTask = null;
+            for (DataLog task : allTasks) {//优先分配单盘任务和没有工单的任务
+                if (cid.equals(task.getCid()) && task.isCheckOutTask() && task.isWait()) {
+                    String posName = task.getPosName();
+                    if (!Strings.isNullOrEmpty(posName)) {//有库位号
+                        if (task.isMaiZhengOrder()) {
+                            //单盘优先出库
+                            if (maiZhengTask == null || task.getCreateDate().before(maiZhengTask.getCreateDate())) {
+                                maiZhengTask = task;
+                            }
                         }
                         }
                     }
                     }
                 }
                 }
             }
             }
-        }
-        if (maiZhengTask != null) {
-            log.info("分配优先(迈征)出库任务" + maiZhengTask.getBarcode() + "[" + maiZhengTask.getPosName() + "]到 " + cid);
-            return maiZhengTask;
+            if (maiZhengTask != null) {
+                log.info("分配优先(迈征)出库任务" + maiZhengTask.getBarcode() + "[" + maiZhengTask.getPosName() + "]到 " + cid);
+                cacheMaiZhengTaskMap.put(cid,true);
+                return maiZhengTask;
+            }
         }
         }
 
 
 
 
@@ -507,10 +520,14 @@ public class TaskService {
 
 
         if (singleOutTask != null) {
         if (singleOutTask != null) {
             log.info("分配优先(单盘或无工单)出库任务" + singleOutTask.getBarcode() + "[" + singleOutTask.getPosName() + "]到 " + cid);
             log.info("分配优先(单盘或无工单)出库任务" + singleOutTask.getBarcode() + "[" + singleOutTask.getPosName() + "]到 " + cid);
+            cacheMaiZhengTaskMap.put(cid,false);
             return singleOutTask;
             return singleOutTask;
         }
         }
 
 
         DataLog outTask = getNextTaskInStorage(cid);
         DataLog outTask = getNextTaskInStorage(cid);
+        if (outTask != null){
+            cacheMaiZhengTaskMap.put(cid,false);
+        }
 
 
         return outTask;
         return outTask;
     }
     }