diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs index 5703e5a..9e27002 100644 --- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs +++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs @@ -46,6 +46,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports readonly DFInfo _detailInfo = DFInfo.Get(typeof(ProduceFinish_Detail)); readonly Dictionary _fileInfo = new Dictionary(); readonly List _sumCol = new List(); + DFCheckBox checkbox; protected override void AddQueryControls(VLayoutPanel vPanel) { @@ -65,6 +66,10 @@ namespace BWP.Web.Pages.B3YunKen.Reports layout["ProductLine_ID"].NotAutoAddToContainer = true; layout.Add("Goods_ID", new SimpleLabel("存货"), QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["ID"], mQueryContainer, "Goods_ID", B3UnitedInfosConsts.DataSources.存货)); layout["Goods_ID"].NotAutoAddToContainer = true; + checkbox = new DFCheckBox(); + checkbox.Text = "隐藏"; + layout.Add("hiddenPrice", new SimpleLabel("隐藏无价格的产品"), checkbox); + layout["hiddenPrice"].NotAutoAddToContainer = true; //layout.Add("Date", new SimpleLabel("生产日期"), QueryCreator.TimeRange(mDFInfo.Fields["Date"], mQueryContainer, "MinDate", "MaxDate")); //layout["Date"].NotAutoAddToContainer = true; //var state = mQueryContainer.Add(B3ButcheryCustomInputCreator.一般单据状态(mDFInfo.Fields["BillState"], true, false, true, true), "BillState"); @@ -80,6 +85,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports config.Add("ProductLine_ID"); //config.Add("StandardGoods_ID"); config.Add("Goods_ID"); + config.Add("hiddenPrice"); //config.Add("Date"); //config.Add("BillState"); @@ -196,6 +202,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports var lineChb = mQueryContainer.GetControl("ProductLine_ID"); var accountingUnitChb = mQueryContainer.GetControl("AccountingUnit_ID"); var goodsPropertyChb = mQueryContainer.GetControl("GoodsProperty_ID"); + if(checkbox.Checked) + dom.Where.Conditions.Add(DQCondition.IsNotNull(DQExpression.Field(detail, "Price"))); if (!goodsChb.IsEmpty) { dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(detail, "Goods_ID"), goodsChb.GetValues().Select(x => DQExpression.Value(x)).ToArray())); }