核价后台：1、修复床垫报价，折叠款公式计算错误问题；

2、修复床垫报价主副规格保存问题

JLHHJSvr/Excutor/SaveMattressExcutor.cs

@@ -128,32 +128,32 @@ namespace JLHHJSvr.Excutor
                         rslt.mattressid = request.mattress.mattressid;
                         rslt.mattresscode = request.mattress.mattresscode;
 
-                        //var subspecsList = helper.GetMattressSubspecs(request.mattress.mattressid);
-
-                        //if (subspecsList.Count > 0)
-                        //{
-
-                        //    foreach (var submx in subspecsList)
-                        //    {
-                        //        // 删除副规格特殊工艺表
-                        //        cmd.CommandText = @"DELETE u_mattress_mx_extra WHERE mattressid = @mattressid";
-                        //        cmd.Parameters.Clear();
-                        //        cmd.Parameters.AddWithValue("@mattressid", submx.mattressid);
-                        //        cmd.ExecuteNonQuery();
-
-                        //        // 删除副规格明细
-                        //        cmd.CommandText = @"DELETE u_mattress_mx_mtrl WHERE mattressid = @mattressid";
-                        //        cmd.Parameters.Clear();
-                        //        cmd.Parameters.AddWithValue("@mattressid", submx.mattressid);
-                        //        cmd.ExecuteNonQuery();
-
-                        //        // 删除副规格
-                        //        cmd.CommandText = @"DELETE u_mattress WHERE mattressid = @mattressid";
-                        //        cmd.Parameters.Clear();
-                        //        cmd.Parameters.AddWithValue("@mattressid", submx.mattressid);
-                        //        cmd.ExecuteNonQuery();
-                        //    }
-                        //}
+                        var subspecsList = helper.GetMattressSubspecs(request.mattress.mattressid);
+
+                        if (subspecsList.Count > 0)
+                        {
+
+                            foreach (var submx in subspecsList)
+                            {
+                                // 删除副规格特殊工艺表
+                                cmd.CommandText = @"DELETE u_mattress_mx_extra WHERE mattressid = @mattressid";
+                                cmd.Parameters.Clear();
+                                cmd.Parameters.AddWithValue("@mattressid", submx.mattressid);
+                                cmd.ExecuteNonQuery();
+
+                                // 删除副规格明细
+                                cmd.CommandText = @"DELETE u_mattress_mx_mtrl WHERE mattressid = @mattressid";
+                                cmd.Parameters.Clear();
+                                cmd.Parameters.AddWithValue("@mattressid", submx.mattressid);
+                                cmd.ExecuteNonQuery();
+
+                                // 删除副规格
+                                cmd.CommandText = @"DELETE u_mattress WHERE mattressid = @mattressid";
+                                cmd.Parameters.Clear();
+                                cmd.Parameters.AddWithValue("@mattressid", submx.mattressid);
+                                cmd.ExecuteNonQuery();
+                            }
+                        }
 
                         if (request.subspecs != null && request.subspecs.Count > 0)
                         {

JLHHJSvr/Helper/MattressHelper.cs

@@ -1512,8 +1512,16 @@ namespace JLHHJSvr.Helper
 
             #region 总成本-车间成本
             CalCulateDanNum(mattress, typename);
-            mattress.total_cost = CalculateVarFormula("车间成本").DecimalValue;
-            if (mattress.if_zhedie_type == 1) mattress.total_cost *= 2;
+            if (mattress.if_zhedie_type == 1)
+            {
+                var _formula = formula_replacements["【车间成本】"];
+                AddFormulaKeyValue("车间成本", "( " + _formula + " ) * 2");
+                mattress.total_cost = CalculateVarFormula("车间成本").DecimalValue;
+            }
+            else
+            {
+                mattress.total_cost = CalculateVarFormula("车间成本").DecimalValue;
+            }
             AddKeyValue("车间成本", mattress.total_cost);
             #endregion
 
@@ -1824,7 +1832,7 @@ namespace JLHHJSvr.Helper
         public List<u_mattress> GetMattressSubspecs(int mattressid)
         {
             var list = new List<u_mattress>();
-            var outputFields = @"mattressid,mattresscode,mattress_width,mattress_length,mattress_height,mattressname,mattressrelcode,parentid";
+            var outputFields = @"mattressid,mattresscode,mattress_width,mattress_length,mattress_height,mattressname,mattressrelcode,parentid,erp_mtrlid,erp_mtrlcode";
             var selectStr = @"SELECT 
 		                            mattressid,
 		                            mattresscode,