1、床垫报价-修复已审核副规格报价重算报价不生效问题

JLHHJSvr/Helper/MattressHelper.cs

@@ -2598,8 +2598,6 @@ namespace JLHHJSvr.Helper
                 fields += ",erp_mtrlcode,erp_mtrlid,erp_configcodetype, erp_mtrlengname, erp_mtrlmode, erp_mtrlname, erp_mtrltype, erp_mtrltypeid, erp_mtrlunit, erp_piccode";
             }
 
-            bool isSkip = false;
-
             if (mattress.mattressid <= 0)
             {
                 // 新建
@@ -2628,32 +2626,23 @@ namespace JLHHJSvr.Helper
                 AutoInit.AutoInitS(mattress);
                 // 
                 mattress.version++;
-                if (mattress.parentid > 0)
-                {
-                    // 副规格修改
-                    isSkip = mattress.flag == 1 || mattress.yw_flag == 1 || mattress.xd_flag == 1;
-                }
-
-                if(!isSkip)
-                {
-                    DbSqlHelper.Update(cmd, "u_mattress", null, mattress, "mattressid", fields);
+                DbSqlHelper.Update(cmd, "u_mattress", null, mattress, "mattressid", fields);
 
-                    // 删除所有明细
-                    cmd.CommandText = @"DELETE u_mattress_mx_mtrl WHERE mattressid = @mattressid";
-                    cmd.Parameters.Clear();
-                    cmd.Parameters.AddWithValue("@mattressid", mattress.mattressid);
-                    cmd.ExecuteNonQuery();
+                // 删除所有明细
+                cmd.CommandText = @"DELETE u_mattress_mx_mtrl WHERE mattressid = @mattressid";
+                cmd.Parameters.Clear();
+                cmd.Parameters.AddWithValue("@mattressid", mattress.mattressid);
+                cmd.ExecuteNonQuery();
 
-                    // 删除所有额外费用明细
-                    cmd.CommandText = @"DELETE u_mattress_mx_extra WHERE mattressid = @mattressid";
-                    cmd.Parameters.Clear();
-                    cmd.Parameters.AddWithValue("@mattressid", mattress.mattressid);
-                    cmd.ExecuteNonQuery();
-                }
+                // 删除所有额外费用明细
+                cmd.CommandText = @"DELETE u_mattress_mx_extra WHERE mattressid = @mattressid";
+                cmd.Parameters.Clear();
+                cmd.Parameters.AddWithValue("@mattressid", mattress.mattressid);
+                cmd.ExecuteNonQuery();
             }
 
             // 插入明细内容
-            if (mattress.mxList != null && mattress.mxList.Count > 0 && !isSkip)
+            if (mattress.mxList != null && mattress.mxList.Count > 0)
             {
                 foreach (var item in mattress.mxList)
                 {
@@ -2670,7 +2659,7 @@ namespace JLHHJSvr.Helper
             }
 
             // 插入特殊工艺
-            if (mattress.extraList != null && mattress.extraList.Count > 0 && !isSkip)
+            if (mattress.extraList != null && mattress.extraList.Count > 0)
             {
                 foreach (var item in mattress.extraList)
                 {
@@ -2684,7 +2673,7 @@ namespace JLHHJSvr.Helper
             }
 
             // 特殊费用
-            if (mattress.extraCostList != null && mattress.extraCostList.Count > 0 && !isSkip)
+            if (mattress.extraCostList != null && mattress.extraCostList.Count > 0)
             {
                 foreach (var item in mattress.extraCostList)
                 {
@@ -2698,33 +2687,30 @@ namespace JLHHJSvr.Helper
             }
 
             // 更新计价历史
-            if (!isSkip)
-            {
-                var hisprice = new u_his_price
-                {
-                    bednetid_mattressid = mattress.mattressid,
-                    typeid = 1,
-                    cmpdate = context.opdate,
-                    cmpemp = context.tokendata.username,
-                    nottax_dept_cost = mattress.nottax_dept_cost,
-                    dept_cost = mattress.dept_cost,
-                    foreign_cost = mattress.foreign_cost,
-                    dannum_cost1 = mattress.dannum_cost1,
-                    dannum_cost2 = mattress.dannum_cost2,
-                    dannum_cost3 = mattress.dannum_cost3,
-                    dannum_cost4 = mattress.dannum_cost4,
-                    dijia_cost1 = mattress.dijia_cost1,
-                    dijia_cost2 = mattress.dijia_cost2,
-                    dijia_cost3 = mattress.dijia_cost3,
-                    dijia_cost4 = mattress.dijia_cost4,
-                    fob = mattress.fob,
-                    cabinet_type = mattress.cabinet_type,
-                    taxrate = mattress.taxrate,
-                    commission = mattress.commission
-                };
-                var fieldsHs = "bednetid_mattressid, typeid, cmpdate, cmpemp, nottax_dept_cost, dept_cost, foreign_cost, dannum_cost1, dannum_cost2, dannum_cost3, dannum_cost4,dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4,fob,cabinet_type,taxrate,commission";
-                DbSqlHelper.Insert(cmd, "u_his_price", null, hisprice, fieldsHs);
-            }
+            var hisprice = new u_his_price
+            {
+                bednetid_mattressid = mattress.mattressid,
+                typeid = 1,
+                cmpdate = context.opdate,
+                cmpemp = context.tokendata.username,
+                nottax_dept_cost = mattress.nottax_dept_cost,
+                dept_cost = mattress.dept_cost,
+                foreign_cost = mattress.foreign_cost,
+                dannum_cost1 = mattress.dannum_cost1,
+                dannum_cost2 = mattress.dannum_cost2,
+                dannum_cost3 = mattress.dannum_cost3,
+                dannum_cost4 = mattress.dannum_cost4,
+                dijia_cost1 = mattress.dijia_cost1,
+                dijia_cost2 = mattress.dijia_cost2,
+                dijia_cost3 = mattress.dijia_cost3,
+                dijia_cost4 = mattress.dijia_cost4,
+                fob = mattress.fob,
+                cabinet_type = mattress.cabinet_type,
+                taxrate = mattress.taxrate,
+                commission = mattress.commission
+            };
+            var fieldsHs = "bednetid_mattressid, typeid, cmpdate, cmpemp, nottax_dept_cost, dept_cost, foreign_cost, dannum_cost1, dannum_cost2, dannum_cost3, dannum_cost4,dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4,fob,cabinet_type,taxrate,commission";
+            DbSqlHelper.Insert(cmd, "u_his_price", null, hisprice, fieldsHs);
             // 处理子规格
             ProcessSubSpecs(mattress, ifErp);
             // 解锁
@@ -2873,6 +2859,8 @@ namespace JLHHJSvr.Helper
 
             foreach (var child in subspecsList)
             {
+                // 已经审核的不进行再次保存/修改
+                if (child.flag == 1 || child.yw_flag == 1 || child.xd_flag == 1) continue;
                 InitMattressSubSpecs(mattress, child);
 
                 MattressCalculateCost(child, child.mxList, child.extraList, child.extraCostList);