From a22e1ec3943e8715a79023c730405b35572f1036 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Mon, 24 Jun 2024 11:28:31 +0800
Subject: [PATCH] =?UTF-8?q?2024-06-24=20=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/service/Impl/QcServiceImpl.java        | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
index 8e616191..57207226 100644
--- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
+++ b/src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
@@ -2136,10 +2136,11 @@ public class QcServiceImpl implements QcService {
             List<Map<String, Object>> resultList = procedureDao.getProcedureData("Get_Email_push_template", params);
 
             //设置邮件内容
-            String text = "<!DOCTYPE>" +
-                    "<div>" +
-                    "检验单号："+ data.getInspectionNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
-                    "</div>";
+//            String text = "<!DOCTYPE>" +
+//                    "<div>" +
+//                    "检验单号："+ data.getInspectionNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
+//                    "</div>";
+            String text = resultList.toString();
             //发送邮件
             JavaMailSenderImpl sender = new JavaMailSenderImpl();
             MailSendAddressData mailSendData = qcMapper.getSendMailFromAddress();
@@ -4137,10 +4138,11 @@ public class QcServiceImpl implements QcService {
                 List<Map<String, Object>> resultList = procedureDao.getProcedureData("Get_Email_push_template", params);
 
                 //设置邮件内容
-                String text = "<!DOCTYPE>" +
-                        "<div>" +
-                        "单据号："+ data.getPoOrderNo() + "，行号：" + data.getPoItemNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，SKU：" + data.getSku() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
-                        "</div>";
+//                String text = "<!DOCTYPE>" +
+//                        "<div>" +
+//                        "单据号："+ data.getPoOrderNo() + "，行号：" + data.getPoItemNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，SKU：" + data.getSku() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
+//                        "</div>";
+                String text = resultList.toString();
                 //发送邮件
                 JavaMailSenderImpl sender = new JavaMailSenderImpl();
                 MailSendAddressData mailSendData = qcMapper.getSendMailFromAddress();