Commit 5befd34eda2c04e88e41ec057bade96f38189da1
1 parent
c76b9e38
fix:1.A06,A09对于返回内销订单不在进行任何邮件通知。
2.修复当未发送生产指示书时,修改生产要求会发送邮件给生产科。现在逻辑为当利润信息没有填写,修改生产要求不会发送邮件提醒生产科,只有利润信息没有问题时修改生产要求会发送邮件给生产科。
Showing
2 changed files
with
11 additions
and
2 deletions
src/main/java/com/order/erp/job/OrderOverTimeEventJob.java
| @@ -432,7 +432,7 @@ public class OrderOverTimeEventJob { | @@ -432,7 +432,7 @@ public class OrderOverTimeEventJob { | ||
| 432 | map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO); | 432 | map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO); |
| 433 | } | 433 | } |
| 434 | } | 434 | } |
| 435 | - }else if("A06".equals(simpleCustomerCode) || "A09".equals(simpleCustomerCode) || "A04".equals(simpleCustomerCode)){ | 435 | + }else if( "A04".equals(simpleCustomerCode)){ |
| 436 | if (filterLatestDCEvent(eventJobVO)) { | 436 | if (filterLatestDCEvent(eventJobVO)) { |
| 437 | map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO); | 437 | map.put(OrderEventEnum.LATEST_DC_EVENT.getEvent(), eventJobVO); |
| 438 | } | 438 | } |
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
| @@ -2872,9 +2872,18 @@ end | @@ -2872,9 +2872,18 @@ end | ||
| 2872 | } | 2872 | } |
| 2873 | 2873 | ||
| 2874 | private void sendProductionCommentEmail(OrderBaseInfoDO orderBaseInfoDo, String productionComment,String lastString) { | 2874 | private void sendProductionCommentEmail(OrderBaseInfoDO orderBaseInfoDo, String productionComment,String lastString) { |
| 2875 | + List<String> userNames = new ArrayList<>(Arrays.asList(orderBaseInfoDo.getBusinessPerson(), orderBaseInfoDo.getCreateBy())); | ||
| 2876 | + //查询利润信息,如果利润信息有数据,就代表已经没问题了,发送邮件时就可以发送给生产科。如果没有数据,就不能发送数据给生产科。避免订单还没发送生产指示书给生产科就已经发送信息给生产科了。 | ||
| 2877 | + OrderProfitAnalysisDO profitAnalysisDO = profitAnalysisService.getOne(new LambdaQueryWrapper<OrderProfitAnalysisDO>() | ||
| 2878 | + .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) | ||
| 2879 | + .eq(OrderProfitAnalysisDO::getOrderId, orderBaseInfoDo.getId()) | ||
| 2880 | + .last("limit 1")); | ||
| 2881 | + if(Objects.nonNull(profitAnalysisDO)){ | ||
| 2882 | + userNames.add(orderBaseInfoDo.getProductionDepartment()); | ||
| 2883 | + } | ||
| 2875 | List<AdminUserDO> adminList = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>() | 2884 | List<AdminUserDO> adminList = adminUserService.list(new LambdaQueryWrapper<AdminUserDO>() |
| 2876 | .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) | 2885 | .eq(BaseDO::getEnableFlag, Constant.ENABLE_TEN) |
| 2877 | - .in(AdminUserDO::getUserName, Arrays.asList(orderBaseInfoDo.getBusinessPerson(), orderBaseInfoDo.getCreateBy(), orderBaseInfoDo.getProductionDepartment()))); | 2886 | + .in(AdminUserDO::getUserName, userNames)); |
| 2878 | if (CollectionUtils.isNotEmpty(adminList)) { | 2887 | if (CollectionUtils.isNotEmpty(adminList)) { |
| 2879 | List<String> emailsList = adminList.stream().filter(Objects::nonNull).map(AdminUserDO::getEmail).filter(Objects::nonNull).collect(Collectors.toList()); | 2888 | List<String> emailsList = adminList.stream().filter(Objects::nonNull).map(AdminUserDO::getEmail).filter(Objects::nonNull).collect(Collectors.toList()); |
| 2880 | if (CollectionUtils.isNotEmpty(emailsList)) { | 2889 | if (CollectionUtils.isNotEmpty(emailsList)) { |