From 7a53027d7cb43cd6cf8f75b5efdbc22272c794e5 Mon Sep 17 00:00:00 2001
From: wugang <425674808@qq.com>
Date: Tue, 29 May 2018 16:15:58 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.139614?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../B3YunKen/Reports/ToFreightNetPriceReport2.cs   | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
index 60c62a1..e9e9173 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Reports/ToFreightNetPriceReport2.cs
@@ -74,9 +74,7 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       list.Add(new Tuple<string, string>("AccountCustomer_Name", "结账客户"));
       list.Add(new Tuple<string, string>("Customer_Name", "购货客户"));
       list.Add(new Tuple<string, string>("Customer_DeliveryPhone", "联系方式"));
-      list.Add(new Tuple<string, string>("OrderDate", "订货时间"));
-      list.Add(new Tuple<string, string>("LoadTime", "发货时间"));
-      list.Add(new Tuple<string, string>("ArriveTime", "到货时间"));
+      list.Add(new Tuple<string, string>("CreateTime", "订货时间"));
       list.Add(new Tuple<string, string>("CheckTime", "验收审核时间"));
       list.Add(new Tuple<string, string>("BillType", "业务类型"));
       list.Add(new Tuple<string, string>("Department_Name", "部门"));
@@ -112,9 +110,9 @@ namespace BWP.Web.Pages.B3YunKen.Reports
       list.Add(new Tuple<string, string>("CustomerDealer_Name", "经销商"));
       list.Add(new Tuple<string, string>("FreightBear", "运费承担方"));
       list.Add(new Tuple<string, string>("DeliveryTime", "预报提货时间"));
-      list.Add(new Tuple<string, string>("OrderLoadTime", "订单发货时间"));
-      list.Add(new Tuple<string, string>("OutCheckTime", "出库审核时间"));
-      list.Add(new Tuple<string, string>("AcceptCheckTime", "验收审核时间"));
+      list.Add(new Tuple<string, string>("OrderLoadTime", "订单提货时间"));
+      list.Add(new Tuple<string, string>("OutCheckTime", "出库时间"));
+      list.Add(new Tuple<string, string>("AcceptCheckTime", "验收时间"));
       
       var section = mPageLayoutManager.AddSection("显示字段", "显示字段");
       section.ApplyLayout(list, mPageLayoutManager);
@@ -510,6 +508,7 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
           case "CustomerDealer_Name":
           case "Customer_Name":
           case "BillType":
+          case "CreateTime":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(main, field), item.Text));
             dom.GroupBy.Expressions.Add(DQExpression.Field(main, field));
             ColumnNames.Add(item.Text);
@@ -522,9 +521,6 @@ B3SaleDataSources.经销商), s => long.Parse(s)), "CustomerDealer_ID"));
           case "Driver_Name":
           case "Driver_Telephone":
           case "HandcarNumber":
-          case "OrderDate":
-          case "LoadTime":
-          case "ArriveTime":
           case "FreightBear":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Field(outStore, field), item.Text));
             dom.GroupBy.Expressions.Add(DQExpression.Field(outStore, field));