调整出库策略

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

@@ -344,10 +344,10 @@ public class StoragePosManagerImpl implements IStoragePosManager {
             sort = Sort.by(Sort.Direction.ASC, "barcode.amount", "canCheckOutTime");
             sort = Sort.by(Sort.Direction.ASC, "barcode.amount", "canCheckOutTime");
         }else if(CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
         }else if(CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
             //先生产先出
             //先生产先出
-            sort = Sort.by(Sort.Direction.ASC, "barcode.amount","barcode.produceDate", "canCheckOutTime");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.produceDate","barcode.amount", "canCheckOutTime");
         }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", "canCheckOutTime");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.batch","barcode.produceDate","barcode.amount", "canCheckOutTime");
         }else{//效率优先
         }else{//效率优先
             sort = Sort.by(Sort.Direction.ASC, "canCheckOutTime", "createDate");
             sort = Sort.by(Sort.Direction.ASC, "canCheckOutTime", "createDate");
         }
         }