From 0117b9664eafb14b0f5cc6e08a1d93e9b01d38fe Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Wed, 24 Oct 2018 14:09:29 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=8D=95No.141596=091?=
 =?UTF-8?q?=E3=80=81=E5=87=BA=E8=82=89=E7=8E=87=E6=8A=A5=E8=A1=A8=EF=BC=9A?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5{=E6=9D=A5=E6=BA=90?=
 =?UTF-8?q?=E5=9C=B0}=EF=BC=8C=E6=A0=B9=E6=8D=AE=E8=BF=87=E7=A3=85?=
 =?UTF-8?q?=E5=8D=95=E5=8F=B7=E4=BB=8E=E8=BF=87=E7=A3=85=E5=8D=95=E4=B8=8A?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=EF=BC=9B2=E3=80=81=E5=B1=A0=E5=AE=B0?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=EF=BC=9A=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?{=E6=9D=A5=E6=BA=90=E5=9C=B0}=EF=BC=8C=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E8=BF=87=E7=A3=85=E5=8D=95=E5=8F=B7=E4=BB=8E=E8=BF=87=E7=A3=85?=
 =?UTF-8?q?=E5=8D=95=E4=B8=8A=E5=8F=96=E5=80=BC=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Reports/ButcherAnalyse_/ButcherAnalyse.cs                | 2 +-
 .../Reports/StatPayAnalyse_/StatPayAnalyse.cs                | 1 +
 B3SheepButcherManage/BO/Bill/StatPay/StatPay.cs              | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs
index 677d0a4..f7325d4 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs
+++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/ButcherAnalyse_/ButcherAnalyse.cs
@@ -78,7 +78,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.ButcherAnalyse_
       _checkbox.Items.Add(new ListItem("过磅日期", "WeighTime"));
       _checkbox.Items.Add(new ListItem("屠宰日期", "Date"));
       _checkbox.Items.Add(new ListItem("阶段号", "PhaseCode"));
-      _checkbox.Items.Add(new ListItem("来源区域", "Zone_Name"));
+      _checkbox.Items.Add(new ListItem("来源地", "Zone_Name"));
       _checkbox.Items.Add(new ListItem("供应商", "Supplier_Name"));
       _checkbox.Items.Add(new ListItem("过磅单号", "WeightBill_ID"));
       _checkbox.Items.Add(new ListItem("收购重量", "WeightBill_BuyWeigh1"));
diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/StatPayAnalyse_/StatPayAnalyse.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/StatPayAnalyse_/StatPayAnalyse.cs
index 415fc3c..a88a1a4 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/StatPayAnalyse_/StatPayAnalyse.cs
+++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Reports/StatPayAnalyse_/StatPayAnalyse.cs
@@ -249,6 +249,7 @@ namespace BWP.Web.Pages.B3SheepButcherManage.Reports.StatPayAnalyse_
       mDisplayOptionHelper.AddOptionItem("结算日期", "bill", "Date", true);
       mDisplayOptionHelper.AddOptionItem("经办人", "bill", "Employee_Name", true);
       mDisplayOptionHelper.AddOptionItem("过磅单号", "bill", "WeightBill_ID", true);
+      mDisplayOptionHelper.AddOptionItem("来源地", "bill", "WeightBill_Zone_Name", true);
       mDisplayOptionHelper.AddOptionItem("过磅时间", "bill", "WeighTime", true);
       mDisplayOptionHelper.AddOptionItem("已付金额", "bill", "PaidMoney", false, true);
       mDisplayOptionHelper.AddOptionItem("应付金额", "bill", "Money", false, true);
diff --git a/B3SheepButcherManage/BO/Bill/StatPay/StatPay.cs b/B3SheepButcherManage/BO/Bill/StatPay/StatPay.cs
index cd40d76..ae33c41 100644
--- a/B3SheepButcherManage/BO/Bill/StatPay/StatPay.cs
+++ b/B3SheepButcherManage/BO/Bill/StatPay/StatPay.cs
@@ -162,6 +162,11 @@ namespace BWP.B3SheepButcherManage.BO
     [Join("WeightBill_ID", "ID")]
     public DateTime? WeighTime { get; set; }
 
+    [LogicName("来源地")]
+    [ReferenceTo(typeof(WeightBill), "Zone_Name")]
+    [Join("WeightBill_ID", "ID")]
+    public string WeightBill_Zone_Name { get; set; }
+
     [LogicName("过磅单收购头数")]
     [ReferenceTo(typeof(WeightBill), "BuyNum")]
     [Join("WeightBill_ID", "ID")]