1、床垫报价-修复生成物料底价未填写报错问题

2、床垫报价-内布套新增可以设置布局

JLHHJSvr/Excutor/UpdateMtrlPriceExcutor.cs

@@ -32,7 +32,7 @@ namespace JLHHJSvr.Excutor
 
 
                 var mattress = new u_mattress();
-                if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", request.mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid") != 1)
+                if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", request.mattressid } }, mattress, "erp_mtrlid,erp_mtrlcode, erp_mtrlname, erp_mtrlmode, erp_mtrltypeid, erp_mtrltype, erp_mtrlunit, erp_mtrlengname,nottax_factory_cost,dept_profitrate,dept_profitrate_rangli,commission,taxes,fob,extras_cost,mattresstypeid,mattresscode") != 1)
                 {
                     rslt.ErrMsg = "床垫报价单匹配失败";
                     return;

JLHHJSvr/Helper/ERPHelper.cs

@@ -346,6 +346,12 @@ namespace JLHHJSvr.Helper
         {
             var errMsg = string.Empty;
 
+            if(mtrl.dijia_cost1 == null || mtrl.dijia_cost2 == null || mtrl.dijia_cost3 == null || mtrl.dijia_cost4 == null)
+            {
+                errMsg = $"床垫报价:{mtrl.mattresscode}未生成底价,请检查!";
+                return errMsg;
+            }
+
             var configure2 = (JArray)null;
             if (interfaceList != null)
             {
@@ -413,10 +419,10 @@ namespace JLHHJSvr.Helper
             {
                 mtrl.erp_mtrlid = (l1Rslt.GetValue("mtrlids") as JArray)[0].Value<int>();
                 mtrl.erp_mtrlcode = (l1Rslt.GetValue("mtrlcodes") as JArray)[0].Value<string>();
-                var caller = new StackTrace().GetFrame(1).GetMethod();
+                //var caller = new StackTrace().GetFrame(1).GetMethod();
                 //Trace.Write($"Update erp_mtrlid={mtrl.erp_mtrlid} WHERE mattressid={mtrl.mattressid} AND erp_mtrlcode={mtrl.erp_mtrlcode}");
                 //DbSqlHelper.Update(cmd, mtrl, "erp_mtrlid");
-                Trace.Write($"Called By {caller.DeclaringType?.Name}.{caller.Name},INFOS:erp_mtrlid = {mtrl.erp_mtrlid},erp_mtrlcod = {mtrl.erp_mtrlcode},mattressid = {mtrl.mattressid}");
+                //Trace.Write($"Called By {caller.DeclaringType?.Name}.{caller.Name},INFOS:erp_mtrlid = {mtrl.erp_mtrlid},erp_mtrlcod = {mtrl.erp_mtrlcode},mattressid = {mtrl.mattressid}");
             }
             return errMsg;
         }

JLHWEB/src/views/quote/mattressQuote/detail.vue

@@ -582,7 +582,6 @@
         :columns="columnsMxInnerClothLayer"
         :dwname="DwnameEnum.mattressQuoteMxInnerClothLayer"
         :table-props="tableProps_mx"
-        :tool-button="[]"
         :auto-load-layout="false"
         collapseButtons
         :footer-method="footerMethod"