优化挑料逻辑

src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java

@@ -1218,9 +1218,7 @@ public class LiteOrderCache {
 
 
         //按排序找到最先过期入库的partNumber
         //按排序找到最先过期入库的partNumber
         if (barcodeList != null && !barcodeList.isEmpty()) {
         if (barcodeList != null && !barcodeList.isEmpty()) {
-            barcodeList = barcodeList.stream().sorted(Comparator.comparing(Barcode::getCreateDate, Comparator.nullsFirst(Date::compareTo)).reversed()).collect(Collectors.toList());
-            barcodeList = barcodeList.stream().sorted(Comparator.comparing(Barcode::getIsVirtual).reversed()).collect(Collectors.toList());
-
+            barcodeList = barcodeList.stream().sorted(Comparator.comparing(Barcode::getIsVirtual).reversed().thenComparing(Barcode::getCreateDate, Comparator.nullsFirst(Date::compareTo))).collect(Collectors.toList());
             List<String> posNameList = barcodeList.stream().map(item -> item.getPosName()).distinct().collect(Collectors.toList());
             List<String> posNameList = barcodeList.stream().map(item -> item.getPosName()).distinct().collect(Collectors.toList());
             for (String posName : posNameList) {
             for (String posName : posNameList) {
                 for (StoragePos pos : storagePosList) {
                 for (StoragePos pos : storagePosList) {