|
@@ -1054,7 +1054,11 @@ public class WaybillOrderService {
|
|
|
Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
|
|
Map<String, Map<String, String>> dictValueAndDictResDtoMap = remoteSystemService.queryDictByType(
|
|
|
Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
|
|
Arrays.asList(DictTypeEnum.PRODUCT_NAME_TYPE.getType(), DictTypeEnum.GOODS_SPEC.getType()));
|
|
|
|
|
|
|
|
- List<WaybillOrderStatusResp> orderList = records.stream().map(
|
|
|
|
|
|
|
+ List<KwtWaybillOrder> filteredRecords = records.stream()
|
|
|
|
|
+ .filter(record -> record.getLOrderId() != null && logOrderIdList.contains(record.getLOrderId()))
|
|
|
|
|
+ .collect(Collectors.toList());
|
|
|
|
|
+
|
|
|
|
|
+ List<WaybillOrderStatusResp> orderList = filteredRecords.stream().map(
|
|
|
billOrder -> {
|
|
billOrder -> {
|
|
|
return getWaybillOrderResp(billOrder, subtaskMap, logOrderMap, logOrderIdAndCirculateMap,
|
|
return getWaybillOrderResp(billOrder, subtaskMap, logOrderMap, logOrderIdAndCirculateMap,
|
|
|
logOrderIdAndGoodsMap, logOrderIdAndUnitMap, logOrderIdAndAddressMap, ticketMap,
|
|
logOrderIdAndGoodsMap, logOrderIdAndUnitMap, logOrderIdAndAddressMap, ticketMap,
|