From f840d1e13de73bfa18ea1fd63301556a2fc843db Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Wed, 21 Mar 2018 23:18:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs b/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs
index 05c86a1..b32f9d4 100644
--- a/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs
+++ b/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs
@@ -29,7 +29,7 @@ namespace BWP.Web.Pages.WeixinMessage_
     <h1>{title}</h1>
     <section>
         <table border=""1"" cellspacing=""0"">
-        <tr><td>会计单位</td><td>{AccountingUnit_ID}</td><td>发货时间</td><td>{LoadTime}</td></tr>
+        <tr><td>会计单位</td><td>{AccountingUnit_Name}</td><td>发货时间</td><td>{LoadTime}</td></tr>
         <tr><td>销售出库报价数量合计</td><td>{AcceptNumber}</td><td>销售出库金额</td><td>{Money}</td></tr>
         <tr><td>送货员</td><td>{Deliveryman_Name}</td><td>车牌号</td><td>{Car_Name}</td></tr>
         <tr><td>运费金额</td><td>{FreightPrice}</td><td>客户</td><td>{Customer_Name}</td></tr>
@@ -42,7 +42,7 @@ namespace BWP.Web.Pages.WeixinMessage_
 </article>
 ";
       html = html.Replace("{title}", mMessage.Title);
-      html = html.Replace("{AccountingUnit_ID}", cusAccept.AccountingUnit_ID == null ? "" : cusAccept.AccountingUnit_ID.Value.ToString()).Replace("{LoadTime}", cusAccept.LoadTime == null ? "" : cusAccept.LoadTime.Value.ToString()).Replace("{AcceptNumber}", cusAccept.AcceptNumber == null ? "" : cusAccept.AcceptNumber.Value.ToString()).Replace("{Money}", cusAccept.Money == null ? string.Empty : cusAccept.Money.Value.ToString()).Replace("{Deliveryman_Name}", cusAccept.Deliveryman_Name).Replace("{Car_Name}", cusAccept.Car_Name).Replace("{FreightPrice}", cusAccept.FreightPrice == null ? string.Empty : cusAccept.FreightPrice.Value.ToString()).Replace("{Customer_Name}", cusAccept.Customer_Name);
+      html = html.Replace("{AccountingUnit_Name}", cusAccept.AccountingUnit_Name).Replace("{LoadTime}", cusAccept.LoadTime == null ? "" : cusAccept.LoadTime.Value.ToString()).Replace("{AcceptNumber}", cusAccept.AcceptNumber == null ? "" : cusAccept.AcceptNumber.Value.ToString()).Replace("{Money}", cusAccept.Money == null ? string.Empty : cusAccept.Money.Value.ToString()).Replace("{Deliveryman_Name}", cusAccept.Deliveryman_Name).Replace("{Car_Name}", cusAccept.Car_Name).Replace("{FreightPrice}", cusAccept.FreightPrice == null ? string.Empty : cusAccept.FreightPrice.Value.ToString()).Replace("{Customer_Name}", cusAccept.Customer_Name);
       if (cusAccept.Details.Count() > 0) {
         var str = new StringBuilder();
         foreach (var detail in cusAccept.Details) {
@@ -57,7 +57,7 @@ namespace BWP.Web.Pages.WeixinMessage_
           str.Append(detail.AcceptNum);
           str.Append("</td>");
           str.Append("<td>");
-          str.Append(detail.Money);
+          str.Append(detail.AcceptMoney);
           str.Append("</td>");
           str.Append("<td>");
           str.Append(detail.Unit);