SP出库增加出库策略排序

src/main/java/com/neotel/smfcore/core/solder/rest/SpBoxController.java

@@ -19,12 +19,14 @@ import com.neotel.smfcore.core.device.enums.OP;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.device.util.DataCache;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.language.util.MessageUtils;
 import com.neotel.smfcore.core.solder.rest.bean.dto.SpTaskDto;
 import com.neotel.smfcore.core.solder.rest.bean.dto.SpTaskDto;
+import com.neotel.smfcore.core.storage.enums.CHECKOUT_TYPE;
 import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
 import com.neotel.smfcore.core.storage.rest.dto.CheckOutDto;
 import com.neotel.smfcore.core.storage.rest.dto.InventoryItemDto;
 import com.neotel.smfcore.core.storage.rest.dto.InventoryItemDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
 import com.neotel.smfcore.core.storage.rest.dto.StoragePosDto;
 import com.neotel.smfcore.core.storage.rest.mapstruct.StoragePosMapper;
 import com.neotel.smfcore.core.storage.rest.mapstruct.StoragePosMapper;
 import com.neotel.smfcore.core.storage.rest.query.StoragePosFindCriteria;
 import com.neotel.smfcore.core.storage.rest.query.StoragePosFindCriteria;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
 import com.neotel.smfcore.core.storage.service.manager.IStoragePosManager;
+import com.neotel.smfcore.core.storage.service.manager.impl.StoragePosManagerImpl;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.system.rest.bean.query.TaskQueryCondition;
 import com.neotel.smfcore.core.system.rest.bean.query.TaskQueryCondition;
@@ -71,6 +73,9 @@ public class SpBoxController {
     private IComponentManager componentManager;
     private IComponentManager componentManager;
 
 
 
 
+    @Autowired
+    private StoragePosManagerImpl posManager;
+
     @ApiOperation("锡膏UID出库")
     @ApiOperation("锡膏UID出库")
     @GetMapping("/uidList")
     @GetMapping("/uidList")
     @PreAuthorize("@el.check('checkOut')")
     @PreAuthorize("@el.check('checkOut')")
@@ -252,8 +257,10 @@ public class SpBoxController {
         }
         }
         Query q = new Query(c);
         Query q = new Query(c);
         q.limit(num);
         q.limit(num);
+        CHECKOUT_TYPE checkoutType = dataCache.getCheckOutType();
+        Sort sort =storagePosManager.getSortByCheckOutType(checkoutType);
         //优先使用二次入库的
         //优先使用二次入库的
-        q.with(Sort.by(Sort.Direction.ASC, "barcode.solderStatus").and(Sort.by(Sort.Direction.ASC, "barcode.putInTime")));
+        q.with(Sort.by(Sort.Direction.ASC, "barcode.solderStatus").and(sort));
         return storagePosManager.findByQuery(q);
         return storagePosManager.findByQuery(q);
     }
     }
 
 

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

@@ -9,6 +9,7 @@ import com.neotel.smfcore.core.storage.enums.CHECKOUT_TYPE;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.Storage;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import com.neotel.smfcore.core.storage.service.po.StoragePos;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Query;
 
 
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
@@ -93,4 +94,6 @@ public interface IStoragePosManager extends IBaseManager<StoragePos> {
     StoragePos findByStorageName(String code);
     StoragePos findByStorageName(String code);
 
 
     StoragePos findOne(Query query);
     StoragePos findOne(Query query);
+
+      Sort getSortByCheckOutType(CHECKOUT_TYPE checkoutType);
 }
 }

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

@@ -332,6 +332,8 @@ public class StoragePosManagerImpl implements IStoragePosManager {
     /**
     /**
      * 根据出库方式获取不同的 Sort
      * 根据出库方式获取不同的 Sort
      */
      */
+
+    @Override
     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)){//先过期先出