From c7beeb3f9ee5fde594d38de8158c2460f850f73e Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Thu, 18 Jan 2018 11:48:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.137623?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3YunKen/Reports/DynamicPriceReport.cs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs
index b49a498..5703e5a 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/DynamicPriceReport.cs
@@ -57,15 +57,14 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       layout["AccountingUnit_ID"].NotAutoAddToContainer = true;
       //layout.Add("StandardGoods_ID", new SimpleLabel("标准件"), QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["ID"], mQueryContainer, "StandardGoods_ID", B3SaleDataSources.标准件));
       //layout["StandardGoods_ID"].NotAutoAddToContainer = true;
-      //layout.Add("GoodsProperty_ID", new SimpleLabel("存货属性"), QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["ID"], mQueryContainer, "GoodsProperty_ID", B3UnitedInfosConsts.DataSources.存货属性全部));
-      //layout["GoodsProperty_ID"].NotAutoAddToContainer = true;
+      layout.Add("GoodsProperty_ID", new SimpleLabel("存货属性"), QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["ID"], mQueryContainer, "GoodsProperty_ID", B3UnitedInfosConsts.DataSources.存货属性全部));
+      layout["GoodsProperty_ID"].NotAutoAddToContainer = true;
       //layout.Add("BrandItem_ID", new SimpleLabel("品牌项"), QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["ID"], mQueryContainer, "BrandItem_ID", B3UnitedInfosConsts.DataSources.品牌项));
       //layout["BrandItem_ID"].NotAutoAddToContainer = true;
       layout.Add("ProductLine_ID", new SimpleLabel("产品线"), QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["ID"], mQueryContainer, "ProductLine_ID", B3UnitedInfosConsts.DataSources.产品线全部));
       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;
-      
       //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");
@@ -76,7 +75,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       //layout["BillState"].NotAutoAddToContainer = true;
       var config = new AutoLayoutConfig { Cols = 2 };
       config.Add("AccountingUnit_ID");
-      //config.Add("GoodsProperty_ID");
+      config.Add("GoodsProperty_ID");
       //config.Add("BrandItem_ID");
       config.Add("ProductLine_ID");
       //config.Add("StandardGoods_ID");
@@ -184,20 +183,25 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       mDisplayHelper.AddAlias("accountingUnit", JoinAlias.Create("accountingUnit"));
       var goods = new JoinAlias("goods", typeof(SaleGoods));
       mDisplayHelper.AddAlias("goods", JoinAlias.Create("goods"));
+      //var goodsProperty = new JoinAlias("goodsProperty", typeof(GoodsProperty));
+      //mDisplayHelper.AddAlias("goodsProperty", JoinAlias.Create("goodsProperty"));
       var dom = new DQueryDom(detail);
       dom.RegisterQueryTable(typeof(PriceBillID), new string[] { "AccountingUnit_ID", "ID" }, GetMaxPriceBillID());
       dom.RegisterQueryTable(typeof(PriceBillID2), new string[] { "AccountingUnit_ID", "ID" }, GetMaxPriceBillID());
       dom.RegisterQueryTable(typeof(PriceBillData), new string[] { "AccountingUnit_ID", "Goods_ID","StandardName", "Price" }, query1);
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(accountingUnit), DQCondition.EQ(detail, "AccountingUnit_ID", accountingUnit, "ID"));
       dom.From.AddJoin(JoinType.Left, new DQDmoSource(goods), DQCondition.EQ(detail, "Goods_ID", goods, "ID"));
-      
+      //dom.From.AddJoin(JoinType.Left, new DQDmoSource(goodsProperty), DQCondition.EQ(goodsProperty, "ID", goods, "GoodsProperty_ID"));
       var goodsChb = mQueryContainer.GetControl<DFChoiceBox>("Goods_ID");
       var lineChb = mQueryContainer.GetControl<DFChoiceBox>("ProductLine_ID");
       var accountingUnitChb = mQueryContainer.GetControl<DFChoiceBox>("AccountingUnit_ID");
+      var goodsPropertyChb = mQueryContainer.GetControl<DFChoiceBox>("GoodsProperty_ID");
       if (!goodsChb.IsEmpty) {
         dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(detail, "Goods_ID"), goodsChb.GetValues().Select(x => DQExpression.Value(x)).ToArray()));
       }
-
+      if (!goodsPropertyChb.IsEmpty) {
+        dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(goods, "GoodsProperty_ID"), goodsPropertyChb.GetValues().Select(x => DQExpression.Value(x)).ToArray()));
+      }
       if (!lineChb.IsEmpty) {
         dom.Where.Conditions.Add(DQCondition.InList(DQExpression.Field(goods, "ProductLine_ID"), lineChb.GetValues().Select(x => DQExpression.Value(x)).ToArray()));
       }