阳光电源 排序问题修改

myproject/src/main/java/com/myproject/manager/impl/StoragePosManagerImpl.java

@@ -463,7 +463,8 @@ public class StoragePosManagerImpl implements IStoragePosManager {
         }else if(StorageConstants.CHECKOUT_TYPE.FIFO.equals(checkoutType)){//严格的先进先出
             sort = new Sort(Sort.Direction.ASC, "canCheckOutTime").and(new Sort(Sort.Direction.DESC, "barcode.usedCount"));
         }else if(StorageConstants.CHECKOUT_TYPE.USED_FIRST.equals(checkoutType)){//尾料优先
-            sort = new Sort(Sort.Direction.ASC, "barcode.amount").and(new Sort(Sort.Direction.ASC, "canCheckOutTime"));
+            //sort = new Sort(Sort.Direction.ASC, "barcode.amount").and(new Sort(Sort.Direction.ASC, "canCheckOutTime"));
+            sort = new Sort(Sort.Direction.ASC, "barcode.produceDate").and(new Sort(Sort.Direction.ASC, "barcode.amount")).and(new Sort(Sort.Direction.ASC, "canCheckOutTime"));
         }else if(StorageConstants.CHECKOUT_TYPE.PRODUCE_DATE.equals(checkoutType)){
             //先生产先出
             sort = new Sort(Sort.Direction.ASC, "barcode.produceDate").and(new Sort(Sort.Direction.ASC, "canCheckOutTime"));

myproject/src/main/java/com/myproject/webapp/controller/storage/StoragePosFindController.java

@@ -14,6 +14,7 @@ import com.myproject.webapp.controller.webService.ITaskService;
 import org.displaytag.properties.SortOrderEnum;
 import org.displaytag.tags.TableTagParameters;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Controller;
@@ -168,6 +169,11 @@ public class StoragePosFindController extends BaseSearchController {
         if (request.getParameter(TableTagParameters.PARAMETER_EXPORTING) != null){
             pageList.setPageNumber(-1);
         }
+
+        //先按生产日期 进行排序 再按数量
+        query.with(new Sort(Sort.Direction.ASC,"barcode.produceDate")
+                .and(new Sort(Sort.Direction.ASC,"barcode.amount")));
+
         searchCriteria.setPageList(storagePosManager.findByQuery(query, pageList));
         return SUCCESS_VIEW;
     }