核价后台：1、生成金蝶清单，支持配置保存；2、修复床垫清单读取配置信息逻辑

JLHHJSvr/Excutor/CreatMtrlPfExcutor.cs

@@ -35,7 +35,7 @@ namespace JLHHJSvr.Excutor
                 con.Open();
 
                 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,erp_configcodetype") != 1)
                 {
                     rslt.ErrMsg = "床垫报价单匹配失败";
                     return;
@@ -72,7 +72,7 @@ namespace JLHHJSvr.Excutor
                 {
                     mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
 
-                    var errMsg = l1Helper.SaveMtrldef(mattress);
+                    var errMsg = l1Helper.SaveMtrldef(mattress, interfaceList);
                     if (!string.IsNullOrEmpty(errMsg))
                     {
                         rslt.ErrMsg = errMsg;

JLHHJSvr/Excutor/UpdateMtrlPriceExcutor.cs

@@ -70,7 +70,7 @@ namespace JLHHJSvr.Excutor
 
                 mattress = l1Helper.GetMattressMsg(mattress, interfaceList);
 
-                var errMsg = l1Helper.SaveMtrldef(mattress, "bj_mxdscrp,configname");
+                var errMsg = l1Helper.SaveMtrldef(mattress, null, "bj_mxdscrp,configname");
                 if (!string.IsNullOrEmpty(errMsg))
                 {
                     rslt.ErrMsg = errMsg;

JLHHJSvr/Helper/BedNetHelper.cs

@@ -2708,7 +2708,7 @@ namespace JLHHJSvr.Helper
             foreach (var mx in mxlist)
             {
                 var spring = new u_spring() { springid = mx.springid };
-                DbSqlHelper.SelectOne(cmd, spring, "line_diameter,gram_weight,height,center_diameter");
+                DbSqlHelper.SelectOne(cmd, spring, "line_diameter,gram_weight,height,center_diameter,caliber,cyclenum,roll_width,roll_length,arrangement_width,arrangement_height");
 
                 // 处理相同公式部分
                 InitMxReplaceMents(bednet, mx, spring);

JLHHJSvr/Helper/ERPHelper.cs

@@ -129,10 +129,26 @@ namespace JLHHJSvr.Helper
         /// </summary>
         /// <param name="mtrl">核价物料资料</param>
         /// <returns>错误信息</returns>
-        public string SaveMtrldef(u_mattress mtrl, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configname,model")
+        public string SaveMtrldef(u_mattress mtrl, List<u_mattress_interface> interfaceList = null, string fields = "mtrlname,mtrlmode,mtrltypeid,mtrltype,unit,mtrlengname,configname,model,configcodetype")
         {
             var errMsg = string.Empty;
 
+            var configure2 = (JArray)null;
+            if (interfaceList != null)
+            {
+                configure2 = new JArray { };
+                foreach (var item in interfaceList)
+                {
+                    configure2.Add(new JObject()
+                    {
+                        ["pzid"] = item.erp_pzid,
+                        ["pzcode"] = item.pzcode,
+                        ["pzname"] = item.bj_pzname,
+                        ["pznamemx"] = item.bj_namemx
+                    });
+                }
+            }
+
             var l1Req = new JObject()
             {
                 ["token"] = GlobalVar.ERP_TOKEN,
@@ -156,7 +172,9 @@ namespace JLHHJSvr.Helper
                         ["planprice"] = mtrl.nottax_factory_cost, // 计划价
                         ["bj_mxdscrp"] = mtrl.bj_mxdscrp,
                         ["configname"] = mtrl.configname,
-                        ["model"] = mtrl.model
+                        ["model"] = mtrl.model,
+                        ["configcodetype"] = mtrl.erp_configcodetype,
+                        ["mtrl_config2"] = configure2
                     }
                 },
                 ["updateFields"] = fields

JLHHJSvr/Helper/InterfaceHelper.cs

@@ -352,10 +352,9 @@ namespace JLHHJSvr.Helper
 	                                    ,u_configure_code.inputtype
                                     FROM u_configure_code
                                     WHERE u_configure_code.typeid = @configcodetype
-	                                    AND u_configure_code.name IN (@pzname)";
+	                                    AND u_configure_code.name IN " + ListEx.getString(names) ;
                 cmd.Parameters.Clear();
                 cmd.Parameters.AddWithValue("@configcodetype", mattress.erp_configcodetype);
-                cmd.Parameters.AddWithValue("@pzname", ListEx.getString(names));
                 using (var reader = cmd.ExecuteReader())
                 {
                     while (reader.Read())
@@ -364,7 +363,7 @@ namespace JLHHJSvr.Helper
                         {
                             pzid = Convert.ToInt32(reader["pzid"]),
                             pzcode = Convert.ToString(reader["pzcode"]),
-                            name = Convert.ToString(reader["name"]),
+                            name = Convert.ToString(reader["name"]).Trim(),
                             inputtype = Convert.ToInt32(reader["inputtype"])
                         };
                         resultList.Add(item);
@@ -387,7 +386,7 @@ namespace JLHHJSvr.Helper
 
                 foreach (var result in resultList) 
                 {
-                    if (interfaceList[i].erp_pzname == result.name)
+                    if (interfaceList[i].bj_pzname == result.name)
                     {
                         if (result.pzid > 0)
                         {