From 18f7831a81d5726a74ceae0c84061367f9516b5f Mon Sep 17 00:00:00 2001
From: yibo <361071264@qq.com>
Date: Wed, 7 Nov 2018 20:21:01 +0800
Subject: [PATCH] bug

---
 .../Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs   | 2 +-
 B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs            | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs
index a857fab..3223ae4 100644
--- a/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs
+++ b/B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs
@@ -497,7 +497,7 @@ __DFContainer.getControl('Employee_ID').fill('','');
         if (string.IsNullOrEmpty(item.Item2))
           continue;
         runner.Global["奖罚依据"] = "";
-        runner.Execute(item.Item2);
+        runner.Execute(item.Item1);
         var bType = TypeMarshal.AsString(runner.Global["奖罚依据"]);
         if (bType == "羊结算单")
         {
diff --git a/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs b/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs
index 83a3316..aef00f3 100644
--- a/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs
+++ b/B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs
@@ -319,7 +319,6 @@ namespace BWP.B3SheepButcherManage.BL
 
       dmo.RealNumber = 总头数;//收购头数计算
 
-      var 榜前急宰重量 = Math.Round(dmo.HurryButcherDetails.Sum(x => (decimal?)x.Weight ?? 0), 2);
       if (总头数 == (dmo.WeighBill_BuyNum ?? 0))
       {
         //如果刚好等于过磅单的头数，则重量直接减掉，防止小数点
@@ -329,7 +328,7 @@ namespace BWP.B3SheepButcherManage.BL
       {
         var 过磅单每头猪的重量 = dmo.WeighBill_BuyWeigh1 / dmo.WeighBill_BuyNum;
         var 本次榜后结算重量 = Math.Round((总头数 * 过磅单每头猪的重量 ?? 0), 2);
-        dmo.RealWeight = 榜前急宰重量 + 本次榜后结算重量;
+        dmo.RealWeight = 本次榜后结算重量;
       }
       //更新到数据库
       UpdateHeadNumAndWeight(dmo.ID, dmo.RealNumber, dmo.RealWeight);