From fa2cc5883fbcf91a0cbcd3c88683eb8bb0913d72 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Fri, 26 Jan 2018 17:38:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BB=8F=E9=94=80=E5=95=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs       | 6 ++++++
 .../Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml      | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs
index 33d5419..7336d2c 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.cs
@@ -90,6 +90,8 @@ namespace BWP.Web.Pages.B3YunKen.Reports
             list.Add(new Tuple<string, string>("NetPrice", "去包装净价"));
             list.Add(new Tuple<string, string>("ToFreightNetPrice", "去运费单价"));
             list.Add(new Tuple<string, string>("PolicyPrice", "政策价格"));
+            list.Add(new Tuple<string, string>("CustomerDealer_Name", "经销商"));
+          
             var section = mPageLayoutManager.AddSection("显示字段", "显示字段");
             section.ApplyLayout(list, mPageLayoutManager);
             foreach (var item in list)
@@ -155,6 +157,9 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID"));
 
           layout.Add("BrandItem_ID", new SimpleLabel("品牌项"),mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(_brandItem = QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["Car_ID"], B3UnitedInfosConsts.DataSources.品牌项), s => long.Parse(s)), "BrandItem_ID"));
             layout["BrandItem_ID"].NotAutoAddToContainer = true;
+            layout.Add("CustomerDealer_ID", mQueryContainer.AddLink(new ChoiceBoxMultiSelectLink(QueryCreator.DFChoiceBoxEnableMultiSelection(mDFInfo.Fields["CustomerDealer_ID"],
+      B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
+            layout["CustomerDealer_ID"].NotAutoAddToContainer = true;
             var config = layout.CreateDefaultConfig(2);
             config.Expand = false;
             //config.Add("LoadTime");
@@ -267,6 +272,7 @@ B3SaleDataSources.结账客户), s => long.Parse(s)), "AccountCustomer_ID"));
                   case "Driver_Telephone":
                   case "HandcarNumber":
                   case "Store_Name":
+                  case "CustomerDealer_Name":
                     dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(main, field), item.Text));
                     dom.GroupBy.Expressions.Add(DQExpression.Field(main, field));
                     break;
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml
index 13d833a..0255f62 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport.xml
@@ -95,6 +95,10 @@
         <Field name="FreightPayment"/>
         <QBE paramName="FreightPayment"/>
       </EQ>
+      <QBEIn>
+        <Field name="CustomerDealer_ID"/>
+        <QBE paramName="CustomerDealer_ID"/>
+      </QBEIn>
     </And>
   </Where>
 </Select>
\ No newline at end of file