核价：同步报价资料，补充床网信息

JLHHJSvr/Form2.cs

@@ -70,6 +70,10 @@ namespace JLHHJSvr
                     var idList = textStr.Select(x => x.Trim());
                     var failIDs = new HashSet<string>(idList);
                     var okIDs = new HashSet<string>();
+                    var newOkIDs = new HashSet<string>();
+
+                    var MattressHelper = HelperBase.GetHelper<MattressHelper>(cmd);
+                    var BednetHelper = HelperBase.GetHelper<BedNetHelper>(cmd);
 
                     var errMsg = string.Empty;
                     foreach (var mattress in list)
@@ -82,8 +86,39 @@ namespace JLHHJSvr
                             mattress.mattressid = 0;
                             mattress.mattresscode = "";
 
-                            var helper = HelperBase.GetHelper<MattressHelper>(cmd);
-                            var mxList = helper.GetMattressMxMtrl(id);
+                            var mxList = MattressHelper.GetMattressMxMtrl(id);
+
+                            if (mxList.Count > 0)
+                            {
+                                foreach(var mx in mxList)
+                                {
+                                    mx.mattressid = 0;
+                                    mx.mattressmxid = 0;
+                                    if (mx.formulatype == 99 && mx.mtrlid > 0)
+                                    {
+                                        var bednetItm = BednetHelper.GetBedNet(mx.mtrlid.Value);
+                                        var bednetMx = BednetHelper.GetBedNetMxList(mx.mtrlid.Value);
+                                        var spring = BednetHelper.GetBedNetSpringList(mx.mtrlid.Value);
+                                        bednetItm.copy_id = bednetItm.bednetid;
+
+                                        var saveReqBednet = new SaveBedNetRequest()
+                                        {
+                                            bednet = bednetItm,
+                                            bednetMx = bednetMx,
+                                            spring = spring,
+                                            token = token,
+                                        };
+
+                                        var saveRspBednet = LJHttpUtil.PostRequest(url + saveReqBednet.GetApiName(), JObject.FromObject(saveReqBednet))
+                                            .ToObject<SaveBedNetResponse>();
+
+                                        if (string.IsNullOrEmpty(saveRspBednet.ErrMsg))
+                                        {
+                                            mx.mtrlid = saveRspBednet.bednet.bednetid;
+                                        }
+                                    }
+                                }
+                            }
 
                             var saveReq = new SaveMattressRequest()
                             {
@@ -100,8 +135,9 @@ namespace JLHHJSvr
                             }
                             else
                             {
-                                okIDs.Add(mattress.mattresscode);
-                                failIDs.Remove(mattress.mattresscode);
+                                newOkIDs.Add(saveRsp.mattresscode);
+                                okIDs.Add(old_mattresscode);
+                                failIDs.Remove(old_mattresscode);
                             }
                         }
                         catch (Exception ex)
@@ -110,7 +146,7 @@ namespace JLHHJSvr
                         }
                     }
 
-                    textBox1.Text = $"{textBox1Str}\r\n同步失败：{string.Join(",", failIDs)}\r\n同步成功：{string.Join(",", okIDs)}\r\n{errMsg}";
+                    textBox1.Text = $"{textBox1Str}\r\n同步失败：{string.Join(",", failIDs)}\r\n同步成功：{string.Join(",", okIDs)}\r\n同步后编码：{string.Join(",", newOkIDs)}\r\n{errMsg}";
                 }
             }
             catch (Exception ex)

JLHHJSvr/Helper/BedNetHelper.cs

@@ -8,7 +8,6 @@ using LJLib.DAL.SQL;
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
-using System.Diagnostics;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -1138,7 +1137,7 @@ namespace JLHHJSvr.Helper
         {
             var dept = new u_dept() { deptid = bednet.deptid.Value };
             DbSqlHelper.SelectOne(cmd, dept, "pricelistid,profitrate,moneyrate,discount");
-            Trace.Assert(bednet.bednettypeid != null, "InitBedNet：bednet.bednettypeid != null");
+
             //var profirate = new u_factory_profitrate() { deptid = bednet.deptid, bednettypeid_mattresstypeid = bednet.bednettypeid, bednet_or_mattress = 0 };
             //DbSqlHelper.SelectOne(cmd, profirate, "profitrate");
             decimal profitrate = 0;
@@ -2020,7 +2019,7 @@ namespace JLHHJSvr.Helper
                                 side_iron_weight_qty,hard_around_weight_qty,fabrics1_weight_qty,fabrics2_weight_qty,felt_weight_qty,
                                 cnail_weight_qty,sponge_weight_qty,sponge_weight_tc_qty,edge_weight_qty,fork_weight_qty,if_jb,if_stock_up";
             DbSqlHelper.SelectOne(cmd, bednet, outputFields);
-            Trace.Assert(bednet.bednettypeid != null, "GetBedNet：bednet.bednettypeid != null");
+
             return bednet;
         }