fix:1.邮件逾期提醒时,对于A09-包扣的订单不需要任何提醒邮件。

2.业务研发的明细表在导出时,设置导出数量大一点。

fix:1.邮件逾期提醒时,对于A09-包扣的订单不需要任何提醒邮件。
2.业务研发的明细表在导出时,设置导出数量大一点。
chenhang4442024
1 parent 11e5250e
Showing 3 changed files with 5 additions and 5 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
@@ -312,7 +312,7 @@ public class OrderOverTimeEventJob {
             //如果包含"-",则去掉。     A04没有处理,然后A06,A09,A08,对于返单数据,只写了订舱和包材事件,对于返单的内销是否需要订舱和包材。
         String simpleCustomerCode = eventJobVO.getBaseInfo().getCustomerCode().substring(0, 3);
         //把返单和不是返单分别区分。
-        if(StringUtils.isEmpty(eventJobVO.getBaseInfo().getReturnOrder())){
+        if(StringUtils.isEmpty(eventJobVO.getBaseInfo().getReturnOrder())  || eventJobVO.getBaseInfo().getCustomerCode().startsWith("A09-包扣")){
             return map;
         }else{
             // 不是返单。
@@ -602,7 +602,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         }
         OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
                 .page(1)
-                .pageSize(200); // 设置大一点，确保导出数据不遗漏
+                .pageSize(400); // 设置大一点，确保导出数据不遗漏
         // 根据传入条件设置筛选字段
         if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
@@ -652,7 +652,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl&lt;OrderCostInfoMapper, O
         OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
                 .productionDepartment(Collections.singletonList("内部"))
                 .page(1)
-                .pageSize(200); //设置大一点，确保导出数据不遗漏
+                .pageSize(400); //设置大一点，确保导出数据不遗漏
         if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
             builder.orderIds(queryVO.getOrderIds());
         } else {
@@ -1223,7 +1223,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public void exportBusinessProfitExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
         //这里设置为100是故意设置大一点,防止导出多条数据。
-        ServerResult serverResult =listBusinessProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(100).projectNo(queryVO.getDetailProjectNo()).build());
+        ServerResult serverResult =listBusinessProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(400).projectNo(queryVO.getDetailProjectNo()).build());
         Page<BusinessProfitInfoVO> page = (Page<BusinessProfitInfoVO>) serverResult.getData();
         List<BusinessProfitInfoVO> businessProfitInfoVOS = page.getRecords();
         if(CollectionUtils.isNotEmpty(businessProfitInfoVOS)){
@@ -1244,7 +1244,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
     @Override
     public void exportInnerProfitInfoExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
         //这里设置为100是故意设置大一点,防止导出多条数据。
-        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(100).productionDepartment(Collections.singletonList("内部")).projectNo(queryVO.getDetailProjectNo()).build());
+        ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(400).productionDepartment(Collections.singletonList("内部")).projectNo(queryVO.getDetailProjectNo()).build());
         Page<InnerProfitInfoVO> page = (Page<InnerProfitInfoVO>) serverResult.getData();
         List<InnerProfitInfoVO> profitInfoVOS = page.getRecords();
         if(CollectionUtils.isNotEmpty(profitInfoVOS)){