|
@@ -1063,22 +1063,24 @@ namespace JLHHJSvr.Helper
|
|
|
var _costamt = t.costamt.Value;
|
|
|
if (isNewFormula)
|
|
|
{
|
|
|
+ decimal _dannum_rate = 0;
|
|
|
#region 计算损耗率
|
|
|
switch (mattress.dannum_type.Value)
|
|
|
{
|
|
|
case 1:
|
|
|
- _costamt = _costamt * (1 + t.dannum1_rate.Value);
|
|
|
+ if (t.dannum1_rate != null) _dannum_rate = t.dannum1_rate.Value;
|
|
|
break;
|
|
|
case 2:
|
|
|
- _costamt = _costamt * (1 + t.dannum2_rate.Value);
|
|
|
+ if (t.dannum2_rate != null) _dannum_rate = t.dannum2_rate.Value;
|
|
|
break;
|
|
|
case 3:
|
|
|
- _costamt = _costamt * (1 + t.dannum3_rate.Value);
|
|
|
+ if (t.dannum3_rate != null) _dannum_rate = t.dannum3_rate.Value;
|
|
|
break;
|
|
|
case 4:
|
|
|
- _costamt = _costamt * (1 + t.dannum4_rate.Value);
|
|
|
+ if (t.dannum4_rate != null) _dannum_rate = t.dannum4_rate.Value;
|
|
|
break;
|
|
|
}
|
|
|
+ _costamt = _costamt * (1 + _dannum_rate);
|
|
|
#endregion
|
|
|
|
|
|
// 新公式排除床网计算
|