wilson
/
xujie-sys
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

2024-05-08 

功能优化
java8
fengyuan_yang 2 years ago
parent
dee4e7fc7c
commit
4634678e60
2 changed files with 87 additions and 9 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
  2. 84
      src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java

12
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java
View File

@ -1785,8 +1785,8 @@ public class EamServiceImpl implements EamService {
String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败,code = " + code + " !");
}
@ -1955,8 +1955,8 @@ public class EamServiceImpl implements EamService {
String content = feedBackData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + feedBackData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败,code = " + code + " !");
}
@ -2786,8 +2786,8 @@ public class EamServiceImpl implements EamService {
String content = inData.getObjectID() + "-" + deptData.get(0).getObjectDesc() + " 在 " + deptData.get(0).getLocationName() + " 发生了 " + inData.getFeedBackDesc() +" 故障，请及时处理！【齐克庞德】";
try {
// 发送短信
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", mobile, content, "");
//int code = SendMessageUtils.sendSMSGet("LKSDK0007685", "554958", "13592510225", content, "");
if (code <= 0) {
throw new RuntimeException("短信发送失败,code = " + code + " !");
}

84
src/main/java/com/xujie/sys/modules/pms/service/Impl/QcServiceImpl.java
View File

@ -2070,12 +2070,71 @@ public class QcServiceImpl implements QcService {
for (int i = 0; i < data.getItemList().size(); i++) {
qcMapper.updateFAIDetailedRecord(data.getItemList().get(i));
}
// 判断检验结论,不合格则发送邮件
if ("不合格".equals(data.getInspectionResult())) {
try { // 发送邮件
sendMail(data, "FAI");
} catch (Exception e) {
//logger.info(e.getMessage());
throw new RuntimeException(e);
}
}
// 修改子明细提交标识
//qcMapper.updateSubDetailedRecord(data);
// 修改明细信息
//qcMapper.saveDetailInformation(data);
}
/**
* 发送邮件
* @param data
* @param type
*/
public void sendMail(QcFAIRecordData data, String type) throws Exception {
// 获取数据库设置的邮件接收地址
MailAddressData qc = qcMapper.getSendMailAddress(data.getSite(), "qc");
List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList());
if (qc != null) {
//设置邮件内容
String text = "<!DOCTYPE>" +
"<div>" +
"检验单号："+ data.getInspectionNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
"</div>";
//发送邮件
JavaMailSenderImpl sender = new JavaMailSenderImpl();
MailSendAddressData mailSendData = qcMapper.getSendMailFromAddress();
sender.setHost(mailSendData.getHost());
sender.setPort(mailSendData.getPort());
sender.setUsername(mailSendData.getUsername());
sender.setPassword(mailSendData.getPassword());
sender.setDefaultEncoding("Utf-8");
Properties p = new Properties();
p.setProperty("mail.smtp.timeout", mailSendData.getTimeout());
p.setProperty("mail.smtp.auth", "false");
p.setProperty("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
sender.setJavaMailProperties(p);
MimeMessage mimeMessage = sender.createMimeMessage();
// 设置utf-8或GBK编码，否则邮件会有乱码
MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
messageHelper.setFrom(mailSendData.getEmailForm(), mailSendData.getPersonal());
//判断是否存在分号
if (qc.getMailAddress().contains(";")) {
String[] toAddress = qc.getMailAddress().split(";");
messageHelper.setTo(toAddress[0]);
String[] arr2 = new String[toAddress.length-1];
System.arraycopy(toAddress, 1, arr2, 0, toAddress.length-1);
messageHelper.setCc(arr2);
} else {
messageHelper.setTo(qc.getMailAddress());
}
messageHelper.setSubject(type + "质量检验结果"); //标题
messageHelper.setText(text, true);
sender.send(mimeMessage);
logger.info(type + "检验不合格通知邮件已发送!收件箱地址:"+qc.getMailAddress());
}
}
/**
* @description: 删除检验记录
* @author: fengyuan_yang
@ -2636,6 +2695,16 @@ public class QcServiceImpl implements QcService {
for (int i = 0; i < data.getItemList().size(); i++) {
qcMapper.updateFQCDetailedRecord(data.getItemList().get(i));
}
// 判断检验结论,不合格则发送邮件
if ("不合格".equals(data.getInspectionResult())) {
try { // 发送邮件
sendMail(data, "FQC");
} catch (Exception e) {
//logger.info(e.getMessage());
throw new RuntimeException(e);
}
}
}
/**
@ -3194,6 +3263,15 @@ public class QcServiceImpl implements QcService {
for (int i = 0; i < data.getItemList().size(); i++) {
qcMapper.updateIPQCDetailedRecord(data.getItemList().get(i));
}
// 判断检验结论,不合格则发送邮件
if ("不合格".equals(data.getInspectionResult())) {
try { // 发送邮件
sendMail(data, "IPQC");
} catch (Exception e) {
//logger.info(e.getMessage());
throw new RuntimeException(e);
}
}
}
/**
@ -3697,7 +3775,7 @@ public class QcServiceImpl implements QcService {
//设置邮件内容
String text = "<!DOCTYPE>" +
"<div>" +
"单据号："+ data.getPoOrderNo() + "，行号：" + data.getPoItemNo() + "，物料编码：" + data.getPartNo() + "，SKU：" + data.getSku() + "发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
"单据号："+ data.getPoOrderNo() + "，行号：" + data.getPoItemNo() + "，物料编码：" + data.getPartNo() + "，物料名称：" + data.getPartDesc() + "，SKU：" + data.getSku() + "，发生不合格，不合格项：" + collect + " (此邮件为自动提示发送,无需回复!)<br/><br/>" +
"</div>";
//发送邮件
JavaMailSenderImpl sender = new JavaMailSenderImpl();
@ -3717,13 +3795,13 @@ public class QcServiceImpl implements QcService {
MimeMessageHelper messageHelper = new MimeMessageHelper(mimeMessage, true, "UTF-8");
messageHelper.setFrom(mailSendData.getEmailForm(), mailSendData.getPersonal());
//判断是否存在分号
if(qc.getMailAddress().contains(";")){
if (qc.getMailAddress().contains(";")) {
String[] toAddress = qc.getMailAddress().split(";");
messageHelper.setTo(toAddress[0]);
String[] arr2 = new String[toAddress.length-1];
System.arraycopy(toAddress, 1, arr2, 0, toAddress.length-1);
messageHelper.setCc(arr2);
}else{
} else {
messageHelper.setTo(qc.getMailAddress());
}
messageHelper.setSubject("IQC"+"质量检验结果"); //标题

Write Preview
Loading…
Cancel
Save