diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj index fd64652..3a61a79 100644 --- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj +++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj @@ -140,6 +140,7 @@ ASPXCodeBehind + diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs index fa877e4..046b5ea 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs @@ -200,12 +200,21 @@ namespace BWP.Web.Pages.B3YunKen { hPanel.Add(new SimpleLabel("验收日期")); var dateInput = hPanel.Add(new DFDateInput()); dateInput.Value = BLContext.Today; - hPanel.Add(buildButton); + hPanel.Add(new SimpleLabel("发货时间")); + var loadTimeInput = hPanel.Add(new DFDateTimeInput()); + loadTimeInput.Value = BLContext.Now; + hPanel.Add(new SimpleLabel("订货时间")); + var orderTimeInput = hPanel.Add(new DFDateTimeInput()); + orderTimeInput.Value = BLContext.Now; + var hPanel2 = vPanel.Add(new HLayoutPanel()); + hPanel2.Add(new SimpleLabel("送货地址")); + var deliverAddressInput = hPanel2.Add(new DFTextBox() { Width=300}); + hPanel2.Add(buildButton); buildButton.Click += delegate { var ids = _grid.GetSelectedItems().Select(row => (long)row["ID"]); if (!ids.Any()) throw new ApplicationException("请选择单据!"); - BIFactory.Create().CreateCustomerAccept(ids, dateInput.Value); + BIFactory.Create().CreateCustomerAccept(ids, dateInput.Value, loadTimeInput.Value, orderTimeInput.Value, deliverAddressInput.Text); AspUtil.Alert(this, BIFactory.GetLastMessage()); _grid.DataBind(); }; diff --git a/BWP.B3_YunKen.Web/Pages/TypeIOCs/CustomerAcceptEditAddBasePropertiesIOC.cs b/BWP.B3_YunKen.Web/Pages/TypeIOCs/CustomerAcceptEditAddBasePropertiesIOC.cs new file mode 100644 index 0000000..2217228 --- /dev/null +++ b/BWP.B3_YunKen.Web/Pages/TypeIOCs/CustomerAcceptEditAddBasePropertiesIOC.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using BWP.B3Frameworks; +using BWP.Web.Pages.B3Sale.BaseInfos; +using BWP.Web.Pages.B3Sale.Bills.CustomerAccept_; +using BWP.Web.Pages.B3Sale.Bills.GoodsApply_; + +namespace BWP.Web.Pages.TypeIOCs +{ + [TypeIOC(typeof(CustomerAcceptEdit), typeof(CustomerAcceptEdit.BaseDmoEditPageIOCs.BeforeBasePropertiesApplyLayout))] + public class CustomerAcceptEditAddBasePropertiesIOC : CustomerAcceptEdit.BaseDmoEditPageIOCs.BeforeBasePropertiesApplyLayout + { + public void Invoke(System.Web.UI.Page page, Layout.LayoutManager manager, Layout.AutoLayoutConfig config, CustomPageLayout.PageLayoutSection section) + { + config.AddBefore("OrderDate", "Remark"); + config.AddAfter("LoadTime", "OrderDate"); + config.AddAfter("DeliverAddress", "LoadTime"); + config.AddAfter("CreditPolicy_ID", "DeliverAddress"); + } + } + +} diff --git a/BWP.B3_YunKen.Web/PluginClass.cs b/BWP.B3_YunKen.Web/PluginClass.cs index 23d605c..bf76eef 100644 --- a/BWP.B3_YunKen.Web/PluginClass.cs +++ b/BWP.B3_YunKen.Web/PluginClass.cs @@ -24,6 +24,7 @@ namespace BWP.B3_YunKen.Web GlobalFlags.On(B3SaleConsts.Flags.DriverNameAllowSame); GlobalFlags.On(B3UnitedInfosConsts.GlobalFlags.库存支持品牌项); //GlobalFlags.On(B3UnitedInfosConsts.GlobalFlags.产品线增加字段上级产品线); + GlobalFlags.On(B3SaleConsts.Flags.IsDisplayCustomerAcceptSourceBillInfo); 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);