diff --git a/BWP.B3_YunKen.Web/Pages/TypeIOCs/GoodsApplyBasePropertiesIOC.cs b/BWP.B3_YunKen.Web/Pages/TypeIOCs/GoodsApplyBasePropertiesIOC.cs index 981a878..bfd95d6 100644 --- a/BWP.B3_YunKen.Web/Pages/TypeIOCs/GoodsApplyBasePropertiesIOC.cs +++ b/BWP.B3_YunKen.Web/Pages/TypeIOCs/GoodsApplyBasePropertiesIOC.cs @@ -4,6 +4,7 @@ using System.Linq; using System.Text; using BWP.B3Frameworks; using BWP.Web.Pages.B3Sale.Bills.GoodsApply_; +using TSingSoft.WebControls2; namespace BWP.Web.Pages.TypeIOCs { @@ -12,6 +13,8 @@ namespace BWP.Web.Pages.TypeIOCs { public void Invoke(System.Web.UI.Page page, Web.Layout.LayoutManager manager, Web.Layout.AutoLayoutConfig config, Web.CustomPageLayout.PageLayoutSection section) { + var mainUnit = new DFMemoInfo { Width = 500 }; + manager.Add("MainUnit", mainUnit); config.AddBefore("IsStandard", "Remark"); config.AddAfter("StandardGoods_ID", "IsStandard"); config.AddAfter("Diff", "StandardGoods_ID"); diff --git a/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs b/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs index f23edfb..c84da51 100644 --- a/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs +++ b/BWP.B3_YunKen.Web/Pages/WeixinMessage_/CusAcceptWeixinMessageTemplate.cs @@ -97,7 +97,7 @@ namespace BWP.Web.Pages.WeixinMessage_ 客户经理{Employee_Name}联系电话{Tel} 温馨提示:如您对货单有疑问,请联系客户经理,谢谢! 分销商发货明细单号{AcceptCode} - 客户名称{AccountCustomer_Name} + 客户名称{Customer_Name} 名称品牌件数单价重量金额 {trs} 总数量{AcceptNumber}运费单价{AcceptFreightUnitPrice} @@ -107,7 +107,7 @@ namespace BWP.Web.Pages.WeixinMessage_ "; 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("{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("{AccountCustomer_Name}", cusAccept.AccountCustomer_Name).Replace("{AcceptNumber}", acceptNumber).Replace("{AcceptFreightUnitPrice}", acceptFreightUnitPrice).Replace("{AcceptMoney}", acceptMoney).Replace("{AcceptFreightPrice}", acceptFreightPrice).Replace("{Employee_Name}", employee_Name).Replace("{Tel}", tel); + 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("{Customer_Name}", cusAccept.Customer_Name).Replace("{AcceptNumber}", acceptNumber).Replace("{AcceptFreightUnitPrice}", acceptFreightUnitPrice).Replace("{AcceptMoney}", acceptMoney).Replace("{AcceptFreightPrice}", acceptFreightPrice).Replace("{Employee_Name}", employee_Name).Replace("{Tel}", tel); if (cusAccept.Details.Count() > 0) { var str = new StringBuilder(); foreach (var detail in cusAccept.Details) { diff --git a/BWP.B3_YunKen/BLActions/CusrAcceptDoCheckSendWeixinMessage.cs b/BWP.B3_YunKen/BLActions/CusrAcceptDoCheckSendWeixinMessage.cs index 231b44c..ecfed6a 100644 --- a/BWP.B3_YunKen/BLActions/CusrAcceptDoCheckSendWeixinMessage.cs +++ b/BWP.B3_YunKen/BLActions/CusrAcceptDoCheckSendWeixinMessage.cs @@ -79,7 +79,7 @@ namespace BWP.B3_YunKen.BLActions // customerDealer_Name = accept.CustomerDealer_Name; // } //} - var str = "发货工厂:" + accept.AccountingUnit_Name + " 发货时间:" + accept.CheckTime != null ? accept.CheckTime.Value.ToString() : string.Empty + " 客户名称:"+accept.CustomerDealer_Name+" 分销商:"+accept.AccountCustomer_Name+" 客户验收单号:"+accept.Code; + var str = "发货工厂:" + accept.AccountingUnit_Name + " 发货时间:" + accept.CheckTime != null ? accept.CheckTime.Value.ToString() : string.Empty + " 客户名称:"+accept.CustomerDealer_Name+" 分销商:"+accept.Customer_Name+" 客户验收单号:"+accept.Code; externalMessage.Content = str; externalMessageBL.Insert(externalMessage); }