核价后台：1、床垫清单，生成床网配置时，取消宽、高减2的逻辑

2、生成L1物料时新增zxmtrlmode、piccode信息

JLHHJSvr/DataStore/web_mattress_choose.xml

@@ -62,6 +62,9 @@ FROM u_mattress
 	<when notnull="@arg_deptid">
 		u_mattress.deptid = @arg_deptid
 	</when>
+	<when notnull="@arg_parentid" arg_parentid!="0">
+		u_mattress.parentid = @arg_parentid
+	</when>
 	<!-- <when $user_deptstr!="-1">
 		u_mattress.createby in ($$user_outrepstr$$)
 	</when>

JLHHJSvr/Excutor/CreatMtrldefExcutor.cs

@@ -37,7 +37,7 @@ namespace JLHHJSvr.Excutor
                 foreach (var mattressid in request.list)
                 {
                     var mattress = new u_mattress();
-                    if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", 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,erp_configcodetype,dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4") != 1)
+                    if (DbSqlHelper.SelectOne(cmd, "u_mattress", "mattressid = @mattressid", new Dictionary<string, object>() { { "mattressid", 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,erp_configcodetype,dijia_cost1,dijia_cost2,dijia_cost3,dijia_cost4,old_mtrlname,mattresscode") != 1)
                     {
                         rslt.ErrMsg = "床垫报价单匹配失败";
                         return;

JLHHJSvr/Helper/BedNetHelper.cs

@@ -2521,11 +2521,11 @@ namespace JLHHJSvr.Helper
             qdList.Add(new u_bednet_qingdan()
             {
                 pzname = "规格",
-                pznamemx = $"{bednet.mattress_width - 2}*{bednet.mattress_length}*{bednet.mattress_height - 2}",
+                pznamemx = $"{bednet.mattress_width}*{bednet.mattress_length}*{bednet.mattress_height}",
                 amt = 0,
                 useqty = 0
             });
-            specifications = $"{bednet.mattress_width - 2}*{bednet.mattress_length}";
+            specifications = $"{bednet.mattress_width}*{bednet.mattress_length}";
             qdList.Add(new u_bednet_qingdan()
             {
                 pzname = "排列",

JLHHJSvr/Helper/ERPHelper.cs

@@ -342,7 +342,7 @@ namespace JLHHJSvr.Helper
         /// </summary>
         /// <param name="mtrl">核价物料资料</param>
         /// <returns>错误信息</returns>
-        public string SaveMtrldef(u_mattress mtrl, List<u_mattress_interface> interfaceList = null, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configcode,configname,model,configcodetype,moddate,modemp,ifautodd")
+        public string SaveMtrldef(u_mattress mtrl, List<u_mattress_interface> interfaceList = null, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configcode,configname,model,configcodetype,moddate,modemp,ifautodd,piccode,zxmtrlmode")
         {
             var errMsg = string.Empty;
 
@@ -394,7 +394,9 @@ namespace JLHHJSvr.Helper
                         ["mtrl_config2"] = configure2,
                         ["moddate"] = DateTime.Now,
                         ["modemp"] = context.tokendata.username,
-                        ["ifautodd"] = 1
+                        ["ifautodd"] = 1,
+                        ["zxmtrlmode"] = mtrl.old_mtrlname,
+                        ["piccode"] = mtrl.mattresscode
                     }
                 },
                 ["updateFields"] = fields

JLHHJSvr/Helper/MattressHelper.cs

@@ -1694,7 +1694,7 @@ namespace JLHHJSvr.Helper
             }
 
             var mattress = new u_mattress() { mattressid = mattressid };
-            var fields = @"mattressid,mattressname,deptid,mattresstypeid,mattresscode,mattress_width,mattress_length,mattress_height,packtype,packqty,woodpallettype,
+            var fields = @"mattressid,mattressname,deptid,mattresstypeid,mattresscode,mattress_width,mattress_length,mattress_height,packtype,packqty,woodpallettype,old_mtrlname,
                         total_hr_cost,total_material_cost,fees_dscrp,total_fees_cost,taxrate,commissionrate,commission,fob,profitrate,profitrate_point,butao_point,chaizhuang_point,
                         haimian_point,dannum_rate,hrcost,biandaicost,zhizao_amt,guanli_rate,discount,extras_cost,dept_profitrate,dept_profitrate_rangli,moneyrate,mattressrelcode,
                         flag,auditingrep,auditingdate,createtime,createby,total_cost,nottax_factory_cost,nottax_dept_cost,taxes,dept_cost,foreign_cost,foreign_cost_bz,