|
@@ -123,8 +123,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
|
|
|
Map<Long, List<ProductionTask>> taskMap = productionTaskService.mapKGroup(ProductionTask::getOrderId, q -> q.between(ProductionTask::getCompleteTime, beginDate, endDate));
|
|
|
// 查询今日出库单出库数据
|
|
|
Map<String, List<OutboundOrder>> outboundOrderMap = outboundOrderService.mapKGroup(OutboundOrder::getOrderWlnCode,
|
|
|
- q -> q.between(OutboundOrder::getOutboundTime, beginDate, endDate)
|
|
|
- .groupBy(Arrays.asList(OutboundOrder::getCode, OutboundOrder::getOrderWlnCode, OutboundOrder::getSkuSpecCode, OutboundOrder::getStorageCode, OutboundOrder::getQuantity)));
|
|
|
+ q -> q.between(OutboundOrder::getOutboundTime, beginDate, endDate));
|
|
|
|
|
|
Set<String> orderWlnCodeSet = outboundOrderMap.keySet();
|
|
|
// 订单id
|
|
@@ -238,8 +237,7 @@ public class DailyBoardServiceImpl implements DailyBoardService {
|
|
|
|
|
|
// 查询今日出库单出库数据
|
|
|
Map<String, List<OutboundOrder>> outboundOrderMap = outboundOrderService.mapKGroup(OutboundOrder::getOrderWlnCode,
|
|
|
- q -> q.between(OutboundOrder::getOutboundTime, beginDate, endDate)
|
|
|
- .groupBy(Arrays.asList(OutboundOrder::getCode, OutboundOrder::getOrderWlnCode, OutboundOrder::getSkuSpecCode, OutboundOrder::getStorageCode, OutboundOrder::getQuantity)));
|
|
|
+ q -> q.between(OutboundOrder::getOutboundTime, beginDate, endDate));
|
|
|
if (ObjectUtil.isEmpty(outboundOrderMap)) {
|
|
|
return vo;
|
|
|
}
|