1、半成品名增加裥棉图案

JLHHJSvr/Excutor/CreatPrdPfExcutor.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Data.SqlClient;
 using System.Linq;
 using JLHHJSvr.BLL;
@@ -115,6 +116,7 @@ namespace JLHHJSvr.Excutor
                     {
                         var _name = mx.bj_pzname_mx_mx;
                         var interfaceL = interfaceList.Where(o => _name == o.bj_namemx && mx.bj_pzname == o.bj_pzname).ToList();
+                        var tuanList = interfaceList.Where(t => mx.itemname.Trim().Equals(t.itemname.Trim()) && t.bj_pzname.EndsWith("图案") && !string.IsNullOrEmpty(t.bj_namemx)).ToList();
                         if (interfaceL.Count > 0)
                         {
                             _name = interfaceL[0].bj_namemx;
@@ -123,6 +125,11 @@ namespace JLHHJSvr.Excutor
                             if (!string.IsNullOrEmpty(interfaceL[0].actual_size_sb)) _name += " + " + interfaceL[0].actual_size_sb;
                             if (interfaceL[0].ss_rate != null && interfaceL[0].ss_rate > 0) _name += " + " + interfaceL[0].ss_rate;
                             if (interfaceL[0].ls_rate != null && interfaceL[0].ls_rate > 0) _name += " + " + interfaceL[0].ls_rate;
+                            if(tuanList != null && tuanList.Count > 0)
+                            {
+                                string tuan_str = string.Join(" + ", tuanList.Where(item => !string.IsNullOrEmpty(item.bj_namemx)).Select(item => item.bj_namemx));
+                                _name += " + " + tuan_str;
+                            }
                         }
                         if (mx.bj_pzname.Contains("上下") || mx.bj_pzname.Contains("左右"))
                         {
@@ -221,22 +228,22 @@ namespace JLHHJSvr.Excutor
                         i++;
                     }
 
-                    l1Req.token = GlobalVar.ERP_TOKEN;
+                    //l1Req.token = GlobalVar.ERP_TOKEN;
 
-                    var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
-                    l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
+                    //var l1Helper = HelperBase.GetHelper<ERPHelper>(cmd);
+                    //l1Helper.context = new HelperBase.Context() { tokendata = tokendata };
 
-                    l1Helper.CheckLogin();
+                    //l1Helper.CheckLogin();
 
-                    var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));
-                    rslt.ErrMsg = $"{l1Rslt.GetValue("ErrMsg")}";
+                    //var l1Rslt = l1Helper.DoExecute("SavePrdPf", JObject.FromObject(l1Req));
+                    //rslt.ErrMsg = $"{l1Rslt.GetValue("ErrMsg")}";
 
-                    if (string.IsNullOrEmpty(rslt.ErrMsg))
-                    {
-                        mattress.creatmtrlqd_flag = 1;
-                        mattress.mattressid = mattressid;
-                        DbSqlHelper.Update(cmd, mattress, "creatmtrlqd_flag");
-                    }
+                    //if (string.IsNullOrEmpty(rslt.ErrMsg))
+                    //{
+                    //    mattress.creatmtrlqd_flag = 1;
+                    //    mattress.mattressid = mattressid;
+                    //    DbSqlHelper.Update(cmd, mattress, "creatmtrlqd_flag");
+                    //}
                 }
             }
         }