From fa2cc5883fbcf91a0cbcd3c88683eb8bb0913d72 Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Fri, 26 Jan 2018 17:38:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=8F=E9=94=80?= =?UTF-8?q?=E5=95=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs | 6 ++++++ .../Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs index 33d5419..7336d2c 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs @@ -90,6 +90,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports list.Add(new Tuple("NetPrice", "去包装净价")); list.Add(new Tuple("ToFreightNetPrice", "去运费单价")); list.Add(new Tuple("PolicyPrice", "政策价格")); + list.Add(new Tuple("CustomerDealer_Name", "经销商")); + var section = mPageLayoutManager.AddSection("显示字段", "显示字段"); section.ApplyLayout(list, mPageLayoutManager); foreach (var item in list) @@ -155,6 +157,9 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID")); layout.Add("BrandItem_ID", new SimpleLabel("品牌项"),mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(_brandItem = QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["Car_ID"], B3UnitedInfosConsts.DataSources.品牌项), s => long.Parse(s)), "BrandItem_ID")); layout["BrandItem_ID"].NotAutoAddToContainer = true; + layout.Add("CustomerDealer_ID", mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["CustomerDealer_ID"], + B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID")); + layout["CustomerDealer_ID"].NotAutoAddToContainer = true; var config = layout.CreateDefaultConfig(2); config.Expand = false; //config.Add("LoadTime"); @@ -267,6 +272,7 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID")); case "Driver_Telephone": case "HandcarNumber": case "Store_Name": + case "CustomerDealer_Name": dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(main, field), item.Text)); dom.GroupBy.Expressions.Add(DQExpression.Field(main, field)); break; diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml index 13d833a..0255f62 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml @@ -95,6 +95,10 @@ + + + + \ No newline at end of file From 9d9db7a7028ed9560d3a693f4c75fcd21deec0d9 Mon Sep 17 00:00:00 2001 From: wugang <425674808@qq.com> Date: Sat, 27 Jan 2018 17:10:25 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138532?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs | 5 ++++- .../Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs | 5 +++-- .../Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml | 8 ++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs index 26cea62..7247c05 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs @@ -5,6 +5,7 @@ using System.Web.UI; using System.Web.UI.HtmlControls; using System.Web.UI.WebControls; using BWP.B3Frameworks; +using BWP.B3Frameworks.BO; using BWP.B3Frameworks.BO.NamedValueTemplate; using BWP.B3Frameworks.Utils; using BWP.B3Sale.BL; @@ -364,9 +365,10 @@ namespace BWP.Web.Pages.B3YunKen { var query = _queryContainer.Build(); var aready = new JoinAlias(typeof(AreadyTo)); var bill = query.From.RootSource.Alias; + var acc = new JoinAlias(typeof(AccountingUnit)); query.RegisterQueryTable(typeof(AreadyTo), new string[] { "ID", "AlreadyAcceptUnitNum" }, AreadyTo.Get()); query.From.AddJoin(JoinType.Left, new DQDmoSource(aready), DQCondition.EQ(bill, "ID", aready, "ID")); - + query.From.AddJoin(JoinType.Left, new DQDmoSource(acc), DQCondition.EQ(bill, "AccountingUnit_ID", acc, "ID")); query.Columns.Add(DQSelectColumn.Create(DQExpression.Field(aready, "AlreadyAcceptUnitNum"), "已验收数量")); if (_hideFinishedBill.Checked) { @@ -382,6 +384,7 @@ namespace BWP.Web.Pages.B3YunKen { query.Columns.Add(DQSelectColumn.Field("IsSplitCreatedCustomerAccept", bill)); query.Where.Conditions.Add(DQCondition.EQ("BillState", 单据状态.已审核)); query.Where.Conditions.Add(DQCondition.EQ("Domain_ID", DomainContext.Current.ID)); + OrganizationUtil.AddOrganizationLimit(query, typeof(AccountingUnit), acc); return query; } diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs index 7336d2c..c8fefa0 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs @@ -162,8 +162,9 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID")); layout["CustomerDealer_ID"].NotAutoAddToContainer = true; var config = layout.CreateDefaultConfig(2); config.Expand = false; - //config.Add("LoadTime"); - //config.Add("OrderDate"); + config.Add("LoadTime"); + config.Add("OrderDate"); + config.Add("ArriveTime"); //config.Add("AccountingUnit_ID"); //config.Add("Goods_ID"); //config.Add("GoodsPropertyCatalog_ID"); diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml index 0255f62..f59636c 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml @@ -27,6 +27,14 @@ + + + + + + + +