补充提交

JLHHJSvr/DataStore/web_mattress_mx.xml

@@ -39,7 +39,9 @@
 			u_mattress_mx_mtrl.replace_useformula ,
 			u_mattress_mx_mtrl.gydscrp,
 			u_mattress_mx_mtrl.mattress_width,
-			u_mattress_mx_mtrl.mattress_length
+			u_mattress_mx_mtrl.mattress_length,
+			CASE WHEN u_mattress_formula.formulatype = 99 THEN vv_bednetmx.spring_qty_width ELSE 0 END AS spring_qty_width,
+			CASE WHEN u_mattress_formula.formulatype = 99 THEN vv_bednetmx.spring_qty_length ELSE 0 END AS spring_qty_length
 		From u_mattress_mx_mtrl
 		Left join u_mattress_formula On u_mattress_formula.formulaid = u_mattress_mx_mtrl.formulaid 
 		left outer join u_mtrl_price on u_mattress_mx_mtrl.mtrlid = u_mtrl_price.mtrlid
@@ -63,6 +65,12 @@
 			FROM u_bednet
 			inner join u_bednet_type ON u_bednet_type.bednettypeid = u_bednet.bednettypeid
 		) as vv_bednet ON vv_bednet.bednetid = u_mattress_mx_mtrl.mtrlid
+		Left OUTER JOIN (
+			SELECT top 1 u_bednetmx.bednetid,
+			u_bednetmx.spring_qty_width,
+			u_bednetmx.spring_qty_length
+			FROM u_bednetmx 
+		) as vv_bednetmx ON vv_bednet.bednetid = u_mattress_mx_mtrl.mtrlid
 	</selectstr>
 	<where>
 		<when notnull="@arg_mattressid">

JLHHJSvr/Excutor/ReCalculateERPCostExcutor.cs

@@ -79,7 +79,7 @@ namespace JLHHJSvr.Excutor
 
                                 if (mattress_temp.erp_mtrlid > 0)
                                 {
-                                    string errmsg = l1Helper.SaveMtrldef(mattress_temp, null, "mtrlname");
+                                    string errmsg = l1Helper.SaveMtrldef(mattress_temp, null, "");
                                     if (!string.IsNullOrEmpty(errmsg)) throw new LJCommonException(errmsg);
                                 }
 

JLHHJSvr/Excutor/SaveMattressExcutor.cs

@@ -179,7 +179,7 @@ namespace JLHHJSvr.Excutor
                                 {
                                     _mattress.erp_mtrlid = Convert.ToInt32(submx["erp_mtrlid"]);
                                 }
-                                if (submx.Value<string>("erp_mtrlcode") != null)
+                                if (!string.IsNullOrEmpty(submx.Value<string>("erp_mtrlcode")))
                                 {
                                     _mattress.erp_mtrlcode = Convert.ToString(submx["erp_mtrlcode"]);
                                 }
@@ -211,7 +211,7 @@ namespace JLHHJSvr.Excutor
                                             var _spring_qty_width = Convert.ToInt32(submx["spring_qty_width_" + bednetIndex]);
                                             var _spring_qty_length = Convert.ToInt32(submx["spring_qty_length_" + bednetIndex]);
                                             var _bednet_fork_qty = _bednet.fork_qty;
-                                            if (submx.Value<string>("bednet_fork_qty_" + bednetIndex) != null)
+                                            if (!string.IsNullOrEmpty(submx.Value<string>("bednet_fork_qty_" + bednetIndex)))
                                             {
                                                 _bednet_fork_qty = Convert.ToInt32(submx["bednet_fork_qty_" + bednetIndex]);
                                             }

JLHHJSvr/Helper/ERPHelper.cs

@@ -398,7 +398,7 @@ namespace JLHHJSvr.Helper
                         ["ifautodd"] = 1,
                         ["zxmtrlmode"] = mtrl.old_mtrlname,
                         ["piccode"] = mtrl.mattresscode,
-                        ["flag"] = 1,
+                        ["flag"] = 2,
                         ["secflag"] = 1,
                     }
                 },