From d76838d9f82583683cdab31f74473143c029c5db Mon Sep 17 00:00:00 2001 From: robin Date: Tue, 28 Nov 2017 21:59:57 +0800 Subject: [PATCH] =?UTF-8?q?..=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tools/SaleOederUpdateList.cs | 24 +++++-- .../Tools/SaleOrderUpdateEdit.cs | 64 +++++++------------ 2 files changed, 42 insertions(+), 46 deletions(-) diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs index 25a563b..b837439 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOederUpdateList.cs @@ -26,6 +26,7 @@ using Forks.Utils; using TSingSoft.WebControls2; using TSingSoft.WebPluginFramework; using TSingSoft.WebPluginFramework.Controls; +using TSingSoft.WebPluginFramework.Pages; namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { @@ -34,8 +35,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { readonly DFInfo _dFInfo = DFInfo.Get(typeof(Order)); private DFChoiceBox _goodsPropertyCatalog; private ChoiceBox _goodsProperty; - + private HiddenField hidden; private DFChoiceBox _storeInput, _accInput, _customerCatalogt, _customerInput; + DFContainer mDFContainer = new DFContainer(); protected override void InitForm(HtmlForm form) { _queryContainer = QueryContainer.FromResource(GetType().FullName + ".xml", GetType().Assembly); form.Controls.Add(new PageTitle("销售订单调整")); @@ -88,10 +90,17 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { vp.Add(hPanel); AddDetails(form.EAdd(new TitlePanel("订单明细", "订单明细"))); + mDFContainer.ID = "DFContainer"; + form.Controls.Add(mDFContainer); var vPanel = new VLayoutPanel(); form.Controls.Add(vPanel); - + hidden = new HiddenField { + ID = "__hidden", + Value = null + }; + form.Controls.Add(hidden); + mDFContainer.AddNonDFControl(hidden, "$HiddenField01"); // addOperations(vPanel); } protected override void OnPreRender(EventArgs e) { @@ -170,6 +179,7 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { var number = ((decimal?)row["可用数量"]) ?? 0; var url = AspUtil.UpdateUrlParam("SaleOrderUpdateEdit.aspx", "GoodsProperty_ID", ((long)idField).ToString()); url = AspUtil.UpdateUrlParam(url, "number", number.ToString()); + url = AspUtil.UpdateUrlParam(url, "cacheid", "'+__DFContainer.getValue('$HiddenField01')+'"); bt.Url = url; bt.Width = 100; bt.Click += delegate { @@ -270,10 +280,10 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { var dom = _queryContainer.Build(); var bill = dom.From.RootSource.Alias; var detail = new JoinAlias("detail", typeof(Order_Detail)); - var goodsPropertyCatalog = new JoinAlias(typeof(GoodsPropertyCatalog)); - var goodsProperty = new JoinAlias(typeof(GoodsProperty)); - var goods = new JoinAlias(typeof(SaleGoods)); - var customer = new JoinAlias(typeof(Customer)); + var goodsPropertyCatalog = new JoinAlias("_gpc",typeof(GoodsPropertyCatalog)); + var goodsProperty = new JoinAlias("_gp",typeof(GoodsProperty)); + var goods = new JoinAlias("_g",typeof(SaleGoods)); + var customer = new JoinAlias("_c",typeof(Customer)); dom.From.AddJoin(JoinType.Inner, new DQDmoSource(detail), DQCondition.EQ(bill, "ID", detail, "Order_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(detail, "SaleGoods_ID", goods, "ID")); @@ -301,6 +311,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { } dom.Where.Conditions.Add(DQCondition.Or(conditions)); } + uint id = ViewStateUtil.Current.SaveToPersistenceMedium(dom.Where.Conditions); + hidden.Value = id.ToString(); return dom; } diff --git a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs index 2048fb6..e8f57d6 100644 --- a/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs +++ b/B3_DongFangWanQi.Web/Pages/B3_DongFangWanQi/Tools/SaleOrderUpdateEdit.cs @@ -21,6 +21,7 @@ using Forks.Utils; using Forks.Utils.Collections; using TSingSoft.WebControls2; using TSingSoft.WebPluginFramework.Controls; +using TSingSoft.WebPluginFramework.Pages; namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { class SaleOrderUpdateEdit : AppBasePage { @@ -213,8 +214,9 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { _goodsGrid.ShowLineNo = true; _goodsGrid.Columns.Add(new DFEditGridColumn("Order_ID")); - _goodsGrid.Columns.Add(new DFEditGridColumn("Customer_Name")); - _goodsGrid.Columns.Add(new DFEditGridColumn("LoadTime")); + _goodsGrid.Columns.Add(new DFEditGridColumn("Customer_Name")); + _goodsGrid.Columns.Add(new DFEditGridColumn("OrderDate")); + _goodsGrid.Columns.Add(new DFEditGridColumn("LoadTime")); _goodsGrid.Columns.Add(new DFEditGridColumn("Goods_Code")); _goodsGrid.Columns.Add(new DFEditGridColumn("Goods_Name")); @@ -317,16 +319,16 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { var dom = _queryContainer.Build(); var order = dom.From.RootSource.Alias; var detailAlias = new JoinAlias("detail", typeof(Order_Detail)); - - var goodsPropertyCatalog = new JoinAlias(typeof(GoodsPropertyCatalog)); - var goodsProperty = new JoinAlias(typeof(GoodsProperty)); - var goods = new JoinAlias(typeof(SaleGoods)); - + var goodsPropertyCatalog = new JoinAlias("_gpc", typeof(GoodsPropertyCatalog)); + var goodsProperty = new JoinAlias("_gp", typeof(GoodsProperty)); + var goods = new JoinAlias("_g", typeof(SaleGoods)); + var customer = new JoinAlias("_c", typeof(Customer)); dom.From.AddJoin(JoinType.Inner, new DQDmoSource(detailAlias), DQCondition.EQ(order, "ID", detailAlias, "Order_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(detailAlias, "SaleGoods_ID", goods, "ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID")); dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsPropertyCatalog), DQCondition.EQ(goodsProperty, "GoodsPropertyCatalog_ID", goodsPropertyCatalog, "ID")); + dom.From.AddJoin(JoinType.Left, new DQDmoSource(customer), DQCondition.EQ(order, "Customer_ID", customer, "ID")); dom.Columns.Add(DQSelectColumn.Field("ID", detailAlias)); dom.Columns.Add(DQSelectColumn.Field("UnitNum", detailAlias)); @@ -342,41 +344,18 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_ID", detailAlias)); dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_Name", detailAlias)); dom.Columns.Add(DQSelectColumn.Field("LoadTime", order)); + dom.Columns.Add(DQSelectColumn.Field("OrderDate", order)); + var condition = (IList)ViewStateUtil.Current.LoadFromPersistenceMedium(uint.Parse(Request.QueryString["cacheid"]),true); + foreach (var expression in condition) + { + dom.Where.Conditions.Add(expression); + } if (GoodsProperty_ID != null) { dom.Where.Conditions.Add(DQCondition.EQ(goodsProperty, "ID", GoodsProperty_ID)); } - - if (AccountingUnit_ID != null) { - dom.Where.Conditions.Add(DQCondition.EQ(order, "AccountingUnit_ID", AccountingUnit_ID)); - - } - if (SelectAccountingUnit_ID != null) { - dom.Where.Conditions.Add(DQCondition.EQ(order, "AccountingUnit_ID", SelectAccountingUnit_ID)); - } - - if (Customer_ID != null) { - dom.Where.Conditions.Add(DQCondition.EQ(order, "Customer_ID", Customer_ID)); - - } - if (SelectCustomer_ID != null) { - dom.Where.Conditions.Add(DQCondition.EQ(order, "Customer_ID", SelectCustomer_ID)); - } - - if (SelectStore_ID != null) { - dom.Where.Conditions.Add(DQCondition.EQ(order, "Store_ID", SelectStore_ID)); - } - - if (!string.IsNullOrEmpty(SelectGoodsPropertyCatalog_Name)) { - var strs = B3SaleWebUtil.GetDeepByTreeName(SelectGoodsPropertyCatalog_Name); - - dom.Where.Conditions.Add(DQCondition.EQ(goodsPropertyCatalog, "TreeDeep" + strs[0] + "ID", SelectGoodsPropertyCatalog_ID)); - } - if (SelectGoodsProperty_ID != null) { - dom.Where.Conditions.Add(DQCondition.EQ(goodsProperty, "ID", SelectGoodsProperty_ID)); - } - - dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核)); - OrganizationUtil.AddOrganizationLimit(dom, typeof(Order)); + + //dom.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.未审核)); + //OrganizationUtil.AddOrganizationLimit(dom, typeof(Order)); Details.Clear(); using (var context = new TransactionContext()) { using (var reader = context.Session.ExecuteReader(dom)) { @@ -395,7 +374,8 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { Order_ID = (long)reader[10], GoodsBatch_ID = (long?)reader[11], GoodsBatch_Name = (string)reader[12], - LoadTime = (DateTime?)reader[13] + LoadTime = (DateTime?)reader[13], + OrderDate = (DateTime?)reader[14], }; Details.Add(detail); } @@ -414,6 +394,10 @@ namespace BWP.Web.Pages.B3_DongFangWanQi.Tools { class Order_DetailExt : Order_Detail { [LogicName("发货时间")] public DateTime? LoadTime { get; set; } + + [LogicName("订货时间")] + public DateTime? OrderDate { get; set; } + } } }