1、床垫报价，修复显示清单床网价格错误问题

2、床网报价，修复重算床网报错问题
3、新增床垫床网材料人工合计费用

JLHHJSvr/Com/Model/u_bednet.cs

@@ -79,6 +79,7 @@ namespace JLHHJSvr.Com.Model
         public decimal? sponge_drilling_hr_cost { get; set; }
         public decimal? total_hr_cost { get; set; }
         public decimal? total_mtrl_cost { get; set; }
+        public decimal? total_mtrl_hr_cost { get; set; }
         public decimal? total_fees_cost { get; set; }
         public decimal? total_cost { get; set; }
         public DateTime? createtime { get; set; }

JLHHJSvr/Com/Model/u_mattress.cs

@@ -20,6 +20,7 @@ namespace JLHHJSvr.Com.Model
         public int? woodpallettype { get; set; }
         public decimal? total_hr_cost { get; set; }
         public decimal? total_material_cost { get; set; }
+        public decimal total_mtrl_hr_cost { get; set; }
         public string fees_dscrp { get; set; }
         public decimal? total_fees_cost { get; set; }
         public decimal? total_cost { get; set; }

JLHHJSvr/Excutor/ReCalculateBedNetNoAuditExcutor.cs

@@ -68,8 +68,6 @@ namespace JLHHJSvr.Excutor
                             var springList = helper.GetBedNetSpringList(bednet.bednetid.Value);
                             var bednet_temp = helper.GetBedNet(bednet.bednetid.Value);
 
-                            helper.CalCulateFormula(bednet_temp, mxList,springList);
-
                             helper.SaveBedNet(bednet_temp, mxList,springList);
                         }
                         cmd.Transaction.Commit();

JLHHJSvr/Excutor/SaveBedNetExcutor.cs

@@ -99,17 +99,6 @@ namespace JLHHJSvr.Excutor
                 }
 
                 var helper = HelperBase.GetHelper<BedNetHelper>(cmd,new HelperBase.Context() { tokendata = tokendata});
-
-                try
-                {
-                    helper.CalCulateFormula(request.bednet, request.bednetMx, request.spring);
-                }
-                catch (Exception e)
-                {
-                    rslt.message = e.Message;
-                }
-
-
                 using (cmd.Transaction = con.BeginTransaction())
                 {
                     try

JLHHJSvr/Helper/BedNetHelper.cs

@@ -6,6 +6,7 @@ using JLHHJSvr.LJException;
 using JLHHJSvr.LJFramework.Tools;
 using LJLib.DAL.SQL;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Data.SqlClient;
 using System.Linq;
@@ -2345,6 +2346,9 @@ namespace JLHHJSvr.Helper
 
         public void SaveBedNet(u_bednet bednet, List<u_bednetmx> mxlist, List<u_bednetmx_spring> springList)
         {
+            //
+            CalCulateFormula(bednet, mxlist, springList);
+            // 
             SaveBedNetCheck(bednet, mxlist,springList);
 
             var dtNow = DateTime.Now;

JLHHJSvr/Helper/ERPHelper.cs

@@ -401,6 +401,7 @@ namespace JLHHJSvr.Helper
                         ["piccode"] = mtrl.mattresscode,
                         ["flag"] = 2,
                         ["secflag"] = 1,
+                        ["clcost"] = mtrl.total_mtrl_hr_cost
                     }
                 },
                 ["updateFields"] = fields

JLHHJSvr/Helper/MattressHelper.cs

@@ -257,6 +257,22 @@ namespace JLHHJSvr.Helper
                     }
                 }
             }
+
+            if(mattress.dannum_type == 2)
+            {
+                foreach (var re in BendetReplace)
+                {
+                    foreach (var mx in re.replace.Where(t => new List<string>() { "【总人力费用】", "【总材料成本】" }.Contains(t.label)))
+                    {
+                        mattress.total_mtrl_hr_cost += Convert.ToDecimal(mx.value);
+                    }
+                }
+
+                replacements.TryGetValue("【总人工费用】", out object hrCost);
+                replacements.TryGetValue("【总材料成本】", out object mtrlCost);
+                mattress.total_mtrl_hr_cost += Convert.ToDecimal(hrCost);
+                mattress.total_mtrl_hr_cost += Convert.ToDecimal(mtrlCost);
+            }
         }
         /// <summary>
         /// 记录明细按分组读取厚度变量
@@ -2586,7 +2602,7 @@ namespace JLHHJSvr.Helper
                             mattressrelcode, other_rate, flag, dept_profitrate_rangli, profitrate_point, if_moneyrate, discount, if_m_chai,  if_z_chai, if_d_chai, if_n_butao, 
                             if_w_butao, if_m_wbutao_way, s_cover_qty, z_cover_qty, x_cover_qty, biandai_qty, s_m_cover_qty, z_m_cover_qty, x_m_cover_qty, chaizhuang_point, 
                             haimian_point, if_zhedie_type, qr_auditingrep, qr_auditingdate, if_bcp_type, zhizao_amt, foreign_cost_bz,  cubage, extras_cost, extras_cost_dscrp, 
-                            parentid, flag, xd_flag, dannum_type,dannum_cost1,dannum_cost2, dannum_cost3, dannum_cost4, dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4,version";
+                            parentid, flag, xd_flag, dannum_type,dannum_cost1,dannum_cost2, dannum_cost3, dannum_cost4, dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4,version,total_mtrl_hr_cost";
             var fieldsMx = "mattressmxid,mattressid,formulaid,formula,replace_formula,if_success,priceunit,shrinkage,mtrlid,price,gram_weight,cloth_width,if_inputqty,qty ,costamt,if_areaprice,thickness,chastr,xu,useqty,useformula,replace_useformula,gydscrp,mattress_width,mattress_length";
             var fieldsExtra = "mattressmxid,mattressid, extraid, extramxid, extraname, price, qty, dscrp, mtrlid";
 

JLHWEB/src/views/quote/bednetQuote/index.vue

@@ -455,7 +455,7 @@ const action: detailAction[] = [
       }
 
       let list = curRecords.map((item: any) => {
-        return { mattressid: Number(item.mattressid) };
+        return { bednetid: Number(item.bednetid) };
       });
 
       ElMessageBox.confirm(`是否确定要批重算${curRecords.length}张床垫报价单吗?`, "询问", {