核价后台：1、修复弹簧排列数计算问题

JLHHJSvr/DataStore/web_spring_define_choose.xml

@@ -34,6 +34,7 @@
 			AS springname,
 			      u_spring.comperssion_rate,
 			u_springtype.springtypecode,
+			u_spring.height_original,
 			CASE 
 				WHEN hardness <= 8 THEN '软'
 				WHEN hardness <= 11 THEN '中软'
@@ -88,6 +89,7 @@
 		<field field="hardness_level" width="50">软硬程度</field>
 		<field field="line_diameter" datatype="number">线径MM</field>
 		<field field="height" datatype="number">高度CM</field>
+		<field field="height_original" datatype="number">入袋前高度CM</field>
 		<field field="caliber" datatype="number">口经CM</field>
 		<field field="center_diameter" datatype="number">中心直径CM</field>
 		<field field="cyclenum" datatype="number">圈数</field>

JLHHJSvr/Helper/BedNetHelper.cs

@@ -2892,13 +2892,13 @@ namespace JLHHJSvr.Helper
                 #endregion 计算 海绵包边材料成本 结束
 
                 #region 弹簧排列个数-宽
-                mx.spring_qty_width = Convert.ToInt32(CalculateVarFormula("弹簧排列个数-宽").DecimalValue);
+                mx.spring_qty_width = Convert.ToInt32(CalculateVarFormula("计算弹簧排列个数-宽").DecimalValue);
                 AddKeyValue("弹簧排列个数-宽", mx.spring_qty_width);
                 #endregion
 
 
                 #region 弹簧排列个数-长
-                mx.spring_qty_length = Convert.ToInt32(CalculateVarFormula("弹簧排列个数-长").DecimalValue);
+                mx.spring_qty_length = Convert.ToInt32(CalculateVarFormula("计算弹簧排列个数-长").DecimalValue);
                 AddKeyValue("弹簧排列个数-长", mx.spring_qty_length);
                 #endregion
             }