2024-06-24

功能优化

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();