From 6a59842e7d4fcc66acc0696ed990e5049b5f1557 Mon Sep 17 00:00:00 2001
From: duanluohua <duanluohua@bwp.com>
Date: Sat, 10 Mar 2018 09:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138951?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/YunKenStoreDetailQuery.cs         | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/YunKenStoreDetailQuery.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/YunKenStoreDetailQuery.cs
index 2709632..bdcdde1 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/YunKenStoreDetailQuery.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/YunKenStoreDetailQuery.cs
@@ -46,14 +46,31 @@ namespace BWP.Web.Pages.B3YunKen.Reports {
 
     protected override void AddQueryOptions(VLayoutPanel vPanel)
     {
-      AddQueryOption("显示字段", new string[] { "会计单位", "仓库", "属性分类", "存货属性", "产品线", "品牌", "货位","品牌项","存货编码","存货名称","批号","规格", "产地", "简称", "主单位", "辅数量", "辅单位", "辅数量II", "辅单位II", "单价", "金额", "生产日期", "保质天数", "有效日期", "入库日期", "库龄", "产品线分类" }, new string[0]);
+      AddQueryOption("显示字段", new string[] { "会计单位", "仓库", "属性分类", "存货属性", "产品线", "货位","品牌项","存货编码","存货名称","批号","规格", "产地", "简称", "主单位", "辅数量", "辅单位", "辅数量II", "辅单位II", "单价", "金额", "生产日期", "保质天数", "有效日期", "入库日期", "库龄", "产品线分类" }, new string[0]);
 
 
       AddOtherQueryOptionControls();
 
+      AddOtherOptions();
       base.AddQueryOptions(vPanel);
     }
 
+    private CheckBoxList _showTypeList;
+    private void AddOtherOptions()
+    {
+      _showTypeList = new CheckBoxList
+      {
+        RepeatColumns = 6,
+        RepeatDirection = RepeatDirection.Horizontal
+      };
+      _showTypeList.Items.Add(new ListItem("合并单元格")
+      {
+        Selected = true
+      });
+
+      //vPanel.EAdd(new HLayoutPanel() { new SimpleLabel("显示格式"), _showTypeList });
+      AddOtherQueryOptionControls("显示格式",_showTypeList);
+    }
 
     CheckBox showGoodsPropertyCatalogLevel = null;
     DropDownList goodsPropertyCatalogLevel = null;
@@ -134,7 +151,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports {
 
 
     protected override DQueryDom GetQueryDom() {
-
+      mDFGrid.AllowRowGroup = _showTypeList.Items.FindByText("合并单元格").Selected;
+      mDFGrid.AllowSorting = true;
       var query = base.GetQueryDom();
 
       JoinAlias goodsBatchAlias = new JoinAlias("goodsBatch",typeof(GoodsBatch));
@@ -233,10 +251,6 @@ namespace BWP.Web.Pages.B3YunKen.Reports {
         AddColumn(query, DQExpression.Field(goodsAlias, "ProductLine_Name"), "产品线");
       }
 
-      if (ShowOptionSelected("品牌")) {
-        AddColumn(query, DQExpression.Field(goodsAlias, "Brand"), "品牌");
-      }
-
 
       if (ShowOptionSelected("规格")) {
         AddColumn(query, DQExpression.Field(goodsAlias, "Spec"), "规格");
@@ -382,7 +396,6 @@ namespace BWP.Web.Pages.B3YunKen.Reports {
         layoutManager.Add("BrandItem_ID", QueryCreator.DFChoiceBox(dfInfo.Fields["BrandItem_ID"], B3UnitedInfosConsts.DataSources.品牌项));
       }
       layoutManager.Add("GoodsBatch_Name", QueryCreator.DFTextBox(dfInfo.Fields["GoodsBatch_Name"]));
-      layoutManager.Add("Brand", new SimpleLabel("品牌"), new DFTextBox(goodsInfo.Fields["Brand"]));
       layoutManager.Add("Origin", new SimpleLabel("产地"), new DFTextBox(goodsInfo.Fields["Origin"]));
       layoutManager.Add("ProductionDate",new SimpleLabel("生产日期"),QueryCreator.DateRange(dfInfo.Fields["GoodsBatch_ProductionDate"], mQueryContainer, "MinProductionDate", "MaxProductionDate"));
       layoutManager["ProductionDate"].NotAutoAddToContainer = true;