diff --git a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java
index c33f169f..446c1f38 100644
--- a/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java
+++ b/base-buildpackage/src/main/java/com/hzya/frame/plugin/sendEmail/service/impl/SendEmailServiceImpl.java
@@ -81,7 +81,7 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> i
             return BaseResult.getFailureMessageEntity("供应商邮箱为空，请检查");
         }
         String subject = null;
-        subject = mainData.getOrDefault("field0022","")+"采购订单";//供应商名称+采购
+        subject = mainData.getOrDefault("field0022","")+"采购订单"+mainData.getOrDefault("field0001","");//供应商名称+采购
 
         JSONArray detailArray = businessDataStr.getJSONArray("formson_1234");
         //组装发送数据
@@ -154,11 +154,11 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> i
             }
 
             if(attachments != null && attachments.size() > 0){
-                emailUtil.sendHtmlAndFileMessage("1",sendEmail,subject, htmls,attachments);
-                //emailUtil.sendHtmlAndFileMessage("2",sendEmail,subject, htmls,attachments);
+                //emailUtil.sendHtmlAndFileMessage("1",sendEmail,subject, htmls,attachments);
+                emailUtil.sendHtmlAndFileMessage("2",sendEmail,subject, htmls,attachments);
             }else {
-                emailUtil.sendHtmlMessage("1",sendEmail,subject, htmls);
-                //emailUtil.sendHtmlMessage("2",sendEmail,subject, htmls);
+                //emailUtil.sendHtmlMessage("1",sendEmail,subject, htmls);
+                emailUtil.sendHtmlMessage("2",sendEmail,subject, htmls);
             }
             return BaseResult.getSuccessMessageEntity("发送邮件成功");
         }catch (Exception e){
@@ -324,13 +324,13 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> i
         sb.append("        <tbody>");
         sb.append("            <tr>");
         sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">序号</th>");
-        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">编码</th>");
-        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">材料名称</th>");
-        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">规格型号</th>");
+        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">物资/服务编码</th>");
+        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">物资/服务名称</th>");
+        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">规格/描述</th>");
         sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">数量</th>");
         sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">品牌</th>");
-        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">含税单价</th>");
-        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">含税金额</th>");
+        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">含税单价(元)</th>");
+        sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">含税金额(元)</th>");
         sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">要求到货时间</th>");
         sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">技术要求</th>");
         sb.append("                <th style=\"padding: 12px 8px; text-align: center; border: 1px solid #ddd; font-size: 14px; background-color: #2980b9; color: white; font-weight: 600;\">税率</th>");
@@ -382,10 +382,10 @@ public class SendEmailServiceImpl extends BaseService<SendEmailEntity, String> i
         sb.append("        </tbody>");
         sb.append("    </table>");
         sb.append("<div>");
-        sb.append("订单说明： <br> ");
-        sb.append("1、对以上订单内容请在2个工作日内予以确认回复，并签注明确的交货日期，请务必盖章、签字回传；否则视同接受该订单。 <br> ");
-        sb.append("2、不同料号物资分开包装。并在外包装标贴我公司的物料编码。 <br> ");
-        sb.append("3、乙方在送货或发货时，送货单与货同行，并在送货单上填写订单物料编码、材料名称、规格型号、数量、箱数等。 <br> ");
+        sb.append("订单说明：<br> ");
+        sb.append("1、对以上订单内容请在2个工作日内予以确认回复，并签注明确的交货日期，请务必盖章、签字回传；否则视同接受该订单；<br> ");
+        sb.append("2、不同料号物资分开包装。并在外包装标注我公司的物资编码； <br> ");
+        sb.append("3、乙方在送货或发货时，送货单与货同行，并在送货单上填写订单物资编码、物资名称、规格/描述、数量、箱数等； <br> ");
         sb.append("4、对有RoHS、防静电等要求物资：要确保产品符合相关要求，并提供有效认证报告。 <br> ");
         // 闭合主容器div
         sb.append("</div>");