出库策略增加 FIFO_RI_DID

src/main/java/com/neotel/smfcore/core/storage/enums/CHECKOUT_TYPE.java

@@ -29,5 +29,10 @@ public enum CHECKOUT_TYPE {
     /**
     /**
      * 批次优先
      * 批次优先
      */
      */
-    BATCH_FIRST;
+    BATCH_FIRST,
+
+    /**
+     * 先进先出，料架亮灯指引时按照上传工单中的DID的顺序进行指引出库
+     */
+    FIFO_RI_DID,
 }
 }

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

@@ -460,7 +460,12 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         }else if(CHECKOUT_TYPE.BATCH_FIRST.equals(checkoutType)){
         }else if(CHECKOUT_TYPE.BATCH_FIRST.equals(checkoutType)){
             //批次优先
             //批次优先
             sort = Sort.by(Sort.Direction.ASC, "barcode.batch","barcode.produceDate","barcode.amount", "barcode.putInDate");
             sort = Sort.by(Sort.Direction.ASC, "barcode.batch","barcode.produceDate","barcode.amount", "barcode.putInDate");
-        }else{//效率优先
+        }
+        //先进先出，料架亮灯指引时按照上传工单中的DID的顺序进行指引出库
+        else if(CHECKOUT_TYPE.FIFO_RI_DID.equals(checkoutType)){
+            sort = Sort.by(Sort.Direction.ASC, "barcode.putInDate", "barcode.usedCount");
+        }
+        else{//效率优先
             sort = Sort.by(Sort.Direction.ASC, "barcode.putInDate", "createDate");
             sort = Sort.by(Sort.Direction.ASC, "barcode.putInDate", "createDate");
         }
         }
         return sort;
         return sort;

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

@@ -1379,7 +1379,13 @@ public class TaskService {
                     .thenComparing(Barcode::getProduceDate, Comparator.nullsFirst(Comparator.naturalOrder()))
                     .thenComparing(Barcode::getProduceDate, Comparator.nullsFirst(Comparator.naturalOrder()))
                     .thenComparing(Barcode::getAmount, Comparator.nullsFirst(Comparator.naturalOrder()))
                     .thenComparing(Barcode::getAmount, Comparator.nullsFirst(Comparator.naturalOrder()))
                     .thenComparing(Barcode::getPutInDate, Comparator.nullsFirst(Comparator.naturalOrder()));
                     .thenComparing(Barcode::getPutInDate, Comparator.nullsFirst(Comparator.naturalOrder()));
-        } else {
+        }
+        //先进先出，料架亮灯指引时按照上传工单中的DID的顺序进行指引出库
+        else if(CHECKOUT_TYPE.FIFO_RI_DID.equals(checkoutType)){
+            comparator = Comparator.comparing(Barcode::getPutInDate, Comparator.nullsFirst(Comparator.naturalOrder()))
+                    .thenComparing(Barcode::getUsedCount);
+        }
+        else {
             // 效率优先
             // 效率优先
             comparator = Comparator.comparing(Barcode::getPutInDate, Comparator.nullsFirst(Comparator.naturalOrder()))
             comparator = Comparator.comparing(Barcode::getPutInDate, Comparator.nullsFirst(Comparator.naturalOrder()))
                     .thenComparing(Barcode::getCreateDate, Comparator.nullsFirst(Comparator.naturalOrder()));
                     .thenComparing(Barcode::getCreateDate, Comparator.nullsFirst(Comparator.naturalOrder()));