From 742a20526ec9389d89de4fd1336b500f665c1507 Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Fri, 3 Aug 2018 09:54:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=87=E7=A6=8F=E9=94=80=E5=94=AE=E5=87=BA?=
 =?UTF-8?q?=E5=BA=93=E5=8D=95=E5=88=86=E6=9E=90=E8=B0=83=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SaleOutStore_/SaleOutStoreSimpleAnayse.cs               | 4 ++--
 .../SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs          | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs
index 8799edb..fce9850 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnayse.cs
@@ -156,7 +156,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
       vPanel.Add(layout.CreateLayout(), new VLayoutOption(HorizontalAlign.Left));
     }
 
-    private Dictionary<string, string> fieldInfo = new Dictionary<string, string>() { {"Customer_Name", "购货客户" }, { "DeliverGoodsLine_Name", "送货线路名称" }, { "Goods_Name", "存货名称" },{ "Goods_Spec", "存货规格" }, { "Order_Detail_UnitNum", "订单数量" }, { "SecondNumber", "辅数量" }, { "Goods_SecondUnit", "辅单位" } };
+    private Dictionary<string, string> fieldInfo = new Dictionary<string, string>() { { "DeliverGoodsLine_Name", "送货线路名称" }, { "Customer_Name", "购货客户" }, { "Goods_Name", "存货名称" }, { "Goods_Spec", "存货规格" }, { "UnitNum", "报价数量" }, { "SecondNumber", "辅数量" }, { "Goods_SecondUnit", "辅单位" } };
 
 
     protected override void PrepareData()
@@ -254,7 +254,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
             dom.GroupBy.Expressions.Add(DQExpression.Field(detail, item.Key));
             break;
           case "SecondNumber":
-          case "Order_Detail_UnitNum":
+          case "UnitNum":
             dom.Columns.Add(DQSelectColumn.Create(DQExpression.Sum(DQExpression.Field(detail, item.Key)), item.Value));
             SumColumnIndexs.Add(dom.Columns.Count - 1);
             break;
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs
index 7dafd72..903edbc 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/SaleOutStore_/SaleOutStoreSimpleAnaysePrint.cs
@@ -141,11 +141,11 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
 
 
     public SaleOutStorePrintInfo info  { get; set; }
-    
 
 
 
-    private string[] fieldInfo = new string[] { "Customer_Name",  "DeliverGoodsLine_Name","Goods_Name", "Goods_Spec", "Order_Detail_UnitNum", "SecondNumber", "Goods_SecondUnit" };
+
+    private string[] fieldInfo = new string[] { "DeliverGoodsLine_Name", "Customer_Name", "Goods_Name", "Goods_Spec", "UnitNum", "SecondNumber", "Goods_SecondUnit" };
     
     private DQueryDom GetQueryDom()
     {
@@ -182,7 +182,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.SaleOutStore_
             dom.GroupBy.Expressions.Add(DQExpression.Field(detail, item));
             break;
           case "SecondNumber":
-          case "Order_Detail_UnitNum":
+          case "UnitNum":
             dom.Columns.Add(DQSelectColumn.Sum( detail, item));
             break;
           default: