canrd-outside / order-erp · Commits

Commit 4b775a87462d7f111ba89756288c7565c18150f1

Authored by chenhang4442024
1 parent 11e5250e
build: skipped

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

2.业务研发的明细表在导出时,设置导出数量大一点。
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
  View file @4b775a8
... ... @@ -312,7 +312,7 @@ public class OrderOverTimeEventJob {
312 312 //如果包含"-",则去掉。 A04没有处理,然后A06,A09,A08,对于返单数据,只写了订舱和包材事件,对于返单的内销是否需要订舱和包材。
313 313 String simpleCustomerCode = eventJobVO.getBaseInfo().getCustomerCode().substring(0, 3);
314 314 //把返单和不是返单分别区分。
315   - if(StringUtils.isEmpty(eventJobVO.getBaseInfo().getReturnOrder())){
  315 + if(StringUtils.isEmpty(eventJobVO.getBaseInfo().getReturnOrder()) || eventJobVO.getBaseInfo().getCustomerCode().startsWith("A09-包扣")){
316 316 return map;
317 317 }else{
318 318 // 不是返单。
... ...
src/main/java/com/order/erp/service/order/impl/OrderCostInfoServiceImpl.java
  View file @4b775a8
... ... @@ -602,7 +602,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl<OrderCostInfoMapper, O
602 602 }
603 603 OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
604 604 .page(1)
605   - .pageSize(200); // 设置大一点，确保导出数据不遗漏
  605 + .pageSize(400); // 设置大一点，确保导出数据不遗漏
606 606  
607 607 // 根据传入条件设置筛选字段
608 608 if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
... ... @@ -652,7 +652,7 @@ public class OrderCostInfoServiceImpl extends ServiceImpl<OrderCostInfoMapper, O
652 652 OrderBaseInfoQueryVO.OrderBaseInfoQueryVOBuilder builder = OrderBaseInfoQueryVO.builder()
653 653 .productionDepartment(Collections.singletonList("内部"))
654 654 .page(1)
655   - .pageSize(200); //设置大一点，确保导出数据不遗漏
  655 + .pageSize(400); //设置大一点，确保导出数据不遗漏
656 656 if (CollectionUtils.isNotEmpty(queryVO.getOrderIds())) {
657 657 builder.orderIds(queryVO.getOrderIds());
658 658 } else {
... ...
src/main/java/com/order/erp/service/order/impl/ProjectBaseInfoServiceImpl.java
  View file @4b775a8
... ... @@ -1223,7 +1223,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl<ProjectBaseInfoMappe
1223 1223 @Override
1224 1224 public void exportBusinessProfitExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
1225 1225 //这里设置为100是故意设置大一点,防止导出多条数据。
1226   - ServerResult serverResult =listBusinessProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(100).projectNo(queryVO.getDetailProjectNo()).build());
  1226 + ServerResult serverResult =listBusinessProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(400).projectNo(queryVO.getDetailProjectNo()).build());
1227 1227 Page<BusinessProfitInfoVO> page = (Page<BusinessProfitInfoVO>) serverResult.getData();
1228 1228 List<BusinessProfitInfoVO> businessProfitInfoVOS = page.getRecords();
1229 1229 if(CollectionUtils.isNotEmpty(businessProfitInfoVOS)){
... ... @@ -1244,7 +1244,7 @@ public class ProjectBaseInfoServiceImpl extends ServiceImpl&lt;ProjectBaseInfoMappe
1244 1244 @Override
1245 1245 public void exportInnerProfitInfoExcel(HttpServletResponse response, ProjectBaseInfoQueryVO queryVO) throws Exception {
1246 1246 //这里设置为100是故意设置大一点,防止导出多条数据。
1247   - ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(100).productionDepartment(Collections.singletonList("内部")).projectNo(queryVO.getDetailProjectNo()).build());
  1247 + ServerResult serverResult = listInnerProfitInfoByPage(OrderBaseInfoQueryVO.builder().page(1).pageSize(400).productionDepartment(Collections.singletonList("内部")).projectNo(queryVO.getDetailProjectNo()).build());
1248 1248 Page<InnerProfitInfoVO> page = (Page<InnerProfitInfoVO>) serverResult.getData();
1249 1249 List<InnerProfitInfoVO> profitInfoVOS = page.getRecords();
1250 1250 if(CollectionUtils.isNotEmpty(profitInfoVOS)){
... ...