核价后台：1、床网公式显示损耗率

JLHHJSvr/Helper/BedNetHelper.cs

@@ -359,11 +359,17 @@ namespace JLHHJSvr.Helper
                     mx.hard_around_mtrl_cost = Calculate(mx_formula, out rp_formula, "四周加硬材料成本").DecimalValue;
                     mx.hard_around_mtrl_cost_replace_formula = rp_formula;
 
+                    var _formula = bednet.hard_around_mtrl_formula.Replace("【弹簧重/个】", "【加硬弹簧重/个】").Replace("【弹簧重】", "【加硬弹簧重】");
                     #region 获取损耗率，计算
                     if (isNewFormula)
                     {
                         decimal? _rate = GetSumhaoRate(0);
                         bednet.hard_around_mtrl_cost += mx.hard_around_mtrl_cost * (1 + _rate);
+                        if (_rate != 0)
+                        {
+                            _formula = "(" + _formula + ")" + "x" + "【四周加硬损耗率】";
+                            AddKeyValue("四周加硬损耗率", (1 + _rate));
+                        }
                     }
                     else
                     {
@@ -371,7 +377,7 @@ namespace JLHHJSvr.Helper
                     }
                     #endregion
                     AddKeyValue("四周加硬材料成本", bednet.hard_around_mtrl_cost);
-                    AddFormulaMxKeyValue("【四周加硬材料成本】", bednet.hard_around_mtrl_formula.Replace("【弹簧重/个】", "【加硬弹簧重/个】").Replace("【弹簧重】", "【加硬弹簧重】"));
+                    AddFormulaMxKeyValue("【四周加硬材料成本】", _formula);
                 }
                 else
                 {
@@ -407,6 +413,7 @@ namespace JLHHJSvr.Helper
 
 
                     #region 获取损耗率，计算
+                    var _formula = bednet.fabrics1_mtrl_formula;
                     if (isNewFormula)
                     {
                         var mtrlPrice = new u_mtrl_price() { mtrlid = mx.fabrics1_mtrlid };
@@ -416,11 +423,16 @@ namespace JLHHJSvr.Helper
                         {
                             decimal? _rate = GetSumhaoRate(mtrlPrice.mtrltype.Value);
                             bednet.fabrics1_mtrl_cost = bednet.fabrics1_mtrl_cost * (1 + _rate);
+                            if (_rate != 0)
+                            {
+                                _formula = "(" + _formula + ")" + "x" + "【入袋无纺布损耗率】";
+                                AddKeyValue("入袋无纺布损耗率", (1 + _rate));
+                            }
                         }
                     }
                     #endregion
                     AddKeyValue("入袋无纺布材料成本", bednet.fabrics1_mtrl_cost);
-                    AddFormulaMxKeyValue("【入袋无纺布材料成本】", bednet.fabrics1_mtrl_formula);
+                    AddFormulaMxKeyValue("【入袋无纺布材料成本】", _formula);
                 }
                 #endregion 计算 入袋无纺布材料成本 结束
 
@@ -450,6 +462,7 @@ namespace JLHHJSvr.Helper
                     bednet.fabrics2_mtrl_cost += mx.fabrics2_mtrl_cost;
 
                     #region 获取损耗率，计算
+                    var _formula = bednet.fabrics2_mtrl_formula;
                     if(isNewFormula)
                     {
                         var mtrlPrice = new u_mtrl_price() { mtrlid = mx.fabrics2_mtrlid };
@@ -459,11 +472,16 @@ namespace JLHHJSvr.Helper
                         {
                             decimal? _rate = GetSumhaoRate(mtrlPrice.mtrltype.Value);
                             bednet.fabrics2_mtrl_cost = bednet.fabrics2_mtrl_cost * (1 + _rate);
+                            if (_rate != 0)
+                            {
+                                _formula = "(" + _formula + ")" + "x" + "【底面无纺布损耗率】";
+                                AddKeyValue("底面无纺布损耗率", (1 + _rate));
+                            }
                         }
                     }
                     #endregion
                     AddKeyValue("底面无纺布材料成本", bednet.fabrics2_mtrl_cost);
-                    AddFormulaMxKeyValue("【底面无纺布材料成本】", bednet.fabrics2_mtrl_formula);
+                    AddFormulaMxKeyValue("【底面无纺布材料成本】", _formula);
                 }
                 #endregion 计算 底面无纺布材料成本 结束