出库策略调整

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

@@ -337,19 +337,19 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     public Sort getSortByCheckOutType(CHECKOUT_TYPE checkoutType){
     public Sort getSortByCheckOutType(CHECKOUT_TYPE checkoutType){
         Sort sort = null;
         Sort sort = null;
         if(CHECKOUT_TYPE.EXPIRE_FIRST.equals(checkoutType)){//先过期先出
         if(CHECKOUT_TYPE.EXPIRE_FIRST.equals(checkoutType)){//先过期先出
-            sort = Sort.by(Sort.Direction.ASC, "barcode.expTime","barcode.expireDate","putInDate");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.expTime","barcode.expireDate","barcode.putInDate");
         }else if(CHECKOUT_TYPE.FIFO.equals(checkoutType)){//严格的先进先出
         }else if(CHECKOUT_TYPE.FIFO.equals(checkoutType)){//严格的先进先出
-            sort = Sort.by(Sort.Direction.ASC, "putInDate", "barcode.usedCount");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.putInDate", "barcode.usedCount");
         }else if(CHECKOUT_TYPE.USED_FIRST.equals(checkoutType)){//尾料优先
         }else if(CHECKOUT_TYPE.USED_FIRST.equals(checkoutType)){//尾料优先
-            sort = Sort.by(Sort.Direction.ASC, "barcode.amount", "putInDate");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.amount", "barcode.putInDate");
         }else if(CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
         }else if(CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
             //先生产先出
             //先生产先出
-            sort = Sort.by(Sort.Direction.ASC, "barcode.produceDate","barcode.amount", "putInDate");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.produceDate","barcode.amount", "barcode.putInDate");
         }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", "putInDate");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.batch","barcode.produceDate","barcode.amount", "barcode.putInDate");
         }else{//效率优先
         }else{//效率优先
-            sort = Sort.by(Sort.Direction.ASC, "putInDate", "createDate");
+            sort = Sort.by(Sort.Direction.ASC, "barcode.putInDate", "createDate");
         }
         }
         return sort;
         return sort;
     }
     }