1、修复软床报价存在其他物料保存报错问题

2、优化床垫报价物料弹窗没有显示erp物料信息问题

JLHHJSvr/DataStore/web_mtrl_choose.xml

@@ -20,13 +20,14 @@
 		ISNULL(u_mtrl_price_pricelist.price_formula, '') AS price_formula,
 		u_mtrl_price.erp_mtrlid,
 		u_mtrl_price.extra_cost,
-		SPACE(200) AS erp_mtrlcode,
-		SPACE(200) AS erp_mtrlname,
-		SPACE(200) AS erp_mtrlmode,
-		SPACE(200) AS erp_unit,
-		SPACE(200) AS erp_mtrlengname
+		u_mtrldef.mtrlcode AS erp_mtrlcode,
+		u_mtrldef.mtrlname AS erp_mtrlname,
+		u_mtrldef.mtrlmode AS erp_mtrlmode,
+		u_mtrldef.unit AS erp_unit,
+		u_mtrldef.mtrlengname AS erp_mtrlengname
 		FROM u_mtrl_price
 		LEFT JOIN u_mtrl_price_pricelist ON u_mtrl_price.mtrlid = u_mtrl_price_pricelist.mtrlid
+		LEFT JOIN u_mtrldef ON u_mtrl_price.erp_mtrlid = u_mtrldef.mtrlid
 	</selectstr>
 	<where>
 		<when notnull="@keyword">

JLHHJSvr/Helper/SoftBedHelper.cs

@@ -416,6 +416,7 @@ namespace JLHHJSvr.Helper
                 }
                 foreach (var mx in softbed.mxList)
 				{
+                    if (mx.has_type == 8) continue;
 					if(!bomSet.TryGetValue(mx.has_type, out var bomList))
 					{
 						throw new LJCommonException($"保存失败,原因:{configureList[mx.has_type].contfigtypename}没有设置物料清单");