From b7687942ae3753bf655176347e8ef8870ecd15e1 Mon Sep 17 00:00:00 2001 From: duanluohua Date: Mon, 4 Dec 2017 14:02:39 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137534=20?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137550?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj | 6 ++ .../Pages/B3YunKen/Overlays/OrderEdit_Ext.cs | 2 - .../B3YunKen/Overlays/SaleForecastEdit_Ext.cs | 17 +++++ .../B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs | 67 +++++++++++++++++++ BWP.B3_YunKen.Web/PluginClass.cs | 4 ++ BWP.B3_YunKen/BWP.B3_YunKen.csproj | 10 +++ .../TypeIoc/SaleOutStoreFreightBearTypeIoc.cs | 15 +++++ 7 files changed, 119 insertions(+), 2 deletions(-) create mode 100644 BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs create mode 100644 BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs create mode 100644 BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj index 51ff1ab..1d93fdf 100644 --- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj +++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj @@ -79,6 +79,12 @@ ASPXCodeBehind + + ASPXCodeBehind + + + ASPXCodeBehind + ASPXCodeBehind diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs index e8cf97e..070e673 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/OrderEdit_Ext.cs @@ -22,8 +22,6 @@ namespace BWP.Web.Pages.B3YunKen.Overlays protected override void AddYunKenConfig(LayoutManager layOutManager, AutoLayoutConfig config) { - config.Add("FreightUnitPrice"); - config.Add("FreightPrice"); config.Add("FreightBear"); } diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs new file mode 100644 index 0000000..42d1add --- /dev/null +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleForecastEdit_Ext.cs @@ -0,0 +1,17 @@ +using BWP.Web.Pages.B3Sale.Bills.SaleForecast_; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BWP.Web.Layout; + +namespace BWP.Web.Pages.B3YunKen.Overlays +{ + public class SaleForecastEdit_Ext: SaleForecastEdit + { + protected override void AddYunKenFreightBearConfig(AutoLayoutConfig config) + { + config.AddAfter("FreightBear", "DeliverAddress"); + } + } +} diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs new file mode 100644 index 0000000..168acae --- /dev/null +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Overlays/SaleOutStoreEdit_Ext.cs @@ -0,0 +1,67 @@ +using BWP.Web.Pages.B3Sale.Bills.SaleOutStore_; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BWP.Web.Layout; +using TSingSoft.WebControls2; + +namespace BWP.Web.Pages.B3YunKen.Overlays +{ + public class SaleOutStoreEdit_Ext: SaleOutStoreEdit + { + protected override void AddCarDriverInfo(LayoutManager layoutManager, AutoLayoutConfig config) + { + layoutManager.Add("DriverIDCard", new DFChoiceBox(mDFInfo.Fields["DriverIDCard"])); + //layOutManager.Add("DriverCard",new DFTextBox()); + config.Add("DriverIDCard"); + config.Add("Driver_ID"); + config.Add("DriverCard"); + config.Add("DriverPhone"); + config.Add("Car_ID"); + config.Add("EngineNumber"); + config.Add("VinNO"); + config.Add("HandcarNumber"); + } + + protected override void AddYunKenConfig(LayoutManager layoutManager, AutoLayoutConfig config) + { + config.Add("FreightBear"); + config.Add("FreightPayment"); + } + + protected override void AddLayOutManagerScript(LayoutManager layoutPanel) + { + base.AddLayOutManagerScript(layoutPanel); + var idCard = layoutPanel.EnsureInputControlCreated("DriverIDCard");//司机身份证号下拉 + var carid = layoutPanel.EnsureInputControlCreated("Car_ID");//运输车辆下拉 + //选择司机身份证号带出驾驶证号和司机名字 + if (idCard != null) + { + idCard.OnClientSelected += @"var idCard = this.front.value; +simpleRestCall('/MainSystem/B3_YunKen/Rpcs/DriverRpc/GetDriverInfoByIDCard',[idCard], +function(result){ +if(result!=null){ +__DFContainer.getControl('Driver_ID').fill(result.ID,result.Name); +__DFContainer.setValue('DriverCard',result.DriverCard); +__DFContainer.setValue('DriverPhone',result.Telephone); +} +},{ });"; + } + //选择运输车辆带出发动机号、车架号、挂车车牌号 + if (carid != null) + { + carid.OnClientSelected += @"var carid = this.front.value; +simpleRestCall('/MainSystem/B3_YunKen/Rpcs/DriverRpc/GetCarInfoByCarID',[carid], +function(result){ +if(result!=null){ +__DFContainer.setValue('EngineNumber',result.EngineNumber); +__DFContainer.setValue('VinNO',result.VinNO); +__DFContainer.setValue('HandcarNumber',result.HandcarNumber); +} +},{ });"; + } + } + + } +} diff --git a/BWP.B3_YunKen.Web/PluginClass.cs b/BWP.B3_YunKen.Web/PluginClass.cs index f482a7a..78559e2 100644 --- a/BWP.B3_YunKen.Web/PluginClass.cs +++ b/BWP.B3_YunKen.Web/PluginClass.cs @@ -4,6 +4,8 @@ using BWP.B3UnitedInfos; using TSingSoft.WebPluginFramework.Pages; using BWP.Web.Pages.B3Sale.Bills.Order_; using BWP.Web.Pages.B3YunKen.Overlays; +using BWP.Web.Pages.B3Sale.Bills.SaleOutStore_; +using BWP.Web.Pages.B3Sale.Bills.SaleForecast_; namespace BWP.B3_YunKen.Web { @@ -18,6 +20,8 @@ namespace BWP.B3_YunKen.Web GlobalFlags.On(B3SaleConsts.Flags.DriverNameAllowSame); GlobalFlags.On(B3UnitedInfosConsts.GlobalFlags.库存支持品牌项); WpfPageFactory.RegisterPageOverlay(typeof(OrderEdit).FullName, typeof(OrderEdit_Ext).FullName); + WpfPageFactory.RegisterPageOverlay(typeof(SaleOutStoreEdit).FullName, typeof(SaleOutStoreEdit_Ext).FullName); + WpfPageFactory.RegisterPageOverlay(typeof(SaleForecastEdit).FullName, typeof(SaleForecastEdit_Ext).FullName); } public void OnUnitInit() diff --git a/BWP.B3_YunKen/BWP.B3_YunKen.csproj b/BWP.B3_YunKen/BWP.B3_YunKen.csproj index 22f0874..3987cdd 100644 --- a/BWP.B3_YunKen/BWP.B3_YunKen.csproj +++ b/BWP.B3_YunKen/BWP.B3_YunKen.csproj @@ -36,7 +36,16 @@ + + + False + ..\..\..\tsref\release\B3UnitedInfos.dll + + + False + ..\..\..\tsref\Debug\B3UnitedInfos.Web.dll + False @@ -57,6 +66,7 @@ + diff --git a/BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs b/BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs new file mode 100644 index 0000000..0dac7fe --- /dev/null +++ b/BWP.B3_YunKen/TypeIoc/SaleOutStoreFreightBearTypeIoc.cs @@ -0,0 +1,15 @@ +using BWP.B3Sale.BL; +using BWP.B3Sale.BO; +using BWP.B3Frameworks; + +namespace BWP.B3_YunKen.TypeIoc +{ + [TypeIOC(typeof(OrderBL), typeof(OrderBL.ISaleOutStoreFreightBearTypeIoc))] + public class SaleOutStoreFreightBearTypeIoc : OrderBL.ISaleOutStoreFreightBearTypeIoc + { + public void GetFreightBear(Order order, SaleOutStore outstore) + { + outstore.FreightBear=order.FreightBear; + } + } +}