From 17e69bb5ef0d7f18248604c63ee4da079848632a Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Fri, 19 Jan 2018 13:12:49 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.138390=20?=
 =?UTF-8?q?=E5=B1=A0=E5=AE=B0=E5=9C=BA=E7=AE=A1=E7=90=86=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=A1=A3=E6=A1=88=E2=80=9C=E6=94=B6=E8=B4=AD=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E2=80=9D=20=E6=8A=8A=E5=8E=9F=E6=9C=89=E7=9A=84NamedValue?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=8D=A2=E6=88=90=E6=A1=A3=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs       | 4 ++--
 .../Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml      | 4 ++--
 B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs
index 0535ea4..a50a0dc 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.cs
@@ -180,7 +180,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
       config.Add("SupplierClass_ID");
       config.Add("Employee_ID");
       config.Add("ValuationArea_ID");
-      config.Add("PurchaseType");
+      config.Add("PurchaseType_ID");
       config.Add("Date");
       layoutManager.Config = config;
       vPanel.Add(layoutManager.CreateLayout());
@@ -195,7 +195,7 @@ namespace BWP.Web.Pages.B3QingDaoWanFu.Reports
 
       _checkbox = new CheckBoxListWithReverseSelect { RepeatColumns = 6, RepeatDirection = RepeatDirection.Horizontal };
       _checkbox.Items.Add(new ListItem("收购日期", "WeighTime"));
-      _checkbox.Items.Add(new ListItem("收购类型", "PurchaseType"));
+      _checkbox.Items.Add(new ListItem("收购类型", "PurchaseType_Name"));
       _checkbox.Items.Add(new ListItem("供应商", "Supplier_Name"));
       _checkbox.Items.Add(new ListItem("来源地", "来源地"));
       _checkbox.Items.Add(new ListItem("过磅单号", "Weigh_ID"));
diff --git a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml
index 7210e68..572c3b9 100644
--- a/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml
+++ b/B3QingDaoWanFu.Web/Pages/B3QingDaoWanFu/Reports/ComprehensiveReport.xml
@@ -48,8 +48,8 @@
       </EQ>
 
       <EQ>
-        <Field name="PurchaseType" alias="bill"/>
-        <QBE paramName="PurchaseType"/>
+        <Field name="PurchaseType_ID" alias="bill"/>
+        <QBE paramName="PurchaseType_ID"/>
       </EQ>
 
       <GreaterThanOrEqual>
diff --git a/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs b/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs
index 9f01c17..2185bec 100644
--- a/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs
+++ b/B3QingDaoWanFu/TypeIOCs/StatPayBLTypeIoc.cs
@@ -41,7 +41,7 @@ namespace BWP.B3QingDaoWanFu.TypeIOCs
         return;
       }
 
-      if (dmo.PurchaseType == 收购类型.业务)
+      if (dmo.PurchaseType_Name == "业务")
       {
         dmo.ActualMoney = (dmo.ShackMoney.EToDecimal() ?? 0) + (dmo.JingJianFee.EToDecimal() ?? 0) - (dmo.DiscontMoney.EToDecimal() ?? 0);
         Money<decimal>? we = null;