diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs index cc00d15..38ebb12 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.cs @@ -221,6 +221,9 @@ namespace BWP.Web.Pages.B3YunKen.Bill { dom.Where.Conditions.EFieldInList(DQExpression.Field(main, "PriceClass_ID"), _priceClass.GetValues()); } + var accUnit_ID = mQueryContainer.GetControl("AccountingUnit_ID"); + if(!accUnit_ID.IsEmpty) + dom.Where.Conditions.EFieldInList(DQExpression.Field(priceTemp, "AccountingUnit_ID"), accUnit_ID.GetValues()); if (_sortType.Value != null) dom.OrderBy.Expressions.Add(DQOrderByExpression.Create(detail, "Goods_Name", _sortType.Value == true ? false : true)); return dom; @@ -250,11 +253,8 @@ namespace BWP.Web.Pages.B3YunKen.Bill _grid.DFGridSetEnabled = false; _grid.MultiSelectionEnabled = true; _grid.Columns.EAdd(new DFBrowseGridColumn("Goods_Name")).HeaderText = "标准件"; - if (string.IsNullOrEmpty(saleConfig.PriceClassId)) { - _grid.Columns.EAdd(new DFBrowseGridColumn("会计单位")).HeaderText = "会计单位"; - } else { - _grid.Columns.EAdd(new DFBrowseGridColumn("BrandItem_Name")); - } + _grid.Columns.EAdd(new DFBrowseGridColumn("会计单位")).HeaderText = "会计单位"; + _grid.Columns.EAdd(new DFBrowseGridColumn("BrandItem_Name")); _grid.Columns.EAdd(new DFBrowseGridColumn( "GoodsProperty_Name")).HeaderText = "存货分类"; _grid.Columns.EAdd(new DFBrowseGridColumn("SourcePrice")).HeaderText = "原单价"; _grid.Columns.EAdd(new DFEditGridColumn("Price")).HeaderText = "调整单价"; diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.xml index e383429..8d54b6b 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.xml +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Bill/PriceBill_DetailAdjust.xml @@ -44,10 +44,6 @@ - - - -