fix:发送生产指示书时,附带项目号。

chenhang4442024
1 parent 5f019a15
Showing 5 changed files with 14 additions and 4 deletions
src/main/java/com/order/erp/common/utils/EasyPdfUtils.java
src/main/java/com/order/erp/common/utils/EmailSendUtils.java
src/main/java/com/order/erp/domain/EmailTemplateEnum.java
src/main/java/com/order/erp/domain/vo/ProducePdfVO.java
src/main/java/com/order/erp/service/order/impl/OrderBaseInfoServiceImpl.java
@@ -120,6 +120,11 @@ public class EasyPdfUtils {
         producePdfVO.setProductionDepartment(productionDepartments.iterator().next());
         Optional<List<String>> firstElementFromSet1 = pdfVOList.stream().findFirst().map(OrderProducePdfVO::getPersonList);
         List<String> personList = firstElementFromSet1.orElse(Collections.emptyList());
+        List<String> uniqueProjectNos = pdfVOList.stream()
+                .map(OrderProducePdfVO::getProjectNo) // 提取 projectNo
+                .distinct() // 去重
+                .collect(Collectors.toList()); // 收集到 List
+        producePdfVO.setProjects(uniqueProjectNos);
         producePdfVO.setPersonList(personList);
         return producePdfVO;
     }
@@ -141,11 +141,12 @@ public class EmailSendUtils {
      * @param emailTemplateEnum  邮件事件类型
      * @param receiveemailList   收件人邮箱
      * @param    pdfFile         pdf文件
+     * @param  projects 项目号
      * @throws MessagingException
      * @throws IOException
      */
     //生产指示书以附件方式发送。
-    public  void sendEmail(EmailTemplateEnum emailTemplateEnum, List<String> receiveemailList, File pdfFile) {
+    public  void sendEmail(EmailTemplateEnum emailTemplateEnum, List<String> receiveemailList, File pdfFile,String projects) {
         if (CollectionUtils.isEmpty(receiveemailList) && emailTemplateEnum == null && ObjectUtils.isNull(pdfFile)) {
             throw new BusinessException(ServerResultCode.PARAM_ERROR);
         }
@@ -161,7 +162,7 @@ public class EmailSendUtils {
             helper.setFrom(sendEmail);
             helper.setTo(receiveemailListArray);
             helper.setSentDate(new Date());
-            helper.setText(emailTemplateEnum.getContent());
+            helper.setText(emailTemplateEnum.getContent()+projects);
             helper.addAttachment(pdfFile.getName(), pdfFile);
         } catch (MessagingException e) {
             throw new RuntimeException("邮件发送失败！");
@@ -31,7 +31,7 @@ public enum EmailTemplateEnum {
     END_CHECK_REPORT_TEMPLATE("尾期验货报告", "您好，请查收尾期验货报告 项目号为: ", 9L),
-    PRODUCE_INDICATE_REPORT("生产指示书","你好，请查收附件生产订单",10L),
+    PRODUCE_INDICATE_REPORT("生产指示书","你好，请查收附件生产订单 项目号为： ",10L),
     PRODUCE_IDEA("产品意见信息","你好，请查收产品意见信息 项目号为: ",11L),
@@ -26,4 +26,8 @@ public class ProducePdfVO {
     private Boolean isSend;
     private List<String> personList;
     private Boolean isTrue;
+    /**
+     * 项目号
+     * */
+    private List<String> projects;
 }
@@ -2641,7 +2641,7 @@ end
                     InputStream inputStream = url1.openStream();
                     File file = FileUtil.inputStreamToFile(inputStream, "生产指示书_" + System.currentTimeMillis() + ".pdf");
                     try {
-                        emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_INDICATE_REPORT, emails, file);
+                        emailSendUtils.sendEmail(EmailTemplateEnum.PRODUCE_INDICATE_REPORT, emails, file,String.join(",", producePdfVO.getProjects()));
                     } finally {
                         if (file.exists()) {
                             file.delete();