From d4725b94ca796100c00c0092fdac110281053cf4 Mon Sep 17 00:00:00 2001 From: robin Date: Mon, 4 Dec 2017 14:11:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137519?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + .../B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs | 2 +- .../SaleForecastUpdateList_/SaleForecastUpdateEdit.cs | 8 ++++++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d8c371b..6b5501f 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ bin obj .* /*.suo +_ReSharper.B3_YunKen \ No newline at end of file diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs index 44f60f3..7b44194 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/B3YunKenSaleOutStoreToCustomerAccept.cs @@ -152,7 +152,7 @@ namespace BWP.Web.Pages.B3YunKen { _detailGrid = vPanel.Add(new DFEditGrid(detailEditor) { Width = Unit.Percentage(100) }); _detailGrid.ShowLineNo = true; _detailGrid.MultiSelectionEnabled = true; - + _detailGrid.Columns.Add(new DFEditGridColumn("BrandItem_Name")); _detailGrid.Columns.Add(new DFEditGridColumn("Goods_Name")); _detailGrid.Columns.Add(new DFEditGridColumn("Goods_Spec")); diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs index 22bd4d9..3207d5b 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs @@ -225,6 +225,7 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ { _goodsGrid.Columns.Add(new DFEditGridColumn("Customer_Name")); } _goodsGrid.ShowLineNo = true; + _goodsGrid.Columns.Add(new DFEditGridColumn("BrandItem_Name")); _goodsGrid.Columns.Add(new DFEditGridColumn("Goods_Code")); _goodsGrid.Columns.Add(new DFEditGridColumn("Goods_Name")); @@ -344,7 +345,8 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ { dom.Columns.Add(DQSelectColumn.Field("SaleForecast_ID", detailAlias)); dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_ID", detailAlias)); dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_Name", detailAlias)); - + dom.Columns.Add(DQSelectColumn.Field("BrandItem_ID", detailAlias)); + dom.Columns.Add(DQSelectColumn.Field("BrandItem_Name", detailAlias)); if (SaleGoods_ID != null) { dom.Where.Conditions.Add(DQCondition.EQ(detailAlias, "SaleGoods_ID", SaleGoods_ID)); } @@ -397,7 +399,9 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ { Customer_Name = (string)reader[9], SaleForecast_ID = (long)reader[10], GoodsBatch_ID = (long?)reader[11], - GoodsBatch_Name = (string)reader[12] + GoodsBatch_Name = (string)reader[12], + BrandItem_ID = (long?)reader[11], + BrandItem_Name = (string)reader[12] }; Details.Add(detail); }