From 5bceccc47f1204a1612cddfe09d9d5bf31464b6c Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Tue, 10 Apr 2018 17:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139277?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj                | 4 +++-
 .../WeixinMessage_/CusAcceptWeixinMessageTemplate.cs      | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index 3e82776..579aa4e 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -256,7 +256,9 @@
     <EmbeddedResource Include="Pages\B3YunKen\Bill\PriceBill_DetailAdjust.xml" />
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="Pages\B3YunKen\Reports\DynamicPriceReport.xml" />
+    <EmbeddedResource Include="Pages\B3YunKen\Reports\DynamicPriceReport.xml">
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Pages\B3YunKen\Reports\ToFreightNetPriceReport2.xml">
diff --git a/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs b/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs
index 126ad76..eaea701 100644
--- a/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs
+++ b/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs
@@ -28,7 +28,7 @@ namespace BWP.Web.Pages.WeixinMessage_
       var dmoTypeId = DmoTypeIDAttribute.GetID(typeof(SaleOutStore));
       string outCode = string.Empty;
       string dealer = string.Empty;
-      string handcarNumber = string.Empty;
+      string car_Name = string.Empty;
       string freightUnitPrice = string.Empty;
       string driver_Name = string.Empty;
       string driverPhone = string.Empty;
@@ -40,7 +40,7 @@ namespace BWP.Web.Pages.WeixinMessage_
         var saleOutStore = outbl.Load(cusAccept.BillID.Value);
         outCode = saleOutStore.Code;
         dealer = saleOutStore.CustomerDealer_Name;
-        handcarNumber = saleOutStore.HandcarNumber;
+        car_Name = saleOutStore.Car_Name;
         freightUnitPrice = saleOutStore.FreightUnitPrice==null?string.Empty:saleOutStore.FreightUnitPrice.ToString();
         driver_Name = saleOutStore.Driver_Name;
         driverPhone = saleOutStore.DriverPhone;
@@ -62,7 +62,7 @@ namespace BWP.Web.Pages.WeixinMessage_
         <tr><td colspan=""3"">经销商发货信息</td><td>单号</td><td colspan=""2"">{OutCode}</td></tr>
         <tr><td>发货工厂</td><td colspan=""2"">{AccountingUnit_Name}</td><td>发货时间</td><td colspan=""2"">{CheckTime}</td></tr>
         <tr><td>客户名称</td><td colspan=""5"">{CustomerDealer_Name}</td></tr>
-        <tr><td>运输车号</td><td colspan=""2"">{HandcarNumber}</td><td>运费单价</td><td colspan=""2"">{FreightUnitPrice}</td></tr>
+        <tr><td>运输车号</td><td colspan=""2"">{Car_Name}</td><td>运费单价</td><td colspan=""2"">{FreightUnitPrice}</td></tr>
         <tr><td>司机姓名</td><td colspan=""2"">{Driver_Name}</td><td>司机电话</td><td colspan=""2"">{DriverPhone}</td></tr>
         <tr><td>总数量</td><td>{AllUnitNum}</td><td>总金额</td><td>{Money}</td><td>总运费</td><td>{FreightPrice}</td></tr>
     </table>
@@ -78,7 +78,7 @@ namespace BWP.Web.Pages.WeixinMessage_
 </article>
 ";
       html = html.Replace("{title}", mMessage.Title);
-      html = html.Replace("{OutCode}", outCode).Replace("{AccountingUnit_Name}", cusAccept.AccountingUnit_Name).Replace("{CheckTime}", checkTime).Replace("{CustomerDealer_Name}", dealer).Replace("{HandcarNumber}", handcarNumber).Replace("{FreightUnitPrice}", freightUnitPrice).Replace("{Driver_Name}", driver_Name).Replace("{DriverPhone}", driverPhone).Replace("{AllUnitNum}", allUnitNum).Replace("{Money}", money).Replace("{FreightPrice}", freightPrice).Replace("{AcceptCode}",cusAccept.Code).Replace("{AcceptNumber}", acceptNumber).Replace("{AcceptFreightUnitPrice}", acceptFreightUnitPrice).Replace("{AcceptMoney}", acceptMoney).Replace("{AcceptFreightPrice}", acceptFreightPrice);
+      html = html.Replace("{OutCode}", outCode).Replace("{AccountingUnit_Name}", cusAccept.AccountingUnit_Name).Replace("{CheckTime}", checkTime).Replace("{CustomerDealer_Name}", dealer).Replace("{Car_Name}", car_Name).Replace("{FreightUnitPrice}", freightUnitPrice).Replace("{Driver_Name}", driver_Name).Replace("{DriverPhone}", driverPhone).Replace("{AllUnitNum}", allUnitNum).Replace("{Money}", money).Replace("{FreightPrice}", freightPrice).Replace("{AcceptCode}", cusAccept.Code).Replace("{AcceptNumber}", acceptNumber).Replace("{AcceptFreightUnitPrice}", acceptFreightUnitPrice).Replace("{AcceptMoney}", acceptMoney).Replace("{AcceptFreightPrice}", acceptFreightPrice);
       if (cusAccept.Details.Count() > 0) {
         var str = new StringBuilder();
         foreach (var detail in cusAccept.Details) {