FIFO_RI_DID出库策略PN出库是根据barcode排序。

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

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

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

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