|
@@ -3734,6 +3734,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
// 如果是物流企业,只能看到自己物流企业的原矿订单
|
|
// 如果是物流企业,只能看到自己物流企业的原矿订单
|
|
|
List<KwtLogisticsOrderUnit> logisticsOrderUnits = kwtLogisticsOrderUnitRepository.queryByEntIdAndUnitType(entId, 2);
|
|
List<KwtLogisticsOrderUnit> logisticsOrderUnits = kwtLogisticsOrderUnitRepository.queryByEntIdAndUnitType(entId, 2);
|
|
|
Set<Long> logUnitOrderIds = logisticsOrderUnits.stream().map(KwtLogisticsOrderUnit::getLOrderId).collect(Collectors.toSet());
|
|
Set<Long> logUnitOrderIds = logisticsOrderUnits.stream().map(KwtLogisticsOrderUnit::getLOrderId).collect(Collectors.toSet());
|
|
|
|
|
+ log.debug("物流企业物流订单: {}", JSON.toJSONString(logUnitOrderIds));
|
|
|
intersectLogOrderIds(logOrderIds, logUnitOrderIds);
|
|
intersectLogOrderIds(logOrderIds, logUnitOrderIds);
|
|
|
} else {
|
|
} else {
|
|
|
// 查询原矿订单
|
|
// 查询原矿订单
|
|
@@ -3742,6 +3743,7 @@ public class KwtWaybillOrderV1Service {
|
|
|
return logOrderIds;
|
|
return logOrderIds;
|
|
|
}
|
|
}
|
|
|
Set<Long> logisticsOrder = logisticsOrderList.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toSet());
|
|
Set<Long> logisticsOrder = logisticsOrderList.stream().map(KwtLogisticsOrder::getId).collect(Collectors.toSet());
|
|
|
|
|
+ log.debug("非物流企业原矿物流订单: {}", JSON.toJSONString(logisticsOrder));
|
|
|
intersectLogOrderIds(logOrderIds, logisticsOrder);
|
|
intersectLogOrderIds(logOrderIds, logisticsOrder);
|
|
|
}
|
|
}
|
|
|
|
|
|