Browse Source

2025.1.26 文档收集、RFQ优化

java8
yuejiayang 12 months ago
parent
commit
810861d818
  1. 4
      src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java
  2. 14
      src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

4
src/main/java/com/xujie/sys/modules/auth/service/impl/AuthHistServiceImpl.java

@ -101,13 +101,13 @@ public class AuthHistServiceImpl extends ServiceImpl<AuthHistMapper, AuthHistDat
s.append("<ol>"); s.append("<ol>");
if (emailAddress.get(0).getRecordTypeDb().equals("1")){ if (emailAddress.get(0).getRecordTypeDb().equals("1")){
// 使用 <a> 标签创建可点击链接链接地址和文本均自定义 // 使用 <a> 标签创建可点击链接链接地址和文本均自定义
Link = "<a target='_blank' href='http://172.26.68.17:9001/#/auth-authQuote?quoteVersionNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
Link = "<a target='_blank' href='http://172.26.68.20:9001/#/auth-authQuote?quoteVersionNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
emailAddress.get(0).getOrderRef1() emailAddress.get(0).getOrderRef1()
+ "</a>"; + "</a>";
fromName = "报价单"; fromName = "报价单";
s.append("<li>有新的报价单待审批,请及时处理!报价单号:").append(Link).append("</li>"); s.append("<li>有新的报价单待审批,请及时处理!报价单号:").append(Link).append("</li>");
} else if (emailAddress.get(0).getRecordTypeDb().equals("2")) { } else if (emailAddress.get(0).getRecordTypeDb().equals("2")) {
Link = "<a target='_blank' href='http://172.26.68.17:9001/#/auth-authInquiry?rfqNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
Link = "<a target='_blank' href='http://172.26.68.20:9001/#/auth-authInquiry?rfqNo=" + emailAddress.get(0).getOrderRef1() + "'>" +
emailAddress.get(0).getOrderRef1() + "</a>"; emailAddress.get(0).getOrderRef1() + "</a>";
fromName = "询价申请单"; fromName = "询价申请单";
s.append("<li>有新的询价申请单待审批,请及时处理!询价申请单号:").append(Link).append("</li>"); s.append("<li>有新的询价申请单待审批,请及时处理!询价申请单号:").append(Link).append("</li>");

14
src/main/java/com/xujie/sys/modules/pms/service/Impl/EamProjectServiceImpl.java

@ -265,7 +265,7 @@ public class EamProjectServiceImpl implements EamProjectService {
EamProjectMapper.eamProjectPartInfoEdit(inData); EamProjectMapper.eamProjectPartInfoEdit(inData);
} }
if(inData.getStatus2() == "进行中") {
if(Objects.equals(inData.getStatus2(), "进行中")) {
try { try {
EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData(); EamProjectPartInfoData eamProjectPartInfoData = new EamProjectPartInfoData();
eamProjectPartInfoData.setProjectPartId(inData.getProjectPartId()); eamProjectPartInfoData.setProjectPartId(inData.getProjectPartId());
@ -570,7 +570,7 @@ public class EamProjectServiceImpl implements EamProjectService {
s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>"); s.append("<td style='border: 1px solid #dddddd; text-align: center; padding: 8px;'>").append(formatter.format(proofingInformationData.getDueDate())).append("</td>");
if (!Objects.equals(type, "项目物料立项")) { if (!Objects.equals(type, "项目物料立项")) {
// 使用 <a> 标签创建可点击链接链接地址和文本均自定义 // 使用 <a> 标签创建可点击链接链接地址和文本均自定义
String documentLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
String documentLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
+ proofingInformationData.getDocumentType() + "</a>"; + proofingInformationData.getDocumentType() + "</a>";
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(documentLink).append("</td>"); s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(documentLink).append("</td>");
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>"); s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>");
@ -589,7 +589,7 @@ public class EamProjectServiceImpl implements EamProjectService {
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'></td>"); s.append("<td style='border: 1px solid #dddddd; padding: 8px;'></td>");
if (!Objects.equals(type, "项目物料立项")) { if (!Objects.equals(type, "项目物料立项")) {
// 使用 <a> 标签创建可点击链接链接地址和文本均自定义 // 使用 <a> 标签创建可点击链接链接地址和文本均自定义
String documentLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
String documentLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
+ proofingInformationData.getDocumentType() + "</a>"; + proofingInformationData.getDocumentType() + "</a>";
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(documentLink).append("</td>"); s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(documentLink).append("</td>");
s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>"); s.append("<td style='border: 1px solid #dddddd; padding: 8px;'>").append(proofingInformationData.getUserDisplay()).append("</td>");
@ -721,7 +721,7 @@ public class EamProjectServiceImpl implements EamProjectService {
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
s.append("<ol>"); s.append("<ol>");
// 使用 <a> 标签创建可点击链接链接地址和文本均自定义 // 使用 <a> 标签创建可点击链接链接地址和文本均自定义
String projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + inData.getDocumentDefinitionListId() + "'>"
String projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + inData.getDocumentDefinitionListId() + "'>"
+ inData.getDocumentType() + "</a>"; + inData.getDocumentType() + "</a>";
if (inData.getProofingNo().equals("*")) { if (inData.getProofingNo().equals("*")) {
s.append("<li>请及时上传转量产阶段文档文件!<br></br>"); s.append("<li>请及时上传转量产阶段文档文件!<br></br>");
@ -789,7 +789,7 @@ public class EamProjectServiceImpl implements EamProjectService {
//List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList()); //List<String> collect = data.getItemList().stream().filter(a -> "N".equals(a.getItemResult())).map(QcFAIRecordData::getItemDesc).collect(Collectors.toList());
if (emailAddress != null) { if (emailAddress != null) {
// 使用 <a> 标签创建可点击链接链接地址和文本均自定义 // 使用 <a> 标签创建可点击链接链接地址和文本均自定义
String projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectPartInfo?projectPartId=" + inData.getProjectPartId() + "'>"
String projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectPartInfo?projectPartId=" + inData.getProjectPartId() + "'>"
+ inData.getTestPartNo() + "</a>"; + inData.getTestPartNo() + "</a>";
StringBuilder s = new StringBuilder(); StringBuilder s = new StringBuilder();
s.append("<ol>"); s.append("<ol>");
@ -1038,10 +1038,10 @@ public class EamProjectServiceImpl implements EamProjectService {
String projectPartLink = null; String projectPartLink = null;
if (proofingInformationData.getDocumentType().equals("打样单未完成") || proofingInformationData.getDocumentType().equals("生产文档未确认")) { if (proofingInformationData.getDocumentType().equals("打样单未完成") || proofingInformationData.getDocumentType().equals("生产文档未确认")) {
projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectPartInfo?projectPartId=" + proofingInformationData.getProjectPartId() + "'>"
projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectPartInfo?projectPartId=" + proofingInformationData.getProjectPartId() + "'>"
+ proofingInformationData.getDocumentType() + "</a>"; + proofingInformationData.getDocumentType() + "</a>";
} else { } else {
projectPartLink = "<a href='http://172.26.68.17:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
projectPartLink = "<a href='http://172.26.68.20:9001/#/eam-eamProjectInfoForUploads?flag=4&documentDefinitionListId=" + proofingInformationData.getDocumentDefinitionListId() + "'>"
+ proofingInformationData.getDocumentType() + "</a>"; + proofingInformationData.getDocumentType() + "</a>";
} }

Loading…
Cancel
Save