支持从机会商品里添加商品到待上传

AllBase/BaseClass.cs

@@ -27,7 +27,7 @@ namespace AllBase
         /// <summary>
         /// 版本ID
         /// </summary>
-        public static int VersionCount = 619;
+        public static int VersionCount = 623;
         //public static int VersionCount = 613;
 
         /// <summary>

AllBase/Model/Result/PDDResult/PDDProductInfo.cs

@@ -20,5 +20,11 @@ namespace AllBase.Model.Result.PDDResult
         /// 长图
         /// </summary>
         public PDDMaterialInfo material3 { get; set; }
+
+
+
+        public string chance_id { get; set; }
+        public string chance_refere { get; set; } // 记录机会商品提交的refere
+        public string chance_tab { get; set; }  // 记录机会商品提交的tab
     }
 }

AllBase/Model/Result/TemuDBProductSelect.cs

@@ -45,7 +45,7 @@ namespace AllBase.Model.Result
         public string main_img { get; set; }
         public string spu_id { get; set; }
         public string skc_id { get; set; }
-
+        public KJDDBProduct kjdDbProduct { get; set; } = null;
         #endregion
     }
 }

KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs

@@ -295,7 +295,7 @@ namespace KJD_Web.BLL.BXX
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
 
-        public string GetProductGroups(string inputData, bool isDetail = false)
+        public string GetProductGroups(string inputData)
         {
             if (!string.IsNullOrEmpty(inputData))
             {
@@ -349,6 +349,60 @@ namespace KJD_Web.BLL.BXX
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
 
+        public string GetProductCates(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
+                string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+                if (time1 != EncrypUtil.Encryption(time))
+                    return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+                var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(user_name))
+                {
+                    return "{\"code\":50001,\"msg\":\"没有用户名\"}";
+                }
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "SELECT DISTINCT p.cat_name FROM `bxx`.`product` p where p.is_del=0";
+
+                string where = "";
+                sql += where;
+
+                var dt = mySql.ExecuteDataTable(sql);
+                mySql.Close();
+
+                if (dt != null)
+                {
+                    try
+                    {
+                        string group_data = "";
+                        foreach (DataRow row in dt.Rows)
+                        {
+                            group_data += row["cat_name"].ToString() + ",";
+                        }
+                        var data = group_data.Trim(',');
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":\"" + data + "\"}";
+                    }
+                    catch (Exception ex)
+                    {
+                        return "{\"code\":50002,\"msg\":\"" + ex.Message + "\",\"data\":\"\"}";
+                    }
+                }
+                else
+                {
+                    return "{\"code\":50003,\"msg\":\"" + mySql.Message + "\",\"data\":\"\"}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
         /// <summary>
         /// 查询商品替换sku
         /// </summary>
@@ -452,6 +506,7 @@ namespace KJD_Web.BLL.BXX
                 var in_ext_codes = RegexUtils.GetStringQuery(ref inputData, "in_ext_codes")?.Replace("'", "\\'");
                 var in_skc_ids = RegexUtils.GetStringQuery(ref inputData, "in_skc_ids")?.Replace("'", "\\'");
                 var in_groups = RegexUtils.GetStringQuery(ref inputData, "in_groups")?.Replace("'", "\\'");
+                var in_cates = RegexUtils.GetStringQuery(ref inputData, "in_cates")?.Replace("'", "\\'");
 
                 int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
                 int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
@@ -477,6 +532,11 @@ namespace KJD_Web.BLL.BXX
                     in_groups = "'" + string.Join("','", in_groups.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'";
                     where += " and p.group in (" + in_groups + ")";
                 }
+                if (!string.IsNullOrEmpty(in_cates))
+                {
+                    in_cates = "'" + string.Join("','", in_cates.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'";
+                    where += " and (p.cat_name in (" + in_cates + ") or p.main_cat_name in (" + in_cates + "))";
+                }
 
                 sql += where;
 
@@ -552,6 +612,86 @@ namespace KJD_Web.BLL.BXX
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
 
+        /// <summary>
+        /// 随机获取商品（无详情） 随机添加到上传列表所以不需要获取详情
+        /// </summary>
+        /// <param name="inputData"></param>
+        /// <returns></returns>
+        public string GetSkuReplaceImgListRandom(string inputData)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
+                string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+                if (time1 != EncrypUtil.Encryption(time))
+                    return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+                var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'");
+                var password = RegexUtils.GetStringQuery(ref inputData, "password")?.Replace("'", "\\'");
+                var in_img_type = RegexUtils.GetStringQuery(ref inputData, "in_img_type")?.Replace("'", "\\'");
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "select count(id) from bxx.sku_img_replace s where 1=1";
+
+                string where = "";
+                if (!string.IsNullOrEmpty(in_img_type))
+                {
+                    in_img_type = "'" + string.Join("','", in_img_type.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'";
+                    where += " and s.img_type in (" + in_img_type + ")";
+                }
+
+                sql += where;
+
+                var count = mySql.ExecuteRowCount(sql);
+
+                DataTable dt;
+                if (count == 0)
+                {
+                    dt = new DataTable();
+                }
+                else
+                {
+                    sql = "select s.img_url from bxx.sku_img_replace s where 1=1";
+
+                    //where子句
+                    sql += where;
+
+                    sql += " ORDER BY RAND()";
+                    sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+                    dt = mySql.ExecuteDataTable(sql);
+                }
+
+                mySql.Close();
+                if (dt != null)
+                {
+                    try
+                    {
+                        List<string> imgs = new List<string>();
+                        foreach (DataRow row in dt.Rows)
+                        {
+                            imgs.Add(row["img_url"].ToString());
+                        }
+                        var data = JsonUtils.SerializerObjectToString(imgs);
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
+                    }
+                    catch (Exception ex)
+                    {
+                        return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                    }
+                }
+                else
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                }
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
+
         public string DelDbProd(string inputData)
         {
             if (!string.IsNullOrEmpty(inputData))

KJDService/KJD_WebService/BLL/KJD/ProductManage.cs

@@ -771,6 +771,92 @@ namespace KJD_Web.BLL
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
+
+        public string GetSelectProductMapDraftIdList(string inputData, bool isDetail = false)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
+                string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+                if (time1 != EncrypUtil.Encryption(time))
+                    return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+                var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'");
+                var password = RegexUtils.GetStringQuery(ref inputData, "password")?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(user_name))
+                {
+                    return "{\"code\":50001,\"msg\":\"用户为空\"}";
+                }
+
+                var select_db_id = RegexUtils.GetStringQuery(ref inputData, "select_db_id")?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(select_db_id))
+                {
+                    return "{\"code\":50002,\"msg\":\"未选择选品数据\"}";
+                }
+                long l_select_map_table_id = select_db_id.ParseToLong() % 64;
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "select count(id) from kjd_map.product_select_map_" + l_select_map_table_id + " where 1=1";
+                string where = " and product_select_db_id=" + select_db_id;
+                sql += where;
+
+                var count = mySql.ExecuteRowCount(sql);
+
+                DataTable dt;
+                if (count == 0)
+                {
+                    dt = new DataTable();
+                }
+                else
+                {
+                    sql = "select * from kjd_map.product_select_map_" + l_select_map_table_id + " where 1=1";
+                    //where子句
+                    sql += where;
+                    sql += " order by id desc";
+                    sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+                    dt = mySql.ExecuteDataTable(sql);
+                }
+
+                mySql.Close();
+
+                if (!string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                }
+                if (dt != null)
+                {
+                    try
+                    {
+                        List<DBProductSelectMapResultParam> productSelectMapLst = new List<DBProductSelectMapResultParam>();
+                        foreach (DataRow row in dt.Rows)
+                        {
+                            DBProductSelectMapResultParam productSelectMap = new DBProductSelectMapResultParam
+                            {
+                                id = row["id"].ParseToInt(),
+                                product_id = row["product_id"].ParseToLong(),
+                                product_select_db_id = row["product_select_db_id"].ParseToInt(),
+                                shop_id = row["shop_id"].ParseToLong(),
+                                add_time = Convert.ToDateTime(row["add_time"]),
+                            };
+                            productSelectMapLst.Add(productSelectMap);
+                        }
+                        var data = JsonUtils.SerializerObjectToString(productSelectMapLst);
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
+                    }
+                    catch (Exception ex)
+                    {
+                        return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                    }
+                }
+                return "{\"code\":500,\"msg\":\"查询结果为空！\",\"data\":[],\"count\":" + 0 + "}";
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
     }
 }
 

KJDService/KJD_WebService/BLL/KJD/ProductThirdManage.cs

@@ -771,5 +771,91 @@ namespace KJD_Web.BLL
             }
             return "{\"code\":19999,\"msg\":\"输入为空\"}";
         }
+
+        public string GetSelectProductMapDraftIdList(string inputData, bool isDetail = false)
+        {
+            if (!string.IsNullOrEmpty(inputData))
+            {
+                var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
+                string time1 = RegexUtils.GetStringQuery(ref inputData, "code");
+                if (time1 != EncrypUtil.Encryption(time))
+                    return "{\"code\":50000,\"msg\":\"校验失败\"}";
+
+                var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'");
+                var password = RegexUtils.GetStringQuery(ref inputData, "password")?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(user_name))
+                {
+                    return "{\"code\":50001,\"msg\":\"用户为空\"}";
+                }
+
+                var select_db_id = RegexUtils.GetStringQuery(ref inputData, "select_db_id")?.Replace("'", "\\'");
+                if (string.IsNullOrEmpty(select_db_id))
+                {
+                    return "{\"code\":50002,\"msg\":\"未选择选品数据\"}";
+                }
+                long l_select_map_table_id = select_db_id.ParseToLong() % 64;
+
+                int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
+                int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
+
+                string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
+                MysqlUtils mySql = new MysqlUtils(conn);
+
+                string sql = "select count(id) from kjd_map.product_third_select_map_" + l_select_map_table_id + " where 1=1";
+                string where = " and product_select_db_id=" + select_db_id;
+                sql += where;
+
+                var count = mySql.ExecuteRowCount(sql);
+
+                DataTable dt;
+                if (count == 0)
+                {
+                    dt = new DataTable();
+                }
+                else
+                {
+                    sql = "select * from kjd_map.product_third_select_map_" + l_select_map_table_id + " where 1=1";
+                    //where子句
+                    sql += where;
+                    sql += " order by id desc";
+                    sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+                    dt = mySql.ExecuteDataTable(sql);
+                }
+
+                mySql.Close();
+
+                if (!string.IsNullOrEmpty(mySql.Message))
+                {
+                    return "{\"code\":500,\"msg\":\"" + mySql.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                }
+                if (dt != null)
+                {
+                    try
+                    {
+                        List<DBProductSelectMapResultParam> productSelectMapLst = new List<DBProductSelectMapResultParam>();
+                        foreach (DataRow row in dt.Rows)
+                        {
+                            DBProductSelectMapResultParam productSelectMap = new DBProductSelectMapResultParam
+                            {
+                                id = row["id"].ParseToInt(),
+                                product_id = row["product_id"].ParseToLong(),
+                                product_select_db_id = row["product_select_db_id"].ParseToInt(),
+                                shop_id = row["shop_id"].ParseToLong(),
+                                add_time = Convert.ToDateTime(row["add_time"]),
+                            };
+                            productSelectMapLst.Add(productSelectMap);
+                        }
+                        var data = JsonUtils.SerializerObjectToString(productSelectMapLst);
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
+                    }
+                    catch (Exception ex)
+                    {
+                        return "{\"code\":500,\"msg\":\"" + ex.Message + "\",\"data\":[],\"count\":" + 0 + "}";
+                    }
+                }
+                return "{\"code\":500,\"msg\":\"查询结果为空！\",\"data\":[],\"count\":" + 0 + "}";
+            }
+            return "{\"code\":19999,\"msg\":\"输入为空\"}";
+        }
     }
 }

KJDService/KJD_WebService/BXXProductService.asmx.cs

@@ -84,6 +84,18 @@ namespace KJD_Web
             Context.Response.End();
         }
 
+        [WebMethod]
+        public void get_sku_replace_img_list_random()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new BXXProductManage().GetSkuReplaceImgListRandom(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
         [WebMethod]
         public void add_product()
         {
@@ -168,6 +180,18 @@ namespace KJD_Web
             Context.Response.End();
         }
 
+        [WebMethod]
+        public void get_product_cates()
+        {
+            string jsontext = GetRequestJsonString();
+
+            var result = jsontext;
+            result = new BXXProductManage().GetProductCates(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
+
         [WebMethod]
         public void add_sku_img_replace()
         {

KJDService/KJD_WebService/KJD_WebService.csproj

@@ -107,6 +107,7 @@
     </Compile>
     <Compile Include="Model\CommentParam.cs" />
     <Compile Include="Model\DBPriceResultParam.cs" />
+    <Compile Include="Model\DBProductSelectMapResultParam.cs" />
     <Compile Include="Model\OrderParam.cs" />
     <Compile Include="Model\DBProductResultParam.cs" />
     <Compile Include="Model\ProductPurchasePriceResultParam.cs" />

KJDService/KJD_WebService/Model/DBProductSelectMapResultParam.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+
+namespace KJD_Web.Model
+{
+    public class DBProductSelectMapResultParam
+    {
+        public int id { get; set; }
+        public long product_id { get; set; }
+        public int product_select_db_id { get; set; }
+        public long shop_id { get; set; }
+        public DateTime add_time { get; set; }
+    }
+}

KJDService/KJD_WebService/ProductService.asmx.cs

@@ -217,5 +217,17 @@ namespace KJD_Web
             Context.Response.Write(result);
             Context.Response.End();
         }
+
+
+        [WebMethod]
+        public void get_select_product_map_draft_id_list()
+        { 
+            string jsontext = GetRequestJsonString();
+            var result = jsontext;
+            result = new ProductManage().GetSelectProductMapDraftIdList(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
     }
 }

KJDService/KJD_WebService/ProductThirdService.asmx.cs

@@ -217,5 +217,16 @@ namespace KJD_Web
             Context.Response.Write(result);
             Context.Response.End();
         }
+
+        [WebMethod]
+        public void get_select_product_map_draft_id_list()
+        {
+            string jsontext = GetRequestJsonString();
+            var result = jsontext;
+            result = new ProductThirdManage().GetSelectProductMapDraftIdList(jsontext);
+
+            Context.Response.Write(result);
+            Context.Response.End();
+        }
     }
 }

TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs

@@ -422,6 +422,22 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                         adminLoginForm.openType = EnumOpenType.manage;
                         adminLoginForm.WindowState = FormWindowState.Maximized;
                         adminLoginForm.ShowDialog();
+                        return;
+
+                        var url = BaseClass.BuildObjString("product/get_select_product_map_draft_id_list");
+                        var data = UserLogin.GetSignaturex() + "&select_db_id=" + dbId;
+
+                        var html = GetHtml.PostUtf8(url, data);
+                        if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                            html = GetHtml.PostUtf8(url, data);
+                        if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                            html = GetHtml.PostUtf8(url, data);
+                        if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                        {
+                        }
+                        else
+                        {
+                        }
                     }
                     break;
                 case "进店":

TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs

@@ -29,14 +29,16 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.label14 = new System.Windows.Forms.Label();
@@ -138,6 +140,14 @@
             this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
             this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.dataGridViewEx1 = new TemuKJD.UserComponent.DataGridViewEx();
+            this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+            this.colMapId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colMapShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.dataGridViewLinkColumn5 = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colToPorductPage = new System.Windows.Forms.DataGridViewLinkColumn();
+            this.colToDraftPage = new System.Windows.Forms.DataGridViewLinkColumn();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -164,6 +174,8 @@
             this.splitContainer2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit();
+            this.panel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEx1)).BeginInit();
             this.SuspendLayout();
             // 
             // splitContainer1
@@ -797,7 +809,7 @@
             "全部",
             "重上",
             "已买"});
-            this.cmbUserNotes.Location = new System.Drawing.Point(1044, 8);
+            this.cmbUserNotes.Location = new System.Drawing.Point(1044, 5);
             this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0);
             this.cmbUserNotes.Name = "cmbUserNotes";
             this.cmbUserNotes.Size = new System.Drawing.Size(65, 25);
@@ -814,7 +826,7 @@
             "核价成功",
             "核价成功（重复）",
             "重复"});
-            this.cmbNotes.Location = new System.Drawing.Point(917, 8);
+            this.cmbNotes.Location = new System.Drawing.Point(917, 5);
             this.cmbNotes.Margin = new System.Windows.Forms.Padding(0);
             this.cmbNotes.Name = "cmbNotes";
             this.cmbNotes.Size = new System.Drawing.Size(65, 25);
@@ -841,7 +853,7 @@
             "已上传",
             "草稿箱",
             "全部"});
-            this.cmbStatus.Location = new System.Drawing.Point(814, 8);
+            this.cmbStatus.Location = new System.Drawing.Point(814, 5);
             this.cmbStatus.Margin = new System.Windows.Forms.Padding(0);
             this.cmbStatus.Name = "cmbStatus";
             this.cmbStatus.Size = new System.Drawing.Size(65, 25);
@@ -1251,6 +1263,7 @@
             // splitContainer2.Panel1
             // 
             this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
+            this.splitContainer2.Panel1.Controls.Add(this.panel2);
             this.splitContainer2.Panel1.Controls.Add(this.dgvSelectProduct);
             this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0);
             // 
@@ -1277,18 +1290,18 @@
             // 
             this.dgvSelectProduct.AllowUserToAddRows = false;
             this.dgvSelectProduct.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
             this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colSelect,
@@ -1427,8 +1440,8 @@
             // 
             // colProductName
             // 
-            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductName.DefaultCellStyle = dataGridViewCellStyle3;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductName.DefaultCellStyle = dataGridViewCellStyle5;
             this.colProductName.HeaderText = "商品标题";
             this.colProductName.Name = "colProductName";
             this.colProductName.ReadOnly = true;
@@ -1436,8 +1449,8 @@
             // 
             // colProductCat
             // 
-            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductCat.DefaultCellStyle = dataGridViewCellStyle4;
+            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductCat.DefaultCellStyle = dataGridViewCellStyle6;
             this.colProductCat.HeaderText = "商品类目";
             this.colProductCat.Name = "colProductCat";
             this.colProductCat.ReadOnly = true;
@@ -1470,8 +1483,8 @@
             // 
             // colAddTime
             // 
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colAddTime.DefaultCellStyle = dataGridViewCellStyle7;
             this.colAddTime.HeaderText = "添加时间";
             this.colAddTime.Name = "colAddTime";
             this.colAddTime.ReadOnly = true;
@@ -1479,8 +1492,8 @@
             // 
             // colMdyTime
             // 
-            dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle8;
             this.colMdyTime.HeaderText = "上传时间";
             this.colMdyTime.Name = "colMdyTime";
             this.colMdyTime.ReadOnly = true;
@@ -1495,8 +1508,8 @@
             // 
             // colSubSaNick
             // 
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colSubSaNick.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colSubSaNick.DefaultCellStyle = dataGridViewCellStyle9;
             this.colSubSaNick.HeaderText = "二级超管";
             this.colSubSaNick.Name = "colSubSaNick";
             this.colSubSaNick.ReadOnly = true;
@@ -1511,8 +1524,8 @@
             // 
             // colNotes
             // 
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colNotes.DefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colNotes.DefaultCellStyle = dataGridViewCellStyle10;
             this.colNotes.HeaderText = "备注";
             this.colNotes.Name = "colNotes";
             this.colNotes.ReadOnly = true;
@@ -1566,6 +1579,99 @@
             this.statusBar.Size = new System.Drawing.Size(1558, 25);
             this.statusBar.TabIndex = 5;
             // 
+            // panel2
+            // 
+            this.panel2.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            this.panel2.Controls.Add(this.dataGridViewEx1);
+            this.panel2.Location = new System.Drawing.Point(501, 75);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(557, 342);
+            this.panel2.TabIndex = 191;
+            this.panel2.Visible = false;
+            // 
+            // dataGridViewEx1
+            // 
+            this.dataGridViewEx1.AllowUserToAddRows = false;
+            this.dataGridViewEx1.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dataGridViewEx1.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+            this.dataGridViewEx1.BackgroundColor = System.Drawing.Color.White;
+            this.dataGridViewEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridViewEx1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+            this.dataGridViewEx1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+            this.dataGridViewEx1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+            this.dataGridViewCheckBoxColumn1,
+            this.colMapId,
+            this.colMapShopId,
+            this.dataGridViewLinkColumn5,
+            this.colToPorductPage,
+            this.colToDraftPage});
+            this.dataGridViewEx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.dataGridViewEx1.Location = new System.Drawing.Point(0, 0);
+            this.dataGridViewEx1.Name = "dataGridViewEx1";
+            this.dataGridViewEx1.ReadOnly = true;
+            this.dataGridViewEx1.RowHeadersWidth = 40;
+            this.dataGridViewEx1.RowTemplate.Height = 23;
+            this.dataGridViewEx1.Size = new System.Drawing.Size(555, 340);
+            this.dataGridViewEx1.TabIndex = 192;
+            // 
+            // dataGridViewCheckBoxColumn1
+            // 
+            this.dataGridViewCheckBoxColumn1.HeaderText = "选择";
+            this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1";
+            this.dataGridViewCheckBoxColumn1.ReadOnly = true;
+            this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewCheckBoxColumn1.Width = 30;
+            // 
+            // colMapId
+            // 
+            this.colMapId.HeaderText = "映射Id";
+            this.colMapId.Name = "colMapId";
+            this.colMapId.ReadOnly = true;
+            this.colMapId.Visible = false;
+            this.colMapId.Width = 125;
+            // 
+            // colMapShopId
+            // 
+            this.colMapShopId.HeaderText = "映射店铺Id";
+            this.colMapShopId.Name = "colMapShopId";
+            this.colMapShopId.ReadOnly = true;
+            this.colMapShopId.Width = 120;
+            // 
+            // dataGridViewLinkColumn5
+            // 
+            this.dataGridViewLinkColumn5.HeaderText = "商品SPU";
+            this.dataGridViewLinkColumn5.Name = "dataGridViewLinkColumn5";
+            this.dataGridViewLinkColumn5.ReadOnly = true;
+            this.dataGridViewLinkColumn5.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridViewLinkColumn5.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.dataGridViewLinkColumn5.Width = 86;
+            // 
+            // colToPorductPage
+            // 
+            this.colToPorductPage.HeaderText = "访问商品页";
+            this.colToPorductPage.Name = "colToPorductPage";
+            this.colToPorductPage.ReadOnly = true;
+            this.colToPorductPage.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+            this.colToPorductPage.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+            this.colToPorductPage.Width = 62;
+            // 
+            // colToDraftPage
+            // 
+            this.colToDraftPage.HeaderText = "访问草稿页";
+            this.colToDraftPage.Name = "colToDraftPage";
+            this.colToDraftPage.ReadOnly = true;
+            this.colToDraftPage.Visible = false;
+            this.colToDraftPage.Width = 38;
+            // 
             // ProductThirdSelectListManageForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1608,6 +1714,8 @@
             this.splitContainer2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit();
+            this.panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.dataGridViewEx1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1714,5 +1822,13 @@
         private DevComponents.DotNetBar.PanelEx btnAdd;
         private DevComponents.DotNetBar.PanelEx btnSetSubSa;
         private System.Windows.Forms.Label label14;
+        private System.Windows.Forms.Panel panel2;
+        private UserComponent.DataGridViewEx dataGridViewEx1;
+        private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMapId;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colMapShopId;
+        private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn5;
+        private System.Windows.Forms.DataGridViewLinkColumn colToPorductPage;
+        private System.Windows.Forms.DataGridViewLinkColumn colToDraftPage;
     }
 }

TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs

@@ -362,6 +362,22 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
                         adminLoginForm.openType = EnumOpenType.manage;
                         adminLoginForm.WindowState = FormWindowState.Maximized;
                         adminLoginForm.ShowDialog();
+                        return;
+
+                        var url = BaseClass.BuildObjString("product_third/get_select_product_map_draft_id_list");
+                        var data = UserLogin.GetSignaturex() + "&select_db_id=" + dbId;
+
+                        var html = GetHtml.PostUtf8(url, data);
+                        if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                            html = GetHtml.PostUtf8(url, data);
+                        if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                            html = GetHtml.PostUtf8(url, data);
+                        if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
+                        {
+                        }
+                        else
+                        {
+                        }
                     }
                     break;
                 case "进店":

TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.resx

@@ -117,6 +117,24 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="dataGridViewCheckBoxColumn1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMapId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colMapShopId.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="dataGridViewLinkColumn5.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colToPorductPage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="colToDraftPage.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs

@@ -30,11 +30,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
             this.chkKeepChanceGoodsImg = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -72,11 +72,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.chkLowPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.lblLowPriceSkuImg = new System.Windows.Forms.Label();
             this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.btnClearFilter = new DevComponents.DotNetBar.PanelEx();
             this.txtIdFilter = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
+            this.cmbCateFilter = new System.Windows.Forms.ComboBox();
+            this.label2 = new System.Windows.Forms.Label();
             this.cmbGroupFilter = new System.Windows.Forms.ComboBox();
             this.label20 = new System.Windows.Forms.Label();
-            this.panelEx3 = new DevComponents.DotNetBar.PanelEx();
             this.txtExtCodeFilter = new System.Windows.Forms.TextBox();
             this.btnClearUpload = new DevComponents.DotNetBar.PanelEx();
             this.lblWaitToUp = new System.Windows.Forms.Label();
@@ -713,11 +715,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             | System.Windows.Forms.AnchorStyles.Left)));
             this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+            this.ucGroupBoxEx4.Controls.Add(this.btnClearFilter);
             this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter);
             this.ucGroupBoxEx4.Controls.Add(this.label1);
+            this.ucGroupBoxEx4.Controls.Add(this.cmbCateFilter);
+            this.ucGroupBoxEx4.Controls.Add(this.label2);
             this.ucGroupBoxEx4.Controls.Add(this.cmbGroupFilter);
             this.ucGroupBoxEx4.Controls.Add(this.label20);
-            this.ucGroupBoxEx4.Controls.Add(this.panelEx3);
             this.ucGroupBoxEx4.Controls.Add(this.txtExtCodeFilter);
             this.ucGroupBoxEx4.Controls.Add(this.btnClearUpload);
             this.ucGroupBoxEx4.Controls.Add(this.lblWaitToUp);
@@ -732,78 +736,96 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.ucGroupBoxEx4.TabStop = false;
             this.ucGroupBoxEx4.Text = "待传商品";
             // 
+            // btnClearFilter
+            // 
+            this.btnClearFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnClearFilter.Location = new System.Drawing.Point(266, 23);
+            this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
+            this.btnClearFilter.Name = "btnClearFilter";
+            this.btnClearFilter.Size = new System.Drawing.Size(48, 51);
+            this.btnClearFilter.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClearFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnClearFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnClearFilter.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnClearFilter.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClearFilter.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnClearFilter.Style.GradientAngle = 90;
+            this.btnClearFilter.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClearFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClearFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClearFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClearFilter.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnClearFilter.TabIndex = 559;
+            this.btnClearFilter.Text = "清除\r\n筛选";
+            this.btnClearFilter.Click += new System.EventHandler(this.btnClearFilter_Click);
+            // 
             // txtIdFilter
             // 
             this.txtIdFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtIdFilter.Location = new System.Drawing.Point(213, 20);
+            this.txtIdFilter.Location = new System.Drawing.Point(170, 51);
             this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtIdFilter.Name = "txtIdFilter";
-            this.txtIdFilter.Size = new System.Drawing.Size(96, 23);
+            this.txtIdFilter.Size = new System.Drawing.Size(92, 23);
             this.txtIdFilter.TabIndex = 652;
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(170, 23);
+            this.label1.Location = new System.Drawing.Point(140, 54);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(45, 17);
+            this.label1.Size = new System.Drawing.Size(32, 17);
             this.label1.TabIndex = 651;
-            this.label1.Text = "筛选ID";
+            this.label1.Text = "编号";
+            // 
+            // cmbCateFilter
+            // 
+            this.cmbCateFilter.FormattingEnabled = true;
+            this.cmbCateFilter.Location = new System.Drawing.Point(170, 22);
+            this.cmbCateFilter.Name = "cmbCateFilter";
+            this.cmbCateFilter.Size = new System.Drawing.Size(92, 25);
+            this.cmbCateFilter.TabIndex = 663;
+            // 
+            // label2
+            // 
+            this.label2.AutoSize = true;
+            this.label2.Location = new System.Drawing.Point(140, 26);
+            this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(32, 17);
+            this.label2.TabIndex = 662;
+            this.label2.Text = "类目";
             // 
             // cmbGroupFilter
             // 
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(70, 19);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(47, 22);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
-            this.cmbGroupFilter.Size = new System.Drawing.Size(96, 25);
+            this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25);
             this.cmbGroupFilter.TabIndex = 641;
             // 
             // label20
             // 
             this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(16, 22);
+            this.label20.Location = new System.Drawing.Point(16, 25);
             this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label20.Name = "label20";
-            this.label20.Size = new System.Drawing.Size(56, 17);
+            this.label20.Size = new System.Drawing.Size(32, 17);
             this.label20.TabIndex = 570;
-            this.label20.Text = "筛选分组";
-            // 
-            // panelEx3
-            // 
-            this.panelEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control;
-            this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty;
-            this.panelEx3.Location = new System.Drawing.Point(249, 48);
-            this.panelEx3.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
-            this.panelEx3.Name = "panelEx3";
-            this.panelEx3.Size = new System.Drawing.Size(60, 23);
-            this.panelEx3.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx3.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.panelEx3.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.panelEx3.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.panelEx3.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx3.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.panelEx3.Style.GradientAngle = 90;
-            this.panelEx3.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx3.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.panelEx3.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx3.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.panelEx3.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.panelEx3.TabIndex = 559;
-            this.panelEx3.Text = "清除筛选";
-            this.panelEx3.Click += new System.EventHandler(this.btnClearFilter_Click);
+            this.label20.Text = "分组";
             // 
             // txtExtCodeFilter
             // 
             this.txtExtCodeFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtExtCodeFilter.Location = new System.Drawing.Point(70, 48);
+            this.txtExtCodeFilter.Location = new System.Drawing.Point(47, 51);
             this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtExtCodeFilter.Name = "txtExtCodeFilter";
-            this.txtExtCodeFilter.Size = new System.Drawing.Size(176, 23);
+            this.txtExtCodeFilter.Size = new System.Drawing.Size(92, 23);
             this.txtExtCodeFilter.TabIndex = 555;
             // 
             // btnClearUpload
@@ -812,7 +834,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnClearUpload.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnClearUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnClearUpload.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnClearUpload.Location = new System.Drawing.Point(233, 103);
+            this.btnClearUpload.Location = new System.Drawing.Point(238, 105);
             this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnClearUpload.Name = "btnClearUpload";
             this.btnClearUpload.Size = new System.Drawing.Size(76, 23);
@@ -838,7 +860,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.lblWaitToUp.Cursor = System.Windows.Forms.Cursors.Hand;
             this.lblWaitToUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblWaitToUp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.lblWaitToUp.Location = new System.Drawing.Point(18, 109);
+            this.lblWaitToUp.Location = new System.Drawing.Point(16, 108);
             this.lblWaitToUp.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.lblWaitToUp.Name = "lblWaitToUp";
             this.lblWaitToUp.Size = new System.Drawing.Size(95, 17);
@@ -849,7 +871,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // lblGoodsCount
             // 
             this.lblGoodsCount.AutoSize = true;
-            this.lblGoodsCount.Location = new System.Drawing.Point(170, 78);
+            this.lblGoodsCount.Location = new System.Drawing.Point(167, 81);
             this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.lblGoodsCount.Name = "lblGoodsCount";
             this.lblGoodsCount.Size = new System.Drawing.Size(131, 17);
@@ -859,7 +881,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // txtAddCount
             // 
-            this.txtAddCount.Location = new System.Drawing.Point(20, 75);
+            this.txtAddCount.Location = new System.Drawing.Point(18, 78);
             this.txtAddCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtAddCount.Name = "txtAddCount";
             this.txtAddCount.Size = new System.Drawing.Size(47, 23);
@@ -872,9 +894,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.panelEx2.Cursor = System.Windows.Forms.Cursors.Hand;
             this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
             this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.panelEx2.Location = new System.Drawing.Point(70, 75);
+            this.panelEx2.Location = new System.Drawing.Point(68, 78);
             this.panelEx2.Name = "panelEx2";
-            this.panelEx2.Size = new System.Drawing.Size(96, 23);
+            this.panelEx2.Size = new System.Drawing.Size(92, 23);
             this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -893,12 +915,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // label16
             // 
             this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(16, 51);
+            this.label16.Location = new System.Drawing.Point(16, 54);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label16.Name = "label16";
-            this.label16.Size = new System.Drawing.Size(56, 17);
+            this.label16.Size = new System.Drawing.Size(32, 17);
             this.label16.TabIndex = 560;
-            this.label16.Text = "筛选货号";
+            this.label16.Text = "货号";
             // 
             // ucGroupBoxEx1
             // 
@@ -984,18 +1006,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.dgvShop.AllowUserToAddRows = false;
             this.dgvShop.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
+            dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
             this.dgvShop.BackgroundColor = System.Drawing.Color.White;
             this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
             this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colSelect,
@@ -1127,18 +1149,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.dgvSelectProduct.AllowUserToAddRows = false;
             this.dgvSelectProduct.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle13.BackColor = System.Drawing.Color.WhiteSmoke;
-            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
+            dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+            this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
             this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.colCheck,
@@ -1278,8 +1300,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // colProductName
             // 
-            dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.colProductName.DefaultCellStyle = dataGridViewCellStyle15;
+            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.colProductName.DefaultCellStyle = dataGridViewCellStyle5;
             this.colProductName.HeaderText = "商品标题";
             this.colProductName.Name = "colProductName";
             this.colProductName.ReadOnly = true;
@@ -1502,7 +1524,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private DevComponents.DotNetBar.PanelEx panelEx2;
         private System.Windows.Forms.TextBox txtAddCount;
         private System.Windows.Forms.Label lblGoodsCount;
-        private System.Windows.Forms.Label lblWaitToUp;
         private DevComponents.DotNetBar.PanelEx btnClearUpload;
         private System.Windows.Forms.Panel panel3;
         private System.Windows.Forms.Label lblNewAddPrice;
@@ -1531,7 +1552,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.TextBox txtAddTimesFake;
         private System.Windows.Forms.Label label10;
         private UserComponent.UcCheckBox chkActivity;
-        private DevComponents.DotNetBar.PanelEx panelEx3;
+        private DevComponents.DotNetBar.PanelEx btnClearFilter;
         private System.Windows.Forms.TextBox txtExtCodeFilter;
         private System.Windows.Forms.Label label16;
         private System.Windows.Forms.Label label19;
@@ -1571,5 +1592,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private DevComponents.DotNetBar.PanelEx panelEx1;
         private System.Windows.Forms.TextBox txtIdFilter;
         private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.ComboBox cmbCateFilter;
+        private System.Windows.Forms.Label label2;
+        public System.Windows.Forms.Label lblWaitToUp;
     }
 }

TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.Designer.cs

@@ -36,6 +36,8 @@
             this.btnMultiLogin = new DevComponents.DotNetBar.PanelEx();
             this.btnDel = new DevComponents.DotNetBar.PanelEx();
             this.pnlUploadOpBtns = new System.Windows.Forms.Panel();
+            this.txtSendCount = new System.Windows.Forms.TextBox();
+            this.btnSendToUpload = new DevComponents.DotNetBar.PanelEx();
             this.numMinPrice = new System.Windows.Forms.NumericUpDown();
             this.label3 = new System.Windows.Forms.Label();
             this.pictureBox8 = new System.Windows.Forms.PictureBox();
@@ -49,6 +51,7 @@
             this.btnRestoreSkuImg = new DevComponents.DotNetBar.PanelEx();
             this.btnSignActivity = new DevComponents.DotNetBar.PanelEx();
             this.btnSaveSourceGoodsData = new DevComponents.DotNetBar.PanelEx();
+            this.label4 = new System.Windows.Forms.Label();
             this.btnLoginAgain = new TemuKJD.UserControls.ButtonEx();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
@@ -61,6 +64,10 @@
             this.chkCloseAfterLogin = new DevComponents.DotNetBar.Controls.CheckBoxX();
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.txtAddress = new System.Windows.Forms.TextBox();
+            this.label5 = new System.Windows.Forms.Label();
+            this.txtSendPrice = new System.Windows.Forms.TextBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.pictureBox9 = new System.Windows.Forms.PictureBox();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -80,6 +87,7 @@
             this.splitContainer2.Panel1.SuspendLayout();
             this.splitContainer2.Panel2.SuspendLayout();
             this.splitContainer2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).BeginInit();
             this.SuspendLayout();
             // 
             // splitContainer1
@@ -112,7 +120,7 @@
             this.splitContainer1.Panel2.Controls.Add(this.btnReload);
             this.splitContainer1.Panel2.Controls.Add(this.chkCloseAfterLogin);
             this.splitContainer1.Size = new System.Drawing.Size(1438, 736);
-            this.splitContainer1.SplitterDistance = 672;
+            this.splitContainer1.SplitterDistance = 668;
             this.splitContainer1.SplitterWidth = 3;
             this.splitContainer1.TabIndex = 4;
             // 
@@ -211,6 +219,12 @@
             // pnlUploadOpBtns
             // 
             this.pnlUploadOpBtns.Anchor = System.Windows.Forms.AnchorStyles.Top;
+            this.pnlUploadOpBtns.Controls.Add(this.pictureBox9);
+            this.pnlUploadOpBtns.Controls.Add(this.label6);
+            this.pnlUploadOpBtns.Controls.Add(this.txtSendPrice);
+            this.pnlUploadOpBtns.Controls.Add(this.label5);
+            this.pnlUploadOpBtns.Controls.Add(this.txtSendCount);
+            this.pnlUploadOpBtns.Controls.Add(this.btnSendToUpload);
             this.pnlUploadOpBtns.Controls.Add(this.numMinPrice);
             this.pnlUploadOpBtns.Controls.Add(this.label3);
             this.pnlUploadOpBtns.Controls.Add(this.pictureBox8);
@@ -224,11 +238,46 @@
             this.pnlUploadOpBtns.Controls.Add(this.btnRestoreSkuImg);
             this.pnlUploadOpBtns.Controls.Add(this.btnSignActivity);
             this.pnlUploadOpBtns.Controls.Add(this.btnSaveSourceGoodsData);
+            this.pnlUploadOpBtns.Controls.Add(this.label4);
             this.pnlUploadOpBtns.Location = new System.Drawing.Point(338, 3);
             this.pnlUploadOpBtns.Name = "pnlUploadOpBtns";
             this.pnlUploadOpBtns.Size = new System.Drawing.Size(812, 53);
             this.pnlUploadOpBtns.TabIndex = 463;
             // 
+            // txtSendCount
+            // 
+            this.txtSendCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtSendCount.Location = new System.Drawing.Point(778, 3);
+            this.txtSendCount.Name = "txtSendCount";
+            this.txtSendCount.Size = new System.Drawing.Size(31, 23);
+            this.txtSendCount.TabIndex = 478;
+            this.txtSendCount.Text = "10";
+            // 
+            // btnSendToUpload
+            // 
+            this.btnSendToUpload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnSendToUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnSendToUpload.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.btnSendToUpload.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnSendToUpload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.btnSendToUpload.Location = new System.Drawing.Point(616, 28);
+            this.btnSendToUpload.Name = "btnSendToUpload";
+            this.btnSendToUpload.Size = new System.Drawing.Size(193, 23);
+            this.btnSendToUpload.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSendToUpload.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSendToUpload.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnSendToUpload.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.btnSendToUpload.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.btnSendToUpload.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.btnSendToUpload.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.btnSendToUpload.Style.GradientAngle = 90;
+            this.btnSendToUpload.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnSendToUpload.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSendToUpload.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.btnSendToUpload.TabIndex = 435;
+            this.btnSendToUpload.Text = "提交机会商品到上传";
+            this.btnSendToUpload.Click += new System.EventHandler(this.btnSendToUpload_Click);
+            // 
             // numMinPrice
             // 
             this.numMinPrice.DecimalPlaces = 2;
@@ -415,6 +464,17 @@
             this.btnSaveSourceGoodsData.Text = "暂存商品图片";
             this.btnSaveSourceGoodsData.Click += new System.EventHandler(this.btnSaveSourceGoodsData_Click);
             // 
+            // label4
+            // 
+            this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label4.AutoSize = true;
+            this.label4.Location = new System.Drawing.Point(723, 6);
+            this.label4.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(56, 17);
+            this.label4.TabIndex = 479;
+            this.label4.Text = "提交份数";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
             // btnLoginAgain
             // 
             this.btnLoginAgain.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -584,6 +644,47 @@
             this.txtAddress.TabIndex = 7;
             this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown);
             // 
+            // label5
+            // 
+            this.label5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label5.AutoSize = true;
+            this.label5.Location = new System.Drawing.Point(613, 6);
+            this.label5.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(56, 17);
+            this.label5.TabIndex = 491;
+            this.label5.Text = "提交价格";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // txtSendPrice
+            // 
+            this.txtSendPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.txtSendPrice.Location = new System.Drawing.Point(668, 3);
+            this.txtSendPrice.Name = "txtSendPrice";
+            this.txtSendPrice.Size = new System.Drawing.Size(31, 23);
+            this.txtSendPrice.TabIndex = 492;
+            this.txtSendPrice.Text = "20";
+            // 
+            // label6
+            // 
+            this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.label6.AutoSize = true;
+            this.label6.Location = new System.Drawing.Point(699, 6);
+            this.label6.Name = "label6";
+            this.label6.Size = new System.Drawing.Size(20, 17);
+            this.label6.TabIndex = 493;
+            this.label6.Text = "元";
+            this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // pictureBox9
+            // 
+            this.pictureBox9.Location = new System.Drawing.Point(586, 27);
+            this.pictureBox9.Name = "pictureBox9";
+            this.pictureBox9.Size = new System.Drawing.Size(24, 24);
+            this.pictureBox9.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+            this.pictureBox9.TabIndex = 494;
+            this.pictureBox9.TabStop = false;
+            this.pictureBox9.Tag = "11";
+            // 
             // PDDShopLoginForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -620,6 +721,7 @@
             this.splitContainer2.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
             this.splitContainer2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.pictureBox9)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -658,5 +760,12 @@
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.NumericUpDown numMinPrice;
+        private System.Windows.Forms.TextBox txtSendCount;
+        private DevComponents.DotNetBar.PanelEx btnSendToUpload;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.TextBox txtSendPrice;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.PictureBox pictureBox9;
     }
 }

TEMUKJD/PDDForms/ShopForms/PDDShopLoginForm.cs

@@ -25,6 +25,7 @@ using System.Windows.Forms;
 using Work;
 using Work.BLL.Tools;
 using TemuKJD.BLL;
+using AllBase.Model.Result.PDDResult;
 
 namespace TemuKJD.PDDForms.ShopForms
 {
@@ -38,11 +39,16 @@ namespace TemuKJD.PDDForms.ShopForms
     {
         public static PDDShopLoginForm shopLoginInstance { get; set; } = null;
         public ProductSelectForms.PDDDBProdUserSelectForm prodUserSelectForm { get; set; } = null;
-        public static string pddUploadGoodsData = "";
+
+        public  string pddUploadGoodsData = "";
         //public static AllBase.Model.Param.PDDProdParam.PDDProductUploadParam prodParam = null;
-        public static string pddSourceGoodsData = "";
-        public static string pddSourceGoodsDataTemp = "";
+        public  string pddSourceGoodsDetail = "";
         //public static AllBase.Model.Result.PDDResult.PDDProductDetailInfo prodInfo = null;
+        public  string pddSourceGoodsDetailTemp = "";
+        public  string pddSourceGoodsDecorationTemp = "";
+        public  string pddSourceGoodsChanceId = "";
+        public  string pddGetChanceGoodsRefere = "";
+        public  string pddEditChanceGoodsRefereChanceTab = "";
 
         public int CloseAfterSecond { get; set; }
         public EnumOpenType openType = EnumOpenType.manage;
@@ -76,7 +82,11 @@ namespace TemuKJD.PDDForms.ShopForms
         {
             this.splitContainer1.SplitterDistance = this.splitContainer1.Height - 62;
             this.pnlUploadOpBtns.Visible = this.prodUserSelectForm != null;
-            pddSourceGoodsDataTemp = "";
+            pddSourceGoodsDetailTemp = "";
+            pddSourceGoodsDecorationTemp = ""; // 详情装修
+            pddSourceGoodsChanceId = "";
+            pddGetChanceGoodsRefere = "";
+            pddEditChanceGoodsRefereChanceTab = "";
 
             if (isMultiLogin && shop != null)
             {
@@ -581,6 +591,7 @@ namespace TemuKJD.PDDForms.ShopForms
         private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request)
         {
             var antiContent = request.Headers.AllKeys.Contains("Anti-Content") ? request.Headers["Anti-Content"] : "";
+            var refere = request.ReferrerUrl;
             if (shop != null && !url.StartsWith("https://mms.pinduoduo.com/janus/api/userinfo") && !string.IsNullOrEmpty(antiContent) && request.Method == "POST")
             {
                 Task.Run(() =>
@@ -649,24 +660,50 @@ namespace TemuKJD.PDDForms.ShopForms
                 catch (Exception ex)
                 {
                     pddUploadGoodsData = "";
-                    //prodParam = null;
                 }
             }
+            if (prodUserSelectForm != null && url.StartsWith("https://mms.pinduoduo.com/opportunity-goods/chance-goods/quick_release"))
+            {
+                var data = postData;
+                Task.Run(() =>
+                {
+                    pddSourceGoodsChanceId = BaseRegex.GetStringJson(ref postData, "chance_id");
+                    pddGetChanceGoodsRefere = refere;
+                });
+            }
             if (prodUserSelectForm != null && url.StartsWith("https://mms.pinduoduo.com/glide/v2/mms/query/commit/detail"))
             {
                 Task.Run(() =>
                 {
-                    pddSourceGoodsDataTemp = responseData;
+                    pddSourceGoodsDetailTemp = responseData;
                     try
                     {
-                        JObject jObj = JObject.Parse(pddSourceGoodsDataTemp);
+                        JObject jObj = JObject.Parse(pddSourceGoodsDetailTemp);
                         var prodInfoStr = JsonHelper.SerializeObject(jObj["result"]);
                         var prodInfo = JsonHelper.DeserializeJsonToObject<AllBase.Model.Result.PDDResult.PDDProductDetailInfo>(prodInfoStr);
+                        pddEditChanceGoodsRefereChanceTab = BaseRegex.GetStringQuery(ref refere, "chance_tab");
                     }
                     catch (Exception ex)
                     {
-                        pddSourceGoodsDataTemp = "";
-                        //prodInfo = null;
+                        pddSourceGoodsDetailTemp = "";
+                        pddEditChanceGoodsRefereChanceTab = "";
+                    }
+                });
+            }
+            if (prodUserSelectForm != null && url.StartsWith("https://mms.pinduoduo.com/gorse/mms/goods/decoration/commit/query/V2"))
+            {
+                Task.Run(() =>
+                {
+                    pddSourceGoodsDecorationTemp = responseData;
+                    try
+                    {
+                        JObject jObj = JObject.Parse(pddSourceGoodsDecorationTemp);
+                        var prodDecorationTStr = JsonHelper.SerializeObject(jObj["result"]);
+                        var prodDecoration = JsonHelper.DeserializeJsonToObject<AllBase.Model.Result.PDDResult.PDDProductDecorationInfo>(prodDecorationTStr);
+                    }
+                    catch (Exception ex)
+                    {
+                        pddSourceGoodsDecorationTemp = "";
                     }
                 });
             }
@@ -1116,16 +1153,16 @@ function getElementWithText(sText)
 
         private void btnSaveSourceGoodsData_Click(object sender, EventArgs e)
         {
-            if (string.IsNullOrEmpty(pddSourceGoodsDataTemp))
+            if (string.IsNullOrEmpty(pddSourceGoodsDetailTemp))
             {
                 BaseMsgForm.ShowError("未捕获到商品详情！");
                 return;
             }
-            pddSourceGoodsData = pddSourceGoodsDataTemp;
+            pddSourceGoodsDetail = pddSourceGoodsDetailTemp;
 
             try
             {
-                JObject jObj = JObject.Parse(pddSourceGoodsData);
+                JObject jObj = JObject.Parse(pddSourceGoodsDetail);
                 var prodInfoStr = JsonHelper.SerializeObject(jObj["result"]);
                 var prodInfo = JsonHelper.DeserializeJsonToObject<AllBase.Model.Result.PDDResult.PDDProductDetailInfo>(prodInfoStr);
 
@@ -1168,7 +1205,7 @@ function getElementWithText(sText)
                 BaseMsgForm.ShowError("不是从上传界面进入！");
                 return;
             }
-            if (string.IsNullOrEmpty(pddSourceGoodsData))
+            if (string.IsNullOrEmpty(pddSourceGoodsDetail))
             {
                 BaseMsgForm.ShowError("未捕获到商品详情！");
                 return;
@@ -1180,7 +1217,7 @@ function getElementWithText(sText)
             }
             try
             {
-                JObject jObj = JObject.Parse(pddSourceGoodsData);
+                JObject jObj = JObject.Parse(pddSourceGoodsDetail);
                 var prodInfoStr = JsonHelper.SerializeObject(jObj["result"]);
                 prodInfo = JsonHelper.DeserializeJsonToObject<AllBase.Model.Result.PDDResult.PDDProductDetailInfo>(prodInfoStr);
                 prodParam = JsonHelper.DeserializeJsonToObject<AllBase.Model.Param.PDDProdParam.PDDProductUploadParam>(pddUploadGoodsData);
@@ -1260,7 +1297,7 @@ function getElementWithText(sText)
                 BaseMsgForm.ShowError("不是从上传界面进入！");
                 return;
             }
-            if (string.IsNullOrEmpty(pddSourceGoodsData))
+            if (string.IsNullOrEmpty(pddSourceGoodsDetail))
             {
                 BaseMsgForm.ShowError("未捕获到商品详情！");
                 return;
@@ -1272,7 +1309,7 @@ function getElementWithText(sText)
             }
             try
             {
-                JObject jObj = JObject.Parse(pddSourceGoodsData);
+                JObject jObj = JObject.Parse(pddSourceGoodsDetail);
                 var prodInfoStr = JsonHelper.SerializeObject(jObj["result"]);
                 prodInfo = JsonHelper.DeserializeJsonToObject<AllBase.Model.Result.PDDResult.PDDProductDetailInfo>(prodInfoStr);
                 prodParam = JsonHelper.DeserializeJsonToObject<AllBase.Model.Param.PDDProdParam.PDDProductUploadParam>(pddUploadGoodsData);
@@ -1333,5 +1370,109 @@ function getElementWithText(sText)
         {
 
         }
+
+        private void btnSendToUpload_Click(object sender, EventArgs e)
+        {
+            if (prodUserSelectForm == null)
+            {
+                BaseMsgForm.ShowError("上传窗口不存在！");
+                return;
+            }
+
+            try
+            {
+                JObject jObj = JObject.Parse(pddSourceGoodsDetailTemp);
+                var prodInfoStr = JsonHelper.SerializeObject(jObj["result"]);
+                PDDProductDetailInfo detailInfo = JsonHelper.DeserializeJsonToObject<PDDProductDetailInfo>(prodInfoStr);
+
+                var skuPrice = (this.txtSendPrice.Text.ParseToDecimal() * 100).ParseToInt();
+                foreach (var sku in detailInfo.sku)
+                {
+                    sku.multi_price = skuPrice;
+                    sku.price = sku.multi_price + 100;
+                }
+                if (detailInfo.market_price < (this.txtSendPrice.Text.ParseToDecimal() * 100).ParseToInt() + 1000)
+                {
+                    detailInfo.market_price = skuPrice + 1000;
+                }
+
+                jObj = JObject.Parse(pddSourceGoodsDecorationTemp);
+                var prodDecorationTStr = JsonHelper.SerializeObject(jObj["result"]);
+                PDDProductDecorationInfo decorationInfo = JsonHelper.DeserializeJsonToObject<PDDProductDecorationInfo>(prodDecorationTStr);
+
+                string main_img = detailInfo.image_url;
+                if (string.IsNullOrEmpty(main_img))
+                    main_img = detailInfo.hd_thumb_url;
+                if (string.IsNullOrEmpty(main_img))
+                    main_img = detailInfo.thumb_url;
+                if (string.IsNullOrEmpty(main_img))
+                    main_img = (detailInfo.galleries?.FirstOrDefault()?.url).ParseToString().Replace("https://", "http://");
+
+                PDDProductInfo pddProdInfo = new PDDProductInfo()
+                {
+                    chance_id = pddSourceGoodsChanceId,
+                    chance_refere = pddGetChanceGoodsRefere,
+                    chance_tab = pddEditChanceGoodsRefereChanceTab,
+                    decoration = decorationInfo,
+                    detail = detailInfo,
+                    material1 = new PDDMaterialInfo(),
+                    material3 = new PDDMaterialInfo(),
+                    property = new PDDProductPropertyInfo(),
+                    size = new PDDSizeSpecInfo(),
+                };
+                pddProdInfo.property.goods_properties = new List<goods_propertie_item>();
+
+                KJDDBProduct dbProd = new KJDDBProduct()
+                {
+                    add_time = DateTime.Now,
+                    cat_id = detailInfo.cat_id.ParseToString(),
+                    cat_name = detailInfo.cats?.LastOrDefault(c => !string.IsNullOrEmpty(c)).ParseToString(),
+                    ext_code = "",
+                    end_words = "",
+                    fission_words = "",
+                    from_shop_id = "机会商品",
+                    group = "",
+                    head_words = "",
+                    id = -1,
+                    isPddUpLoad = true,
+                    main_cat_id = (detailInfo.cat_ids?.FirstOrDefault(c => c != null)).ParseToString(),
+                    main_cat_name = (detailInfo.cats?.FirstOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(),
+                    main_img = main_img,
+                    mdy_time = DateTime.Now,
+                    notes = "机会商品",
+                    price_text = detailInfo.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + detailInfo.sku.Max(s => s.multi_price).ParseToInt() * 0.01m,
+                    product_json = JsonHelper.SerializeObject(pddProdInfo),
+                    product_name = detailInfo.goods_name,
+                    select_count = 0,
+                    select_total_count = 0,
+                    size_json = "",
+                    skc_id = detailInfo.goods_id.ParseToString(),
+                    sku_img_replace_url = "",
+                    sku_img_replace_id = 0,
+                    sku_img_replace_base64 = "",
+                    spu_id = detailInfo.goods_id.ParseToString(),
+                };
+
+                for (int i = 0; i< txtSendCount.Text.ParseToInt(); i++)
+                {
+                    var selectProd = JsonHelper.DeserializeJsonToObject<TemuDBProductSelect>(JsonHelper.SerializeObject(dbProd));
+                    selectProd.out_product_Id = dbProd.id.ToString();
+                    selectProd.id = 1;
+                    selectProd.kjdDbProduct = dbProd;
+                    if (prodUserSelectForm.lstTemuDBProductSelect.Count > 0)
+                        selectProd.id = prodUserSelectForm.lstTemuDBProductSelect.Max(p => p.id) + 1;
+                    prodUserSelectForm.lstTemuDBProductSelect.Add(selectProd);
+                }
+
+                Invoke(new Action(() =>
+                {
+                    prodUserSelectForm.lblWaitToUp.Text = "待上传商品 " + prodUserSelectForm.lstTemuDBProductSelect.Count + " 件";
+                    NaiBa.Util.Helper.ConfigHelper.SaveConfig("pdd_db_prod_upload_list", prodUserSelectForm.lstTemuDBProductSelect);
+                }));
+            }
+            catch (Exception ex)
+            {
+            }
+        }
     }
 }