|
|
@@ -3741,30 +3741,6 @@ public class KwtWaybillOrderV1Service {
|
|
|
return new WaybillOrderNodeVo();
|
|
|
}
|
|
|
|
|
|
- // 查询运单子单信息,用于获取商品名称和重量
|
|
|
- Set<Long> subtaskIds = nodes.stream()
|
|
|
- .map(KwtWaybillOrderNode::getWSubtaskId)
|
|
|
- .collect(Collectors.toSet());
|
|
|
- List<KwtWaybillOrderSubtask> subtasks = kwtWaybillOrderSubtaskRepository.listByIds(subtaskIds);
|
|
|
- Map<Long, KwtWaybillOrderSubtask> subtaskMap = subtasks.stream()
|
|
|
- .collect(Collectors.toMap(KwtWaybillOrderSubtask::getId, Function.identity()));
|
|
|
-
|
|
|
- // 查询物流订单商品信息
|
|
|
- Set<Long> logisticsOrderIds = subtasks.stream()
|
|
|
- .map(KwtWaybillOrderSubtask::getLOrderId)
|
|
|
- .collect(Collectors.toSet());
|
|
|
- List<KwtLogisticsOrderGoods> goodsList = kwtLogisticsOrderGoodsRepository.queryByLogOrderIds(
|
|
|
- new ArrayList<>(logisticsOrderIds));
|
|
|
- Map<Long, KwtLogisticsOrderGoods> goodsMap = goodsList.stream()
|
|
|
- .collect(Collectors.toMap(KwtLogisticsOrderGoods::getLOrderId, Function.identity(), (k1, k2) -> k1));
|
|
|
-
|
|
|
-
|
|
|
- // 单位字典
|
|
|
-// Map<String, Map<String, String>> dict = remoteSystemService.queryDictByType(
|
|
|
-// List.of(DictTypeEnum.UNIT_TYPE.getType()));
|
|
|
-// Map<String, String> unitMap = CollectionUtils.isNotEmpty(dict) ?
|
|
|
-// dict.get(DictTypeEnum.UNIT_TYPE.getType()) : new HashMap<>(NumberConstant.SIXTEEN);
|
|
|
-
|
|
|
// 转换为VO对象
|
|
|
WaybillOrderNodeVo waybillOrderNodeVo = new WaybillOrderNodeVo();
|
|
|
//获取时间线
|