Browse Source

bug

master
yibo 8 years ago
parent
commit
18f7831a81
2 changed files with 2 additions and 3 deletions
  1. +1
    -1
      B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs
  2. +1
    -2
      B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs

+ 1
- 1
B3SheepButcherManage.Web/Pages/B3SheepButcherManage/Bills/StatPay_/StatPayEdit.cs View File

@ -497,7 +497,7 @@ __DFContainer.getControl('Employee_ID').fill('','');
if (string.IsNullOrEmpty(item.Item2)) if (string.IsNullOrEmpty(item.Item2))
continue; continue;
runner.Global["奖罚依据"] = ""; runner.Global["奖罚依据"] = "";
runner.Execute(item.Item2);
runner.Execute(item.Item1);
var bType = TypeMarshal.AsString(runner.Global["奖罚依据"]); var bType = TypeMarshal.AsString(runner.Global["奖罚依据"]);
if (bType == "羊结算单") if (bType == "羊结算单")
{ {


+ 1
- 2
B3SheepButcherManage/BL/Bill/StatPayBL/StatPayBL.cs View File

@ -319,7 +319,6 @@ namespace BWP.B3SheepButcherManage.BL
dmo.RealNumber = 总头数;//收购头数计算 dmo.RealNumber = 总头数;//收购头数计算
var 榜前急宰重量 = Math.Round(dmo.HurryButcherDetails.Sum(x => (decimal?)x.Weight ?? 0), 2);
if (总头数 == (dmo.WeighBill_BuyNum ?? 0)) if (总头数 == (dmo.WeighBill_BuyNum ?? 0))
{ {
//如果刚好等于过磅单的头数,则重量直接减掉,防止小数点 //如果刚好等于过磅单的头数,则重量直接减掉,防止小数点
@ -329,7 +328,7 @@ namespace BWP.B3SheepButcherManage.BL
{ {
var 过磅单每头猪的重量 = dmo.WeighBill_BuyWeigh1 / dmo.WeighBill_BuyNum; var 过磅单每头猪的重量 = dmo.WeighBill_BuyWeigh1 / dmo.WeighBill_BuyNum;
var 本次榜后结算重量 = Math.Round((总头数 * 过磅单每头猪的重量 ?? 0), 2); var 本次榜后结算重量 = Math.Round((总头数 * 过磅单每头猪的重量 ?? 0), 2);
dmo.RealWeight = 榜前急宰重量 + 本次榜后结算重量;
dmo.RealWeight = 本次榜后结算重量;
} }
//更新到数据库 //更新到数据库
UpdateHeadNumAndWeight(dmo.ID, dmo.RealNumber, dmo.RealWeight); UpdateHeadNumAndWeight(dmo.ID, dmo.RealNumber, dmo.RealWeight);


Loading…
Cancel
Save