aps-生产计划跟踪报表

cx-aps/cx-aps-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ApsBlankOrderServiceImpl.java

@@ -568,7 +568,7 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
      */
     @Override
     public void blankOrderAps(List<ApsBlankOrderVo> apsBlankOrders) {
-        apsService.apsSchedule(apsBlankOrders,null,null);
+        apsService.apsSchedule(apsBlankOrders, null, null);
     }
 
     /**
@@ -2737,6 +2737,9 @@ public class ApsBlankOrderServiceImpl extends ServiceImpl<ApsBlankOrderDao, ApsB
 
         //分页查询结束，拼接结果字段信息
         List<ProductPlanReportVo> records = res.getRecords();
+        if (ObjectUtil.isEmpty(records)) {
+            return R.ok(res);
+        }
         //当前页面的坯料计划的ID集合
         List<String> blankIdList = records.stream().map(ProductPlanReportVo::getBlankId).distinct().collect(Collectors.toList());
         List<BlankIdAndWorkShopVo> blankIdAndWorkShopList = new LinkedList<>();