1、床垫报价-修复勾选中拆后保存失败问题

2、床垫清单-修复因操作导致物料编码丢失问题
3、床网报价-修复弹簧名称显示不正确问题

JLHHJSvr/DataStore/web_bednet_mx_add.xml

@@ -64,29 +64,32 @@
 		From u_bednetmx
 		left outer join (
 			SELECT u_spring.springid,
-			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
-			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
-			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
-			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
-			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+			CASE WHEN u_spring.springname <> '' THEN u_spring.springname ELSE
+				left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
+				left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
+				left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
+				left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
+				left(rtrim(cast(u_spring.cyclenum  as char(10))),4) END as name
 			FROM u_spring
 		) vv_spring on vv_spring.springid = u_bednetmx.springid
 		left outer join (
 			SELECT u_spring.springid,
+			CASE WHEN u_spring.springname <> '' THEN u_spring.springname ELSE
 			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
 			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
 			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
 			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
-			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4) END as name
 			FROM u_spring
 		) as vv_pocket_spring on vv_pocket_spring.springid = u_bednetmx.pocket_around_springid
 		left outer join (
 			SELECT u_spring.springid,
+			CASE WHEN u_spring.springname <> '' THEN u_spring.springname ELSE
 			left(rtrim(cast(u_spring.line_diameter as char(10))),4) + '/'+
 			left(rtrim(cast(u_spring.height as char(10))),4) + '/'+
 			left(rtrim(cast(u_spring.caliber  as char(10))),4) + '/'+
 			left(rtrim(cast(u_spring.center_diameter  as char(10))),4) + '/'+
-			left(rtrim(cast(u_spring.cyclenum  as char(10))),4)   as name
+			left(rtrim(cast(u_spring.cyclenum  as char(10))),4) END as name
 			FROM u_spring
 		) as vv_hard_spring on vv_hard_spring.springid = u_bednetmx.hard_around_springid
 		CROSS JOIN (

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -38,7 +38,7 @@ namespace JLHHJSvr.Helper
                 throw new LJCommonException("错误的床垫id");
             }
 
-            DbSqlHelper.Update(cmd, mattress, "erp_mtrlid,erp_mtrltypeid,erp_mtrlcode,erp_mtrlname,erp_mtrlmode,erp_mtrltype,erp_mtrlunit,erp_mtrlengname,erp_configcodetype,old_mtrlname");
+            DbSqlHelper.Update(cmd, mattress, "erp_mtrltypeid,erp_mtrlmode,erp_mtrltype,erp_mtrlunit,erp_mtrlengname,erp_configcodetype,old_mtrlname");
             //
             var caller = new StackTrace().GetFrame(1).GetMethod();
             Trace.Write($"Called By {caller.DeclaringType?.Name}.{caller.Name},INFOS:erp_mtrlid = {mattress.erp_mtrlid},erp_mtrlcod = {mattress.erp_mtrlcode},mattressid = {mattress.mattressid}");

JLHHJSvr/Helper/MattressHelper.cs

@@ -3177,7 +3177,12 @@ namespace JLHHJSvr.Helper
             {
                 foreach(var mx in mattress.extraList)
                 {
-                    var sumQty = mattress.mxList.Where(t => t.mtrlname.Trim().Equals(mx.extraname.Trim())).Sum(t => t.qty ?? 0);
+                    var sumQty = mattress.mxList
+                                    .Where(t => t != null &&
+                                               !string.IsNullOrEmpty(t.mtrlname) &&
+                                               !string.IsNullOrEmpty(mx.extraname) &&
+                                               t.mtrlname.Trim().Equals(mx.extraname.Trim()))
+                                    .Sum(t => t?.qty ?? 0);
                     mx.qty = sumQty;
                 }
             }