排序发运打印 龙兴

modules/i3plus-ext-mes-pcn-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/pcn/apiservice/serviceimpl/print/sortshipping/strategy/CqLxSortShippingPrintStrategyService.java

@@ -149,7 +149,10 @@ public class CqLxSortShippingPrintStrategyService extends SortShippingDispatchSt
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         if (jisIdList.size() == 1) DdlPreparedPack.getNumEqualPack(jisIdList.get(0), MesPcnExtConstWords.PID, packBean);
         else DdlPreparedPack.getInPackList(jisIdList, MesPcnExtConstWords.PID, packBean);
-        return cimSeresSrmRunSheetJisDetailRepository.findByHqlWhere(packBean);
+        List<MesCimSeresSrmRunSheetJisDetail> cimSeresSrmRunSheetJisDetailList = cimSeresSrmRunSheetJisDetailRepository.findByHqlWhere(packBean);
+        return CollectionUtils.isEmpty(cimSeresSrmRunSheetJisDetailList) ? null :
+                cimSeresSrmRunSheetJisDetailList.stream().filter(o -> (null != o && !StringUtils.isEmpty(o.getSerialNumber())))
+                        .sorted(Comparator.comparing(MesCimSeresSrmRunSheetJisDetail::getSerialNumber)).collect(Collectors.toList());
     }
 
 }