From 373d96bc0020065e8a0f5d8c2cc13d65b3423713 Mon Sep 17 00:00:00 2001 From: robin Date: Tue, 14 Nov 2017 14:18:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.136598?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SaleForecastUpdateList_/SaleForecastUpdateEdit.cs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs index b2494e5..22bd4d9 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/SaleForecastUpdateList_/SaleForecastUpdateEdit.cs @@ -234,11 +234,12 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ { _goodsGrid.Columns.Add(new DFEditGridColumn("Unit")); _goodsGrid.Columns.EAdd(new DFEditGridColumn("SecondNumber")).SumMode = SumMode.Sum; _goodsGrid.Columns.EAdd(new DFEditGridColumn("Goods_SecondUnit")); - + _goodsGrid.Columns.EAdd(new DFEditGridColumn("Price")) ; _goodsGrid.Columns.EAdd(new DFEditGridColumn("Money")).SumMode = SumMode.Sum; _goodsGrid.Columns.EAdd(new DFEditGridColumn("PolicyPrice")); - + _goodsGrid.Columns.Add(new DFEditGridColumn("GoodsBatch_Name")); + _goodsGrid.ValueColumns.Add("SaleGoods_ID"); _goodsGrid.ValueColumns.Add("Goods_UnitConvertDirection"); _goodsGrid.ValueColumns.Add("Goods_MainUnitRatio"); @@ -341,6 +342,9 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ { dom.Columns.Add(DQSelectColumn.Field("Money", detailAlias)); dom.Columns.Add(DQSelectColumn.Field("Customer_Name", order)); dom.Columns.Add(DQSelectColumn.Field("SaleForecast_ID", detailAlias)); + dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_ID", detailAlias)); + dom.Columns.Add(DQSelectColumn.Field("GoodsBatch_Name", detailAlias)); + if (SaleGoods_ID != null) { dom.Where.Conditions.Add(DQCondition.EQ(detailAlias, "SaleGoods_ID", SaleGoods_ID)); } @@ -392,6 +396,8 @@ namespace BWP.Web.Pages.B3YunKen.SaleForecastUpdateList_ { Money = (Money<金额>?)reader[8], Customer_Name = (string)reader[9], SaleForecast_ID = (long)reader[10], + GoodsBatch_ID = (long?)reader[11], + GoodsBatch_Name = (string)reader[12] }; Details.Add(detail); }