canrd-outside / order-erp · Commits

Commit 8ed87562326b7fa5e6cbd90ee04d3e082b0c0466

Authored by chenhang4442024
1 parent de5b3917
build: skipped

fix:修改A01的订舱提醒时间,并且取消是否填写都会发送邮件提醒的设置,填写完就不需要邮件提醒。

Inline Side-by-side
Showing 2 changed files with 8 additions and 4 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
  View file @8ed8756
... ... @@ -614,11 +614,11 @@ public class OrderOverTimeEventJob {
614 614 String orderHodTime = eventJobVO.getBaseInfo().getOrderHodTime();
615 615 LocalDate today = LocalDate.now();
616 616 LocalDate localDate = DateUtils.parseDate(orderHodTime);
617   - //对于A01的订单,最晚订舱日期要为12天或者6天,海运为12天,空运为6天,其他的订单为10天。 对于A01来说,不管你填写没有,也要提醒,即使你填写了,也要提醒。
  617 + //对于A01的订单,最晚订舱日期要为12天或者6天,海运为12天[后续改为七天了],空运为6天[后续改为七天了],其他的订单为10天。 对于A01来说,不管你填写没有,也要提醒,即使你填写了,也要提醒。
618 618 if(eventJobVO.getBaseInfo().getCustomerCode().contains("A01")){
619 619 //海运
620   - if("SEA".equals(eventJobVO.getBaseInfo().getOutboundType())){
621   - if(Constant.FOURTEEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
  620 + /* if("SEA".equals(eventJobVO.getBaseInfo().getOutboundType())){
  621 + if(Constant.SEVEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
622 622 return true;
623 623 }
624 624 }
... ... @@ -630,6 +630,10 @@ public class OrderOverTimeEventJob {
630 630 if(Constant.ENABLE_TEN ==(int) ChronoUnit.DAYS.between(today, localDate)){
631 631 return true;
632 632 }
  633 + }*/
  634 + //对于A01订单,就只需要提前七天提醒。
  635 + if ( Constant.SEVEN ==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(eventJobVO.getTrackStageInfo().getLatestBkTime())) {
  636 + return true;
633 637 }
634 638 }else{
635 639 if ( Constant.ENABLE_TEN ==(int) ChronoUnit.DAYS.between(today, localDate) && StringUtils.isBlank(eventJobVO.getTrackStageInfo().getLatestBkTime())) {
... ...
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
  View file @8ed8756
... ... @@ -2499,7 +2499,7 @@ end
2499 2499 .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN)
2500 2500 .in(OrderProfitAnalysisDO::getOrderId, producePdfVO.getIds()));
2501 2501 //必须要求每一个订单的利润分析信息都存在,才能生成生产指标书。
2502   - if (CollectionUtils.isEmpty(orderProfitAnalysisList) || producePdfVO.getIds().size() != orderProfitAnalysisList.size()) {
  2502 + if (CollectionUtils.isEmpty(orderProfitAnalysisList) || producePdfVO.getIds().size() <= orderProfitAnalysisList.size()) {
2503 2503 return ServerResult.fail("利润分析未填写,无法进行生成!");
2504 2504 }
2505 2505 List<OrderFieldLockApplyDO> orderFieldLockApplyDOS = orderFieldLockApplyService.list(new LambdaQueryWrapper<OrderFieldLockApplyDO>()
... ...