龙兴发运单

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

@@ -87,7 +87,8 @@ public class CqLxSortShippingPrintStrategyService extends SortShippingDispatchSt
                 result.setDocNoOther(shippingOrderManagement.getShippingCode().substring(0, shippingOrderManagement.getShippingCode().length() - 4));
             }
             List<MesCimSeresSrmRunSheetJisDetail> sheetJisDetailList = CollectionUtils.isEmpty(jisDetailByPidMap) ? new ArrayList<>() : jisDetailByPidMap.get(sheetJis.get(0).getId());
-            if (!CollectionUtils.isEmpty(sheetJisDetailList)) sheetJisDetailList = sheetJisDetailList.stream().filter(o -> null != o).sorted(Comparator.comparing(MesCimSeresSrmRunSheetJisDetail::getMaterielCode)).collect(Collectors.toList());
+            if (!CollectionUtils.isEmpty(sheetJisDetailList)) sheetJisDetailList = sheetJisDetailList.stream().filter(o ->
+                    (null != o && !StringUtils.isEmpty(o.getSerialNumber()))).sorted(Comparator.comparing(MesCimSeresSrmRunSheetJisDetail::getSerialNumber)).collect(Collectors.toList());
 
             Integer index = MesExtConstWords.ONE;
             for (MesCimSeresSrmRunSheetJisDetail cimSeresSrmRunSheetJisDetail : sheetJisDetailList) {
@@ -147,10 +148,7 @@ public class CqLxSortShippingPrintStrategyService extends SortShippingDispatchSt
         DdlPackBean packBean = DdlPackBean.getDdlPackBean(organizeCode);
         if (jisIdList.size() == 1) DdlPreparedPack.getNumEqualPack(jisIdList.get(0), MesExtConstWords.PID, packBean);
         else DdlPreparedPack.getInPackList(jisIdList, MesExtConstWords.PID, 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());
+        return cimSeresSrmRunSheetJisDetailRepository.findByHqlWhere(packBean);
     }
 
 }