需求单No.139277

BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs

@@ -6,7 +6,9 @@ using System.Web.UI;
 using BWP.B3Frameworks.BO;
 using BWP.B3Frameworks.Utils;
 using BWP.B3Sale.BL;
+using BWP.B3Sale.BO;
 using Forks.EnterpriseServices.BusinessInterfaces;
+using Forks.EnterpriseServices.DomainObjects2;
 
 namespace BWP.Web.Pages.WeixinMessage_
 {
@@ -23,26 +25,60 @@ namespace BWP.Web.Pages.WeixinMessage_
     {
       var bl = BIFactory.Create<ICustomerAcceptBL>();
       var cusAccept = bl.Load(mMessage.TargetID.Value);
+      var dmoTypeId = DmoTypeIDAttribute.GetID(typeof(SaleOutStore));
+      string outCode = string.Empty;
+      string dealer = string.Empty;
+      string handcarNumber = string.Empty;
+      string freightUnitPrice = string.Empty;
+      string driver_Name = string.Empty;
+      string driverPhone = string.Empty;
+      string allUnitNum = string.Empty;
+      string money = string.Empty;
+      string freightPrice = string.Empty;
+      if (cusAccept.BillType == dmoTypeId && cusAccept.BillID != null) {
+        var outbl = BIFactory.Create<ISaleOutStoreBL>();
+        var saleOutStore = outbl.Load(cusAccept.BillID.Value);
+        outCode = saleOutStore.Code;
+        dealer = saleOutStore.CustomerDealer_Name;
+        handcarNumber = saleOutStore.HandcarNumber;
+        freightUnitPrice = saleOutStore.FreightUnitPrice==null?string.Empty:saleOutStore.FreightUnitPrice.ToString();
+        driver_Name = saleOutStore.Driver_Name;
+        driverPhone = saleOutStore.DriverPhone;
+        allUnitNum = saleOutStore.AllUnitNum == null ? string.Empty : saleOutStore.AllUnitNum.ToString();
+        money = saleOutStore.Money == null ? string.Empty : saleOutStore.Money.ToString();
+        freightPrice = saleOutStore.FreightPrice == null ? string.Empty : saleOutStore.FreightPrice.ToString();
+      }
+      var checkTime = cusAccept.CheckTime == null ? "" : cusAccept.CheckTime.Value.ToString();
+      var acceptNumber = cusAccept.AcceptNumber==null?string.Empty:cusAccept.AcceptNumber.ToString();
+      var acceptFreightUnitPrice = cusAccept.FreightUnitPrice==null?string.Empty:cusAccept.FreightUnitPrice.ToString();
+      var acceptMoney = cusAccept.Money==null?string.Empty:cusAccept.Money.ToString();
+      var acceptFreightPrice = cusAccept.FreightPrice==null?string.Empty:cusAccept.FreightPrice.ToString();
 
       var html = @"
 <article class=""weui-article"">
     <h1>{title}</h1>
     <section>
         <table border=""1"" cellspacing=""0"">
-        <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>
+        <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"">{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>
     <table border=""1"" cellspacing=""0"" style=""margin-top:10px;"">
-        <tr><th>存货</th><th>规格</th><th>验收数量</th><th>验收金额</th><th>主单位</th><th>辅单位</th><th>品牌项</th><th>备注</th></tr>
+        <tr><td colspan=""3"">分销商发货明细</td><td>单号</td><td colspan=""2"">{AcceptCode}</td></tr>
+        <tr><td>客户名称</td><td colspan=""5"">{AcceptCode}</td></tr>
+        <tr><th>名称</th><th>品牌</th><th>件数</th><th>单价</th><th>重量</th><th>金额</th></tr>
 {trs}
+<tr><td>总数量</td><td colspan=""2"">{AcceptNumber}</td><td>运费单价</td><td colspan=""2"">{AcceptFreightUnitPrice}</td></tr>
+<tr><td>总金额</td><td colspan=""2"">{AcceptMoney}</td><td>运费金额</td><td colspan=""2"">{AcceptFreightPrice}</td></tr>
     </table>
     </section>
 </article>
 ";
       html = html.Replace("{title}", mMessage.Title);
-      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);
+      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);
       if (cusAccept.Details.Count() > 0) {
         var str = new StringBuilder();
         foreach (var detail in cusAccept.Details) {
@@ -51,25 +87,19 @@ namespace BWP.Web.Pages.WeixinMessage_
           str.Append(detail.Goods_Name);
           str.Append("</td>");
           str.Append("<td>");
-          str.Append(detail.Goods_Spec);
-          str.Append("</td>");
-          str.Append("<td>");
-          str.Append(detail.AcceptNum);
-          str.Append("</td>");
-          str.Append("<td>");
-          str.Append(detail.AcceptMoney);
+          str.Append(detail.BrandItem_Name);
           str.Append("</td>");
           str.Append("<td>");
-          str.Append(detail.Unit);
+          str.Append(detail.AcceptSecondNumber);
           str.Append("</td>");
           str.Append("<td>");
-          str.Append(detail.Goods_SecondUnit);
+          str.Append(detail.Price);
           str.Append("</td>");
           str.Append("<td>");
-          str.Append(detail.BrandItem_Name);
+          str.Append(detail.AcceptNum);
           str.Append("</td>");
           str.Append("<td>");
-          str.Append(detail.Remark);
+          str.Append(detail.AcceptMoney);
           str.Append("</td>");
           str.Append("</str>");
         }

BWP.B3_YunKen/BLActions/CusrAcceptDoCheckSendWeixinMessage.cs

@@ -21,7 +21,7 @@ namespace BWP.B3_YunKen.BLActions
   {
     public string Description
     {
-      get { return "【客户验收】审核时发送微信消息给｛客户｝和｛销售人员｝"; }
+      get { return "【客户验收】审核时发送微信消息给｛客户｝、｛销售人员｝、｛经销商｝"; }
     }
 
     public void Execute(IDmoContext context, object customer, object parameter)
@@ -29,15 +29,28 @@ namespace BWP.B3_YunKen.BLActions
       var dmo = customer as CustomerAccept;
       if (dmo == null)
         return;
+      if (parameter == null)
+        throw new ApplicationException("请配置接收消息的角色");
       string empUserName;
       string cusUserName;
-      if (dmo.Employee_ID != null) {
-        empUserName = InnerBLUtil.GetDmoProperty<Employee, string>(context.Session, "User_Name", new Tuple<string, object>("ID", dmo.Employee_ID));
-        InsertExternalMessage(dmo, empUserName, context);
+      var roles = parameter.ToString().Split(',');
+      if (roles.Contains("销售人员")) {
+        if (dmo.Employee_ID != null) {
+          empUserName = InnerBLUtil.GetDmoProperty<Employee, string>(context.Session, "User_Name", new Tuple<string, object>("ID", dmo.Employee_ID));
+          InsertExternalMessage(dmo, empUserName, context);
+        }
       }
-      if (dmo.Customer_ID != null) {
-        cusUserName = InnerBLUtil.GetDmoProperty<Customer, string>(context.Session, "User_Name", new Tuple<string, object>("ID", dmo.Customer_ID));
-        InsertExternalMessage(dmo, cusUserName, context);
+      if (roles.Contains("客户")) {
+        if (dmo.Customer_ID != null) {
+          cusUserName = InnerBLUtil.GetDmoProperty<Customer, string>(context.Session, "User_Name", new Tuple<string, object>("ID", dmo.Customer_ID));
+          InsertExternalMessage(dmo, cusUserName, context);
+        }
+      }
+      if (roles.Contains("经销商")) {
+        if (dmo.CustomerDealer_ID != null) {
+          cusUserName = InnerBLUtil.GetDmoProperty<Customer, string>(context.Session, "User_Name", new Tuple<string, object>("ID", dmo.CustomerDealer_ID));
+          InsertExternalMessage(dmo, cusUserName, context);
+        }
       }
     }
 
@@ -67,7 +80,7 @@ namespace BWP.B3_YunKen.BLActions
 
     public string Name
     {
-      get { return "B3_YunKen.【客户验收】审核时发送微信消息给｛客户｝和｛销售人员｝"; }
+      get { return "B3_YunKen.【客户验收】审核时发送微信消息给｛客户｝、｛销售人员｝、｛经销商｝"; }
     }
   }
 }

BWP.B3_YunKen/TimerTask/NullifyCustomerTask.cs

@@ -58,7 +58,7 @@ namespace BWP.B3_YunKen.TimerTask {
       foreach (var tuple in list) {
         var span = DateTime.Today - tuple.Item2;
         if (span.Days >= Days)
-        {
+        {          
           var cus = cusBL.Load(tuple.Item1);
           cus.StopedByCustomerTask = true;
           cus.StopReason = Days + "天内未发货";