修复看板bug

sd-business/src/main/java/com/sd/business/service/board/impl/DailyBoardServiceImpl.java

@@ -119,6 +119,9 @@ public class DailyBoardServiceImpl implements DailyBoardService {
         // 查询今日订单
         List<OrderInfo> orderInfoList = orderService.list(q -> q.eq(OrderInfo::getSource, 2)
                 .between(OrderInfo::getWlnCreateTime, beginDate, endDate));
+        if (ObjectUtil.isEmpty(orderInfoList)) {
+            return Collections.emptyList();
+        }
         // 查询今日生成完成任务
         Map<Long, List<ProductionTask>> taskMap = productionTaskService.mapKGroup(ProductionTask::getOrderId, q -> q.between(ProductionTask::getCompleteTime, beginDate, endDate));
         // 查询今日出库单出库数据
@@ -213,9 +216,10 @@ public class DailyBoardServiceImpl implements DailyBoardService {
         List<Long> orderIds = orderList.stream().map(BaseIdPo::getId).collect(Collectors.toList());
         List<OrderSku> orderSkuList = orderSkuService.list(q -> q.in(OrderSku::getOrderId, orderIds));
         List<Long> skuSpecIds = orderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList());
-        Map<String, SkuSpec> skuSpecMap = skuSpecService.mapKEntity(SkuSpec::getCode, q -> q.in(SkuSpec::getId, skuSpecIds));
+        List<SkuSpec> skuSpecList = skuSpecService.list(q -> q.in(SkuSpec::getId, skuSpecIds));
+        Map<String, SkuSpec> skuSpecMap = skuSpecList.stream().collect(Collectors.toMap(SkuSpec::getCode, item -> item, (v1, v2) -> v2));
         // 获取今日订单bom列表
-        List<Long> bomSpecIds = orderSkuList.stream().map(OrderSku::getBomSpecId).collect(Collectors.toList());
+        List<Long> bomSpecIds = skuSpecList.stream().map(SkuSpec::getBomSpecId).collect(Collectors.toList());
         Map<Long, BomSpecBo> bomSpecBoMap = skuSpecService.getBomSpecBoByIdList(bomSpecIds);
 
         Map<Long, DailyBoardOutStorageBomVo> outStorageBomMap = new HashMap<>();

sd-business/src/main/java/com/sd/business/service/production/impl/ProductionTaskServiceImpl.java

@@ -159,7 +159,7 @@ public class ProductionTaskServiceImpl extends ServiceImpl<ProductionTaskMapper,
             }).collect(Collectors.toList());
             productionTaskList.addAll(taskList);
         }
-        if (ObjectUtil.isEmpty(productionTaskList)) {
+        if (ObjectUtil.isNotEmpty(productionTaskList)) {
             // 更新生产任务
             this.updateBatchById(productionTaskList);
         }