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")]