书籍类目采集和入库

AllBase/BaseClass.cs

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

AllBase/Model/Result/KJDDBProduct.cs

@@ -69,5 +69,6 @@ namespace AllBase.Model.Result
         public int? sale_count { get; set; }
         public string sale_count_text { get; set; }
         public string wx_safe_status { get; set; }
+        public string special_prod_type { get; set; }
     }
 }

KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs

@@ -42,6 +42,10 @@ namespace KJD_Web.BLL.BXX
                 string product_get_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "product_get_type"))?.Replace("'", "\\'");
                 string sale_count = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count"))?.Replace("'", "\\'");
                 string sale_count_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count_text"))?.Replace("'", "\\'");
+                string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'");
+                if (special_prod_type == null)
+                    special_prod_type = "普通商品";
+                
                 if (string.IsNullOrEmpty(product_get_type))
                 {
                     product_get_type = "母店采集";
@@ -55,13 +59,14 @@ namespace KJD_Web.BLL.BXX
                 string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString;
                 MysqlUtils mySql = new MysqlUtils(conn);
                 string sql = "";
-
-                //UPDATE `bxx`.`product` set sku_img_replace_id=18 where prod_type = '拖鞋' and sku_img_replace_id<12 order by rand() limit 50;
-                sql = "insert into bxx.product (from_shop_id,spu_id,skc_id,main_cat_id,main_cat_name,cat_id,cat_name,price_text," +
-                    "product_name,ext_code,main_img,product_json,size_json,notes,product_get_type,sale_count,sale_count_text,add_time,mdy_time) " +
+                sql = "insert into ";
+                sql += "bxx.product ";
+                sql +="(from_shop_id,spu_id,skc_id,main_cat_id,main_cat_name,cat_id,cat_name,price_text,product_name,ext_code," +
+                    "main_img,product_json,size_json,notes,product_get_type,sale_count,sale_count_text,special_prod_type,add_time,mdy_time) " +
                     "values ('" + from_shop_id + "','" + spu_id + "','" + skc_id + "','" + main_cat_id + "','" + main_cat_name + "','" + 
                     cat_id + "','" + cat_name + "','" + price_text + "','" + product_name + "','" + ext_code + "','" + main_img + "','" + 
                     product_json + "','" + size_json + "','" + notes + "','" + product_get_type + "','" + sale_count + "','" + sale_count_text + "','" +
+                    special_prod_type + "','" +
                     DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" +
                     DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');";
                 var rst = mySql.ExecuteNonQuery(sql);
@@ -107,6 +112,7 @@ namespace KJD_Web.BLL.BXX
                 string sale_count = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count"))?.Replace("'", "\\'");
                 string sale_count_text = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sale_count_text"))?.Replace("'", "\\'");
                 string wx_safe_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_safe_status"))?.Replace("'", "\\'");
+                string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'");
 
                 if (string.IsNullOrEmpty(user_name))
                 {
@@ -150,6 +156,8 @@ namespace KJD_Web.BLL.BXX
                     sql += " p.sale_count_text='" + sale_count_text + "',";
                 if (wx_safe_status != null)
                     sql += " p.wx_safe_status='" + wx_safe_status + "',";
+                if (special_prod_type != null && special_prod_type != "")
+                    sql += " p.special_prod_type='" + special_prod_type + "',";
                 sql += " p.mdy_time='" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',";
                 sql = sql.TrimEnd(',');
                 sql += " where spu_id='" + spu_id + "';";
@@ -169,6 +177,7 @@ namespace KJD_Web.BLL.BXX
 
         public string GetProductList(string inputData, bool isDetail = false)
         {
+            var timeCalc = DateTime.Now;
             if (!string.IsNullOrEmpty(inputData))
             {
                 var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
@@ -192,6 +201,7 @@ namespace KJD_Web.BLL.BXX
                 var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.Replace("'", "\\'");
                 var sort_field = RegexUtils.GetStringQuery(ref inputData, "sort_field")?.Replace("'", "\\'");
                 var wx_safe_status = RegexUtils.GetStringQuery(ref inputData, "wx_safe_status")?.Replace("'", "\\'");
+                var special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'");
 
                 int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
                 int page_size= RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
@@ -202,6 +212,17 @@ namespace KJD_Web.BLL.BXX
                 string sql = "select count(id) from bxx.product p where p.is_del=0";
 
                 string where = "";
+                if (!string.IsNullOrEmpty(from_shop_id))
+                    where += " and p.from_shop_id ='" + from_shop_id + "'";
+                if (!string.IsNullOrEmpty(search_db_ids))
+                    where += " and p.id in (" + search_db_ids + ")";
+                if (!string.IsNullOrEmpty(product_get_type))
+                    where += " and p.product_get_type ='" + product_get_type + "'";
+                if (!string.IsNullOrEmpty(wx_safe_status))
+                    where += " and p.wx_safe_status ='" + wx_safe_status + "'";
+                if (!string.IsNullOrEmpty(special_prod_type))
+                    where += " and p.special_prod_type ='" + special_prod_type + "'";
+
                 if (!string.IsNullOrWhiteSpace(search_spu))
                     where += " and p.spu_id like '%" + search_spu + "%'";
                 if (!string.IsNullOrWhiteSpace(search_skc))
@@ -216,14 +237,6 @@ namespace KJD_Web.BLL.BXX
                     where += " and p.group like '%" + search_group + "%'";
                 if (!string.IsNullOrWhiteSpace(search_notes))
                     where += " and p.notes like '%" + search_notes + "%'";
-                if (!string.IsNullOrEmpty(from_shop_id))
-                    where += " and p.from_shop_id ='" + from_shop_id + "'";
-                if (!string.IsNullOrEmpty(product_get_type))
-                    where += " and p.product_get_type ='" + product_get_type + "'";
-                if (!string.IsNullOrEmpty(wx_safe_status))
-                    where += " and p.wx_safe_status ='" + wx_safe_status + "'";
-                if (!string.IsNullOrEmpty(search_db_ids))
-                    where += " and p.id in (" + search_db_ids + ")";
                 sql += where;
 
                 var count = mySql.ExecuteRowCount(sql);
@@ -243,7 +256,7 @@ namespace KJD_Web.BLL.BXX
                     else if (string.IsNullOrEmpty(get_select_count))
                         sql = "select p.id,p.from_shop_id,p.spu_id,p.skc_id,p.main_cat_id,p.main_cat_name,p.cat_id,p.cat_name,p.price_text,p.ext_code,p.product_name,p.main_img,p.notes," +
                             " p.add_time,p.mdy_time,p.select_total_count,p.fission_words,p.head_words,p.end_words,p.sku_img_replace_id,p.group,p.product_get_type,p.wx_safe_status," +
-                            " p.sale_count,p.sale_count_text,s.img_url,e.ext_code_price" +
+                            " p.sale_count,p.sale_count_text,p.special_prod_type,s.img_url,e.ext_code_price" +
                             " FROM bxx.product p " +
                             " left join bxx.sku_img_replace s ON p.sku_img_replace_id=s.id" +
                             " LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" +
@@ -251,7 +264,7 @@ namespace KJD_Web.BLL.BXX
                     else
                         sql = "SELECT p.id,p.from_shop_id,p.spu_id,p.skc_id,p.main_cat_id,p.main_cat_name,p.cat_id,p.cat_name,p.price_text,p.ext_code,p.product_name,p.main_img,p.notes," +
                             " p.add_time,p.mdy_time,p.select_total_count,p.fission_words,p.head_words,p.end_words,p.sku_img_replace_id,p.group,p.product_get_type,p.wx_safe_status," +
-                            " p.sale_count,p.sale_count_text,s.img_url,COUNT(se.id) AS select_count," +
+                            " p.sale_count,p.sale_count_text,p.special_prod_type,s.img_url,COUNT(se.id) AS select_count," +
                             " e.ext_code_price" +
                             " FROM bxx.product p left join bxx.sku_img_replace s ON p.sku_img_replace_id=s.id LEFT JOIN bxx.product_select se ON p.id=se.out_product_id AND se.shop_id='" + select_shop_id + "' " +
                             " LEFT JOIN bxx.ext_code_price e ON p.ext_code=e.ext_code" +
@@ -307,6 +320,7 @@ namespace KJD_Web.BLL.BXX
                                 sale_count = row["sale_count"].ParseToInt(),
                                 sale_count_text = row["sale_count_text"].ToString(),
                                 wx_safe_status = row["wx_safe_status"].ToString(),
+                                special_prod_type = row["special_prod_type"].ToString(),
                             };
                             if (isDetail)
                             {
@@ -323,7 +337,8 @@ namespace KJD_Web.BLL.BXX
                             productLst.Add(prod);
                         }
                         var data = JsonUtils.SerializerObjectToString(productLst);
-                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
+                        var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
                     }
                     catch (Exception ex)
                     {
@@ -545,6 +560,7 @@ namespace KJD_Web.BLL.BXX
         /// <returns></returns>
         public string GetProductListRandom(string inputData)
         {
+            var timeCalc = DateTime.Now;
             if (!string.IsNullOrEmpty(inputData))
             {
                 var time = RegexUtils.GetStringQuery(ref inputData, "time").ParseToInt();
@@ -560,6 +576,7 @@ namespace KJD_Web.BLL.BXX
                 var in_cates = RegexUtils.GetStringQuery(ref inputData, "in_cates")?.Replace("'", "\\'");
                 var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.Replace("'", "\\'");
                 var wx_safe_status = RegexUtils.GetStringQuery(ref inputData, "wx_safe_status")?.Replace("'", "\\'");
+                var special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'");
 
                 int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt();
                 int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50);
@@ -594,6 +611,8 @@ namespace KJD_Web.BLL.BXX
                     where += " and p.product_get_type ='" + product_get_type + "'";
                 if (!string.IsNullOrEmpty(wx_safe_status))
                     where += " and p.wx_safe_status ='" + wx_safe_status + "'";
+                if (!string.IsNullOrEmpty(special_prod_type))
+                    where += " and p.special_prod_type ='" + special_prod_type + "'"; 
 
                 sql += where;
 
@@ -608,7 +627,7 @@ namespace KJD_Web.BLL.BXX
                 {
                     sql = "select p.id,p.from_shop_id,p.spu_id,p.skc_id,p.main_cat_id,p.main_cat_name,p.cat_id,p.cat_name,p.price_text,p.ext_code," +
                         "p.product_name,p.main_img,p.group,p.notes,p.add_time,p.mdy_time,p.select_total_count,p.product_get_type,p.sale_count,p.sale_count_text," +
-                        "p.fission_words,p.head_words,p.end_words,p.wx_safe_status from bxx.product p where p.is_del=0";
+                        "p.fission_words,p.head_words,p.end_words,p.wx_safe_status,p.special_prod_type from bxx.product p where p.is_del=0";
 
                     //where子句
                     sql += where;
@@ -654,11 +673,13 @@ namespace KJD_Web.BLL.BXX
                                 sale_count = row["sale_count"].ParseToInt(),
                                 sale_count_text = row["sale_count_text"].ToString(),
                                 wx_safe_status = row["wx_safe_status"].ToString(),
+                                special_prod_type = row["special_prod_type"].ToString(),
                             };
                             productLst.Add(prod);
                         }
                         var data = JsonUtils.SerializerObjectToString(productLst);
-                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + "}";
+                        var seconds = (DateTime.Now - timeCalc).TotalSeconds.ToString("0.000");
+                        return "{\"code\":200,\"msg\":\"success\",\"data\":" + data + ",\"count\":" + count + ",\"seconds\":" + seconds + "}";
                     }
                     catch (Exception ex)
                     {
@@ -870,6 +891,7 @@ namespace KJD_Web.BLL.BXX
                 string end_words = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "end_words"))?.Replace("'", "\\'");
                 string sku_edit_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "sku_edit_json"))?.Replace("'", "\\'");
                 string wx_safe_status = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "wx_safe_status"))?.Replace("'", "\\'");
+                string special_prod_type = RegexUtils.GetStringQuery(ref inputData, "special_prod_type")?.Replace("'", "\\'");
 
                 if (string.IsNullOrEmpty(user_name))
                 {
@@ -897,6 +919,8 @@ namespace KJD_Web.BLL.BXX
                     sql += " p.sku_edit_json='" + sku_edit_json + "',";
                 if (wx_safe_status != null)
                     sql += " p.wx_safe_status='" + wx_safe_status + "',";
+                if (special_prod_type != null && special_prod_type != "")
+                    sql += " p.special_prod_type='" + special_prod_type + "',";
                 sql = sql.TrimEnd(',');
                 if (in_db_ids != null)
                 {

KJDService/KJD_WebService/BLL/KJD/ProductThirdManage.cs

@@ -970,33 +970,32 @@ namespace KJD_Web.BLL
                         if (search_year >= 2026)
                             tableName += "_" + search_year;
 
-                        sql = "SELECT s.id,s.out_product_id,s.shop_id,s.shop_account,s.user_name," +
-                            "s.sub_user_name,s.notes,s.user_notes,s.status,s.draft_id,s.add_times,s.add_time,s.mdy_time," +
-                            "s.fission_product_name,s.operate_sub_sa_name,s.add_sub_sa_time," +
-                            "p.spu_id,p.skc_id,p.cat_id,p.cat_name,p.change_cat_id,p.change_cat_name,p.ext_code,p.product_name,p.main_img," +
-                            "u.nick_name as operate_sub_sa_nick " +
-                            "FROM " + tableName + " s LEFT JOIN kjd.third_product p ON s.out_product_id=p.id " +
-                            "LEFT JOIN kjd.user u ON u.user_name=s.operate_sub_sa_name " +
-                            "WHERE 1=1";
-                        sql += where; // where子句
-                        sql += " order by s.add_time desc";
-                        sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
-
-
+                        //sql = "SELECT s.id,s.out_product_id,s.shop_id,s.shop_account,s.user_name," +
+                        //    "s.sub_user_name,s.notes,s.user_notes,s.status,s.draft_id,s.add_times,s.add_time,s.mdy_time," +
+                        //    "s.fission_product_name,s.operate_sub_sa_name,s.add_sub_sa_time," +
+                        //    "p.spu_id,p.skc_id,p.cat_id,p.cat_name,p.change_cat_id,p.change_cat_name,p.ext_code,p.product_name,p.main_img," +
+                        //    "u.nick_name as operate_sub_sa_nick " +
+                        //    "FROM " + tableName + " s LEFT JOIN kjd.third_product p ON s.out_product_id=p.id " +
+                        //    "LEFT JOIN kjd.user u ON u.user_name=s.operate_sub_sa_name " +
+                        //    "WHERE 1=1";
+                        //sql += where; // where子句
+                        //sql += " order by s.add_time desc";
+                        //sql += " limit " + Math.Max(page - 1, 0) * page_size + "," + page_size;
+                        //--------------------------------------------------------------------------------------------------------
                         sql = "SELECT s1.id,s1.out_product_id,s1.shop_id,s1.shop_account,s1.user_name," +
                             "s1.sub_user_name,s1.notes,s1.user_notes,s1.status,s1.draft_id,s1.add_times,s1.add_time,s1.mdy_time," +
                             "s1.fission_product_name,s1.operate_sub_sa_name,s1.add_sub_sa_time," +
                             "s2.spu_id,s2.skc_id,s2.cat_id,s2.cat_name,s2.change_cat_id,s2.change_cat_name,s2.ext_code,s2.product_name,s2.main_img ";
-                        if (operate_sub_sa_name != null || 1 == 2)
+                        if (operate_sub_sa_name != null || 1 == 1)
                             sql += ",s2.operate_sub_sa_nick";
                         sql += " FROM " + tableName + " s1";
                         // 子查询
                         sql += " JOIN (SELECT s.id," +
                             "p.spu_id,p.skc_id,p.cat_id,p.cat_name,p.change_cat_id,p.change_cat_name,p.ext_code,p.product_name,p.main_img ";
-                        if (operate_sub_sa_name != null || 1 == 2)
+                        if (operate_sub_sa_name != null || 1 == 1)
                             sql += ",u.nick_name as operate_sub_sa_nick ";
                         sql += " FROM " + tableName + " s LEFT JOIN kjd.third_product p ON s.out_product_id=p.id ";
-                        if (operate_sub_sa_name != null || 1 == 2)
+                        if (operate_sub_sa_name != null || 1 == 1)
                             sql += "LEFT JOIN kjd.user u ON u.user_name=s.operate_sub_sa_name ";
                         sql += "WHERE 1=1";
                         sql += where; // where子句
@@ -1077,7 +1076,7 @@ namespace KJD_Web.BLL
                                 //product_json = row["product_json"].ToString(),
                                 //size_json = row["size_json"].ToString(),
                             };
-                            if (operate_sub_sa_name != null || 1 == 2)
+                            if (operate_sub_sa_name != null || 1 == 1)
                             {
                                 prodSelect.operate_sub_sa_nick = row["operate_sub_sa_nick"].ToString();
                             }

KJDService/KJD_WebService/Model/DBProductResultParam.cs

@@ -76,5 +76,6 @@ namespace KJD_Web.Model
         public int sale_count { get; set; }
         public string sale_count_text { get; set; }
         public string wx_safe_status { get; set; }
+        public string special_prod_type { get; set; }
     }
 }

TEMUKJD/BLL/PDDProdFormConverter.cs

@@ -13,7 +13,7 @@ namespace TemuKJD.BLL
 {
     public class PDDProdFormConverter
     {
-        public string PddConvert(string outProdJson, bool UpdateOldData = true)
+        public string PddConvert(string outProdJson, bool UpdateOldData = true, string specialProdType = null)
         {
             PDDFrontProductInfo frontProdInfo = null;
             try
@@ -365,6 +365,8 @@ namespace TemuKJD.BLL
                 "&sale_count=" + HttpUtility.UrlEncode(prodInfo.sale_count, Encoding.UTF8) +
                 "&sale_count_text=" + HttpUtility.UrlEncode(prodInfo.sale_count_text, Encoding.UTF8) +
                 "&product_get_type=" + HttpUtility.UrlEncode("外部数据", Encoding.UTF8);
+            if (!string.IsNullOrEmpty(specialProdType))
+                data += "&special_prod_type=" + HttpUtility.UrlEncode(specialProdType, Encoding.UTF8);
 
             html = GetHtml.PostUtf8(url, data);
             if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))

TEMUKJD/ChangeForm.cs

@@ -39,7 +39,7 @@ namespace TemuKJD
             pnlExtend.Visible = BaseClass.DarenYaoyue;
 
             //直接登录上货工具
-            if (BaseClass.MainPath != "weixin")
+            if (BaseClass.MainPath != "weixin1")
             {
                 label1.Visible = true;
                 pnlChat.Visible = pnlUploadGoods.Visible = false;

TEMUKJD/KJDForms/ProductSelectForms/DbProductListForm.cs

@@ -700,7 +700,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
                 using (StreamReader sr = new StreamReader(openFileDialog.FileName, System.Text.Encoding.UTF8))
                 {
                     string fileName = openFileDialog.FileName;
-                    string importStr = sr.ReadToEnd().Trim();;
+                    string importStr = sr.ReadToEnd().Trim();
                     try
                     {
                         // 通用格式

TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs

@@ -42,7 +42,6 @@
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.cmbSearchYear = new System.Windows.Forms.ComboBox();
             this.numMaxWaitSecond = new System.Windows.Forms.NumericUpDown();
             this.btnForceEnable = new DevComponents.DotNetBar.PanelEx();
             this.label22 = new System.Windows.Forms.Label();
@@ -95,6 +94,8 @@
             this.btnExport = new DevComponents.DotNetBar.PanelEx();
             this.btnDel = new DevComponents.DotNetBar.PanelEx();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.label12 = new System.Windows.Forms.Label();
+            this.cmbSearchYear = new System.Windows.Forms.ComboBox();
             this.cmbUserNotes = new System.Windows.Forms.ComboBox();
             this.cmbNotes = new System.Windows.Forms.ComboBox();
             this.label13 = new System.Windows.Forms.Label();
@@ -157,7 +158,6 @@
             this.colOpResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
             this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
-            this.label12 = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -248,20 +248,6 @@
             this.splitContainer1.SplitterDistance = 120;
             this.splitContainer1.TabIndex = 2;
             // 
-            // cmbSearchYear
-            // 
-            this.cmbSearchYear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbSearchYear.FormattingEnabled = true;
-            this.cmbSearchYear.Items.AddRange(new object[] {
-            "2025",
-            "2026"});
-            this.cmbSearchYear.Location = new System.Drawing.Point(1017, 8);
-            this.cmbSearchYear.Margin = new System.Windows.Forms.Padding(0);
-            this.cmbSearchYear.Name = "cmbSearchYear";
-            this.cmbSearchYear.Size = new System.Drawing.Size(55, 25);
-            this.cmbSearchYear.TabIndex = 808;
-            this.cmbSearchYear.Text = "2026";
-            // 
             // numMaxWaitSecond
             // 
             this.numMaxWaitSecond.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -1135,6 +1121,31 @@
             this.tableLayoutPanel1.Size = new System.Drawing.Size(1072, 42);
             this.tableLayoutPanel1.TabIndex = 469;
             // 
+            // label12
+            // 
+            this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.label12.AutoSize = true;
+            this.label12.Location = new System.Drawing.Point(985, 12);
+            this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label12.Name = "label12";
+            this.label12.Size = new System.Drawing.Size(32, 17);
+            this.label12.TabIndex = 836;
+            this.label12.Text = "年份";
+            // 
+            // cmbSearchYear
+            // 
+            this.cmbSearchYear.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbSearchYear.FormattingEnabled = true;
+            this.cmbSearchYear.Items.AddRange(new object[] {
+            "2025",
+            "2026"});
+            this.cmbSearchYear.Location = new System.Drawing.Point(1017, 11);
+            this.cmbSearchYear.Margin = new System.Windows.Forms.Padding(0);
+            this.cmbSearchYear.Name = "cmbSearchYear";
+            this.cmbSearchYear.Size = new System.Drawing.Size(55, 25);
+            this.cmbSearchYear.TabIndex = 808;
+            this.cmbSearchYear.Text = "2026";
+            // 
             // cmbUserNotes
             // 
             this.cmbUserNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -1143,7 +1154,7 @@
             "全部",
             "重上",
             "已买"});
-            this.cmbUserNotes.Location = new System.Drawing.Point(927, 11);
+            this.cmbUserNotes.Location = new System.Drawing.Point(927, 8);
             this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0);
             this.cmbUserNotes.Name = "cmbUserNotes";
             this.cmbUserNotes.Size = new System.Drawing.Size(52, 25);
@@ -1160,7 +1171,7 @@
             "核价成功",
             "核价成功（重复）",
             "重复"});
-            this.cmbNotes.Location = new System.Drawing.Point(813, 11);
+            this.cmbNotes.Location = new System.Drawing.Point(813, 8);
             this.cmbNotes.Margin = new System.Windows.Forms.Padding(0);
             this.cmbNotes.Name = "cmbNotes";
             this.cmbNotes.Size = new System.Drawing.Size(52, 25);
@@ -1187,7 +1198,7 @@
             "已上传",
             "草稿箱",
             "全部"});
-            this.cmbStatus.Location = new System.Drawing.Point(723, 11);
+            this.cmbStatus.Location = new System.Drawing.Point(723, 8);
             this.cmbStatus.Margin = new System.Windows.Forms.Padding(0);
             this.cmbStatus.Name = "cmbStatus";
             this.cmbStatus.Size = new System.Drawing.Size(52, 25);
@@ -1832,17 +1843,6 @@
             this.statusBar.Size = new System.Drawing.Size(1518, 25);
             this.statusBar.TabIndex = 5;
             // 
-            // label12
-            // 
-            this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(985, 12);
-            this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
-            this.label12.Name = "label12";
-            this.label12.Size = new System.Drawing.Size(32, 17);
-            this.label12.TabIndex = 836;
-            this.label12.Text = "年份";
-            // 
             // ProductThirdSelectListManageForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs

@@ -49,8 +49,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.label8 = new System.Windows.Forms.Label();
             this.txtReplaceText = new System.Windows.Forms.TextBox();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
-            this.cmbWxSafe = new System.Windows.Forms.ComboBox();
-            this.lblWxSafe = new System.Windows.Forms.Label();
+            this.cmbSpProdType = new System.Windows.Forms.ComboBox();
+            this.label11 = new System.Windows.Forms.Label();
             this.cmbSourceType = new System.Windows.Forms.ComboBox();
             this.label10 = new System.Windows.Forms.Label();
             this.label5 = new System.Windows.Forms.Label();
@@ -64,11 +64,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.label6 = new System.Windows.Forms.Label();
             this.cmbSort = new System.Windows.Forms.ComboBox();
             this.btnSearch = new DevComponents.DotNetBar.PanelEx();
-            this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
             this.lblNotes = new System.Windows.Forms.Label();
             this.txtNotes = new System.Windows.Forms.TextBox();
             this.lblGroup = new System.Windows.Forms.Label();
             this.cmbGroupFilter = new System.Windows.Forms.ComboBox();
+            this.cmbWxSafe = new System.Windows.Forms.ComboBox();
+            this.lblWxSafe = new System.Windows.Forms.Label();
+            this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
             this.btnExportTxt = new DevComponents.DotNetBar.PanelEx();
             this.btnDelSelect = new DevComponents.DotNetBar.PanelEx();
             this.cmbGroup = new System.Windows.Forms.ComboBox();
@@ -111,6 +113,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.colEndWords = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colFissionWords = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colGetType = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.colSpProdType = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colWxSafe = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colMdyTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -320,8 +323,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Controls.Add(this.cmbWxSafe, 7, 1);
-            this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 6, 1);
+            this.tableLayoutPanel1.Controls.Add(this.cmbSpProdType, 7, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label11, 6, 1);
             this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 5, 1);
             this.tableLayoutPanel1.Controls.Add(this.label10, 4, 1);
             this.tableLayoutPanel1.Controls.Add(this.label5, 0, 0);
@@ -335,11 +338,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.Controls.Add(this.label6, 8, 0);
             this.tableLayoutPanel1.Controls.Add(this.cmbSort, 9, 0);
             this.tableLayoutPanel1.Controls.Add(this.btnSearch, 10, 0);
-            this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 11, 0);
             this.tableLayoutPanel1.Controls.Add(this.lblNotes, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.txtNotes, 1, 1);
             this.tableLayoutPanel1.Controls.Add(this.lblGroup, 2, 1);
             this.tableLayoutPanel1.Controls.Add(this.cmbGroupFilter, 3, 1);
+            this.tableLayoutPanel1.Controls.Add(this.cmbWxSafe, 9, 1);
+            this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 8, 1);
+            this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 10, 1);
             this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 2;
@@ -348,31 +353,30 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.tableLayoutPanel1.Size = new System.Drawing.Size(727, 71);
             this.tableLayoutPanel1.TabIndex = 679;
             // 
-            // cmbWxSafe
+            // cmbSpProdType
             // 
-            this.cmbWxSafe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.cmbWxSafe.FormattingEnabled = true;
-            this.cmbWxSafe.Items.AddRange(new object[] {
+            this.cmbSpProdType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbSpProdType.FormattingEnabled = true;
+            this.cmbSpProdType.Items.AddRange(new object[] {
             "",
-            "安全商品",
-            "违规商品",
-            "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(423, 40);
-            this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
-            this.cmbWxSafe.Name = "cmbWxSafe";
-            this.cmbWxSafe.Size = new System.Drawing.Size(63, 25);
-            this.cmbWxSafe.TabIndex = 676;
+            "普通商品",
+            "书籍"});
+            this.cmbSpProdType.Location = new System.Drawing.Point(444, 43);
+            this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.cmbSpProdType.Name = "cmbSpProdType";
+            this.cmbSpProdType.Size = new System.Drawing.Size(70, 25);
+            this.cmbSpProdType.TabIndex = 677;
             // 
-            // lblWxSafe
+            // label11
             // 
-            this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.lblWxSafe.AutoSize = true;
-            this.lblWxSafe.Location = new System.Drawing.Point(355, 44);
-            this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
-            this.lblWxSafe.Name = "lblWxSafe";
-            this.lblWxSafe.Size = new System.Drawing.Size(68, 17);
-            this.lblWxSafe.TabIndex = 651;
-            this.lblWxSafe.Text = "微信安检：";
+            this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right;
+            this.label11.AutoSize = true;
+            this.label11.Location = new System.Drawing.Point(376, 44);
+            this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(68, 17);
+            this.label11.TabIndex = 651;
+            this.label11.Text = "商品类型：";
             // 
             // cmbSourceType
             // 
@@ -383,17 +387,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "母店采集",
             "机会商品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(286, 40);
+            this.cmbSourceType.Location = new System.Drawing.Point(300, 43);
             this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbSourceType.Name = "cmbSourceType";
-            this.cmbSourceType.Size = new System.Drawing.Size(63, 25);
+            this.cmbSourceType.Size = new System.Drawing.Size(70, 25);
             this.cmbSourceType.TabIndex = 654;
             // 
             // label10
             // 
             this.label10.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(242, 44);
+            this.label10.Location = new System.Drawing.Point(256, 44);
             this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(44, 17);
@@ -417,14 +421,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtSPU.Location = new System.Drawing.Point(60, 6);
             this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtSPU.Name = "txtSPU";
-            this.txtSPU.Size = new System.Drawing.Size(63, 23);
+            this.txtSPU.Size = new System.Drawing.Size(70, 23);
             this.txtSPU.TabIndex = 434;
             // 
             // label2
             // 
             this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(129, 9);
+            this.label2.Location = new System.Drawing.Point(136, 9);
             this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(44, 17);
@@ -434,17 +438,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtCat
             // 
             this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtCat.Location = new System.Drawing.Point(173, 6);
+            this.txtCat.Location = new System.Drawing.Point(180, 6);
             this.txtCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtCat.Name = "txtCat";
-            this.txtCat.Size = new System.Drawing.Size(63, 23);
+            this.txtCat.Size = new System.Drawing.Size(70, 23);
             this.txtCat.TabIndex = 425;
             // 
             // label3
             // 
             this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(242, 9);
+            this.label3.Location = new System.Drawing.Point(256, 9);
             this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(44, 17);
@@ -454,17 +458,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtProdName
             // 
             this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtProdName.Location = new System.Drawing.Point(286, 6);
+            this.txtProdName.Location = new System.Drawing.Point(300, 6);
             this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtProdName.Name = "txtProdName";
-            this.txtProdName.Size = new System.Drawing.Size(63, 23);
+            this.txtProdName.Size = new System.Drawing.Size(70, 23);
             this.txtProdName.TabIndex = 427;
             // 
             // label4
             // 
             this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(379, 9);
+            this.label4.Location = new System.Drawing.Point(400, 9);
             this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(44, 17);
@@ -474,17 +478,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtExtCode
             // 
             this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtExtCode.Location = new System.Drawing.Point(423, 6);
+            this.txtExtCode.Location = new System.Drawing.Point(444, 6);
             this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtExtCode.Name = "txtExtCode";
-            this.txtExtCode.Size = new System.Drawing.Size(63, 23);
+            this.txtExtCode.Size = new System.Drawing.Size(70, 23);
             this.txtExtCode.TabIndex = 429;
             // 
             // label6
             // 
-            this.label6.Anchor = System.Windows.Forms.AnchorStyles.None;
+            this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right;
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(492, 9);
+            this.label6.Location = new System.Drawing.Point(544, 9);
             this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(44, 17);
@@ -498,9 +502,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.cmbSort.Items.AddRange(new object[] {
             "入库时间",
             "认领总数"});
-            this.cmbSort.Location = new System.Drawing.Point(539, 5);
+            this.cmbSort.Location = new System.Drawing.Point(591, 7);
             this.cmbSort.Name = "cmbSort";
-            this.cmbSort.Size = new System.Drawing.Size(60, 25);
+            this.cmbSort.Size = new System.Drawing.Size(67, 25);
             this.cmbSort.TabIndex = 448;
             this.cmbSort.Text = "入库时间";
             // 
@@ -511,7 +515,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.Location = new System.Drawing.Point(605, 5);
+            this.btnSearch.Location = new System.Drawing.Point(664, 5);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(56, 25);
             this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -529,31 +533,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSearch.Text = "搜索";
             this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
             // 
-            // pnlEmpty
-            // 
-            this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left;
-            this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
-            this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.pnlEmpty.Location = new System.Drawing.Point(667, 5);
-            this.pnlEmpty.Name = "pnlEmpty";
-            this.pnlEmpty.Size = new System.Drawing.Size(56, 25);
-            this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.pnlEmpty.Style.GradientAngle = 90;
-            this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.pnlEmpty.TabIndex = 431;
-            this.pnlEmpty.Text = "清空条件";
-            this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
-            // 
             // lblNotes
             // 
             this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Left;
@@ -571,14 +550,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtNotes.Location = new System.Drawing.Point(60, 41);
             this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.txtNotes.Name = "txtNotes";
-            this.txtNotes.Size = new System.Drawing.Size(63, 23);
+            this.txtNotes.Size = new System.Drawing.Size(70, 23);
             this.txtNotes.TabIndex = 439;
             // 
             // lblGroup
             // 
             this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Left;
             this.lblGroup.AutoSize = true;
-            this.lblGroup.Location = new System.Drawing.Point(129, 44);
+            this.lblGroup.Location = new System.Drawing.Point(136, 44);
             this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
             this.lblGroup.Name = "lblGroup";
             this.lblGroup.Size = new System.Drawing.Size(44, 17);
@@ -589,12 +568,63 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(173, 40);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(180, 43);
             this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
-            this.cmbGroupFilter.Size = new System.Drawing.Size(63, 25);
+            this.cmbGroupFilter.Size = new System.Drawing.Size(70, 25);
             this.cmbGroupFilter.TabIndex = 653;
             // 
+            // cmbWxSafe
+            // 
+            this.cmbWxSafe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+            this.cmbWxSafe.FormattingEnabled = true;
+            this.cmbWxSafe.Items.AddRange(new object[] {
+            "",
+            "安全商品",
+            "违规商品",
+            "未校验"});
+            this.cmbWxSafe.Location = new System.Drawing.Point(588, 43);
+            this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.cmbWxSafe.Name = "cmbWxSafe";
+            this.cmbWxSafe.Size = new System.Drawing.Size(70, 25);
+            this.cmbWxSafe.TabIndex = 676;
+            // 
+            // lblWxSafe
+            // 
+            this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.lblWxSafe.AutoSize = true;
+            this.lblWxSafe.Location = new System.Drawing.Point(520, 44);
+            this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+            this.lblWxSafe.Name = "lblWxSafe";
+            this.lblWxSafe.Size = new System.Drawing.Size(68, 17);
+            this.lblWxSafe.TabIndex = 651;
+            this.lblWxSafe.Text = "微信安检：";
+            // 
+            // pnlEmpty
+            // 
+            this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left;
+            this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+            this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+            this.pnlEmpty.Location = new System.Drawing.Point(664, 40);
+            this.pnlEmpty.Name = "pnlEmpty";
+            this.pnlEmpty.Size = new System.Drawing.Size(56, 25);
+            this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.pnlEmpty.Style.GradientAngle = 90;
+            this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.pnlEmpty.TabIndex = 431;
+            this.pnlEmpty.Text = "清空条件";
+            this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
+            // 
             // btnExportTxt
             // 
             this.btnExportTxt.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -911,6 +941,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.colEndWords,
             this.colFissionWords,
             this.colGetType,
+            this.colSpProdType,
             this.colWxSafe,
             this.colAddTime,
             this.colMdyTime,
@@ -969,7 +1000,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // colMainImg
             // 
-            this.colMainImg.FillWeight = 50F;
+            this.colMainImg.FillWeight = 70F;
             this.colMainImg.HeaderText = "主图";
             this.colMainImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
             this.colMainImg.Name = "colMainImg";
@@ -986,7 +1017,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // colSkuReplaceImg
             // 
-            this.colSkuReplaceImg.FillWeight = 50F;
+            this.colSkuReplaceImg.FillWeight = 70F;
             this.colSkuReplaceImg.HeaderText = "sku替换图";
             this.colSkuReplaceImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom;
             this.colSkuReplaceImg.Name = "colSkuReplaceImg";
@@ -1113,6 +1144,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.colGetType.Name = "colGetType";
             this.colGetType.ReadOnly = true;
             // 
+            // colSpProdType
+            // 
+            this.colSpProdType.FillWeight = 70F;
+            this.colSpProdType.HeaderText = "商品类型";
+            this.colSpProdType.Name = "colSpProdType";
+            this.colSpProdType.ReadOnly = true;
+            // 
             // colWxSafe
             // 
             this.colWxSafe.FillWeight = 70F;
@@ -1136,7 +1174,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // col_edit
             // 
-            this.col_edit.FillWeight = 60F;
+            this.col_edit.FillWeight = 42F;
             this.col_edit.HeaderText = "详情";
             this.col_edit.Name = "col_edit";
             this.col_edit.ReadOnly = true;
@@ -1272,6 +1310,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.ComboBox cmbWxSafe;
         private System.Windows.Forms.ComboBox cmbSetWxSafe;
         private DevComponents.DotNetBar.PanelEx btnSetWxSafe;
+        private System.Windows.Forms.ComboBox cmbSpProdType;
+        private System.Windows.Forms.Label label11;
         private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
         private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id;
         private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId;
@@ -1296,6 +1336,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colEndWords;
         private System.Windows.Forms.DataGridViewTextBoxColumn colFissionWords;
         private System.Windows.Forms.DataGridViewTextBoxColumn colGetType;
+        private System.Windows.Forms.DataGridViewTextBoxColumn colSpProdType;
         private System.Windows.Forms.DataGridViewTextBoxColumn colWxSafe;
         private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
         private System.Windows.Forms.DataGridViewTextBoxColumn colMdyTime;

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs

@@ -45,6 +45,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
 
         private void ProductListForm_Load(object sender, EventArgs e)
         {
+            cmbSpProdType.SelectedIndex = 0;
             cmbSetWxSafe.SelectedIndex = 0;
             if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态
             {
@@ -137,9 +138,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             Task.Run(() =>
             {
                 int pageCount;
-                int pageSize = 50;
+                int pageSize = 100;
+                decimal seconds;
                 Invoke(new Action(() => { pageSize = this.ucSplitPage1.PageSize; }));
-                var list = GetProductList(out pageCount, page, pageSize);
+                var list = GetProductList(out pageCount, out seconds, page, pageSize);
                 lstTemuDbProduct.AddRange(list);
                 this.ucSplitPage1.TotalPage = pageCount;
 
@@ -180,6 +182,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                             prod.end_words,
                             prod.fission_words,
                             prod.product_get_type_text,
+                            prod.special_prod_type,
                             prod.wx_safe_status,
                             prod.add_time.ToString("yy-MM-dd HH:mm"),
                             prod.mdy_time.ToString("yy-MM-dd HH:mm"),
@@ -195,6 +198,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 {
                     ShowDgvImg();
                     this.pbLoading.Visible = false;
+                    this.statusBar.lblTaskStatus.Text = "商品查询完毕";
+#if DEBUG
+                    this.statusBar.lblTaskStatus.Text += "，耗时：" + seconds;
+#endif
                 }));
             });
         }
@@ -247,10 +254,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             });
         }
 
-        public List<KJDDBProduct> GetProductList(out int pageCount, int page = 1, int pageSize = 200)
+        public List<KJDDBProduct> GetProductList(out int pageCount, out decimal seconds, int page = 1, int pageSize = 200)
         {
             List<KJDDBProduct> list = new List<KJDDBProduct>();
             pageCount = 1;
+            seconds = 0;
 
             var url = BaseClass.BuildPDDObjString("product/get_product_list");
             if(shop!=null && shop.DbId.ParseToInt()!=0 )
@@ -269,7 +277,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                     "&search_ext_code=" + txtExtCode.Text.Trim() +
                     "&search_group=" + cmbGroupFilter.Text.Trim() +
                     "&search_prod_name=" + txtProdName.Text.Trim() +
-                    "&wx_safe_status=" + cmbWxSafe.Text.Trim();
+                    "&wx_safe_status=" + cmbWxSafe.Text.Trim() +
+                    "&special_prod_type=" + cmbSpProdType.Text.Trim();
                 if (cmbSourceType.Text.Trim() != "全部")
                 {
                     data += "&product_get_type=" + cmbSourceType.Text.Trim();
@@ -299,6 +308,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 return list;
             }
 
+            seconds = BaseRegex.GetDecimalJson(ref html, "seconds");
             int count = BaseRegex.GetIntJson(ref html, "count");
             pageCount = Math.Ceiling(1.0 * count / pageSize).ParseToInt();
             pageCount = Math.Max(pageCount, 1);
@@ -345,6 +355,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.cmbSort.Text = "入库时间";
             this.cmbSourceType.Text = "";
             this.cmbWxSafe.Text = "";
+            this.cmbSpProdType.Text = "";
         }
 
         private void dgvDbProduct_CellContentClick(object sender, DataGridViewCellEventArgs e)

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.resx

@@ -189,6 +189,9 @@
   <metadata name="colGetType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="colSpProdType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="colWxSafe.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs

@@ -5219,7 +5219,8 @@ Content-Disposition: form-data; name=""pic_operations""
             rst = GoodsSubmit(shop, goods_id.ToString(), draftId, "");
         }
 
-        public static string GetChanceGoodsList(ShopLoginInfo shop, string searchWord, List<string> labels = null, string desc="", int page = 1)
+        public static string GetChanceGoodsList(ShopLoginInfo shop, string searchWord, List<string> labels = null, string desc="", int page = 1,
+            long? cat1 = null, long? cat2 = null, int? price1 = null, int? price2 = null)
         {
             //labels
             //newinfashion_new 当季新品
@@ -5250,17 +5251,36 @@ Content-Disposition: form-data; name=""pic_operations""
             {
                 jObj["search_word"] = searchWord;
             }
+            if (cat1 != null)
+            {
+                jObj["cat_id_1"] = cat1;
+            }
+            if (cat2 != null)
+            {
+                jObj["cat_id_2"] = cat2;
+            }
             if (!string.IsNullOrWhiteSpace(desc))
             {
                 jObj["desc"] = desc;
             }
+            if (price1 != null)
+            {
+                jObj["min_price"] = price1;
+            }
+            if (price2 != null)
+            {
+                jObj["max_price"] = price2;
+            }
             //全网热销/不搜索 string body = @"{""size"":35,""page"":1,""labels"":[""wide_popular""],""banner_type"":0}";
             //不限/搜索 string body = @"{""size"":35,""page"":1,""search_word"":""" + searchWord + @"""}";
             string body = JsonHelper.SerializeObject(jObj);
-            string refere = "https://mms.pinduoduo.com/goods/goods_list/chance/chance_list?search_word=" + GetHtml.UrlEncodeUtf8(searchWord) +
+            string refere = "https://mms.pinduoduo.com/goods/goods_list/chance?sourcePage=goodsListTopButton";
+            if (!string.IsNullOrEmpty(searchWord))
+                refere = "https://mms.pinduoduo.com/goods/goods_list/chance/chance_list?search_word=" + GetHtml.UrlEncodeUtf8(searchWord) +
                 "&sourcePage=goodsListTopButton";
-            if (string.IsNullOrEmpty(searchWord))
-                refere = "https://mms.pinduoduo.com/goods/goods_list/chance?sourcePage=goodsListTopButton";
+            if (cat1 != null)
+                refere = "https://mms.pinduoduo.com/goods/goods_list/chance/chance_list?cat_id=[" + cat1 + "]";
+
             var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
             for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
             {

TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs

@@ -39,14 +39,24 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.label11 = new System.Windows.Forms.Label();
+            this.txtMaxPrice = new System.Windows.Forms.TextBox();
+            this.textBox1 = new System.Windows.Forms.TextBox();
+            this.label10 = new System.Windows.Forms.Label();
             this.label7 = new System.Windows.Forms.Label();
+            this.cmbCat2 = new System.Windows.Forms.ComboBox();
+            this.chkOverride = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.label6 = new System.Windows.Forms.Label();
             this.txtMinPrice = new System.Windows.Forms.TextBox();
-            this.btnStopStop = new DevComponents.DotNetBar.PanelEx();
+            this.label9 = new System.Windows.Forms.Label();
+            this.btnClear = new DevComponents.DotNetBar.PanelEx();
+            this.cmbCat1 = new System.Windows.Forms.ComboBox();
+            this.label8 = new System.Windows.Forms.Label();
             this.btnSelectSuccess = new DevComponents.DotNetBar.PanelEx();
-            this.btnStop = new DevComponents.DotNetBar.PanelEx();
             this.txtSearchCount = new System.Windows.Forms.TextBox();
+            this.btnStop = new DevComponents.DotNetBar.PanelEx();
             this.label5 = new System.Windows.Forms.Label();
+            this.btnStopStop = new DevComponents.DotNetBar.PanelEx();
             this.cmbSearchLabel = new System.Windows.Forms.ComboBox();
             this.btnAddToDb = new DevComponents.DotNetBar.PanelEx();
             this.btnGetDetail = new DevComponents.DotNetBar.PanelEx();
@@ -63,7 +73,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
             this.label4 = new System.Windows.Forms.Label();
             this.label3 = new System.Windows.Forms.Label();
-            this.chkOverride = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.splitContainer2 = new System.Windows.Forms.SplitContainer();
             this.splitContainer3 = new System.Windows.Forms.SplitContainer();
             this.pbShopLoading = new System.Windows.Forms.PictureBox();
@@ -93,7 +102,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.chk = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
             this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
-            this.btnClear = new DevComponents.DotNetBar.PanelEx();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
             this.splitContainer1.Panel1.SuspendLayout();
             this.splitContainer1.Panel2.SuspendLayout();
@@ -130,7 +138,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.splitContainer1.Panel2.Controls.Add(this.splitContainer2);
             this.splitContainer1.Size = new System.Drawing.Size(1344, 635);
-            this.splitContainer1.SplitterDistance = 120;
+            this.splitContainer1.SplitterDistance = 140;
             this.splitContainer1.TabIndex = 4;
             // 
             // ucGroupBoxEx1
@@ -140,15 +148,24 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
-            this.ucGroupBoxEx1.Controls.Add(this.btnClear);
+            this.ucGroupBoxEx1.Controls.Add(this.label11);
+            this.ucGroupBoxEx1.Controls.Add(this.txtMaxPrice);
+            this.ucGroupBoxEx1.Controls.Add(this.textBox1);
+            this.ucGroupBoxEx1.Controls.Add(this.label10);
             this.ucGroupBoxEx1.Controls.Add(this.label7);
+            this.ucGroupBoxEx1.Controls.Add(this.cmbCat2);
+            this.ucGroupBoxEx1.Controls.Add(this.chkOverride);
             this.ucGroupBoxEx1.Controls.Add(this.label6);
             this.ucGroupBoxEx1.Controls.Add(this.txtMinPrice);
-            this.ucGroupBoxEx1.Controls.Add(this.btnStopStop);
+            this.ucGroupBoxEx1.Controls.Add(this.label9);
+            this.ucGroupBoxEx1.Controls.Add(this.btnClear);
+            this.ucGroupBoxEx1.Controls.Add(this.cmbCat1);
+            this.ucGroupBoxEx1.Controls.Add(this.label8);
             this.ucGroupBoxEx1.Controls.Add(this.btnSelectSuccess);
-            this.ucGroupBoxEx1.Controls.Add(this.btnStop);
             this.ucGroupBoxEx1.Controls.Add(this.txtSearchCount);
+            this.ucGroupBoxEx1.Controls.Add(this.btnStop);
             this.ucGroupBoxEx1.Controls.Add(this.label5);
+            this.ucGroupBoxEx1.Controls.Add(this.btnStopStop);
             this.ucGroupBoxEx1.Controls.Add(this.cmbSearchLabel);
             this.ucGroupBoxEx1.Controls.Add(this.btnAddToDb);
             this.ucGroupBoxEx1.Controls.Add(this.btnGetDetail);
@@ -165,29 +182,82 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
             this.ucGroupBoxEx1.Controls.Add(this.label4);
             this.ucGroupBoxEx1.Controls.Add(this.label3);
-            this.ucGroupBoxEx1.Controls.Add(this.chkOverride);
             this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
             this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
-            this.ucGroupBoxEx1.Size = new System.Drawing.Size(1339, 118);
+            this.ucGroupBoxEx1.Size = new System.Drawing.Size(1339, 138);
             this.ucGroupBoxEx1.TabIndex = 0;
             this.ucGroupBoxEx1.TabStop = false;
             this.ucGroupBoxEx1.Text = "操作";
             // 
+            // label11
+            // 
+            this.label11.AutoSize = true;
+            this.label11.Location = new System.Drawing.Point(684, 62);
+            this.label11.Name = "label11";
+            this.label11.Size = new System.Drawing.Size(20, 17);
+            this.label11.TabIndex = 943;
+            this.label11.Text = "至";
+            // 
+            // txtMaxPrice
+            // 
+            this.txtMaxPrice.Location = new System.Drawing.Point(704, 59);
+            this.txtMaxPrice.Name = "txtMaxPrice";
+            this.txtMaxPrice.Size = new System.Drawing.Size(40, 23);
+            this.txtMaxPrice.TabIndex = 942;
+            // 
+            // textBox1
+            // 
+            this.textBox1.Location = new System.Drawing.Point(644, 59);
+            this.textBox1.Name = "textBox1";
+            this.textBox1.Size = new System.Drawing.Size(40, 23);
+            this.textBox1.TabIndex = 941;
+            // 
+            // label10
+            // 
+            this.label10.AutoSize = true;
+            this.label10.Location = new System.Drawing.Point(582, 62);
+            this.label10.Name = "label10";
+            this.label10.Size = new System.Drawing.Size(56, 17);
+            this.label10.TabIndex = 940;
+            this.label10.Text = "商品价格";
+            // 
             // label7
             // 
             this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.label7.AutoSize = true;
-            this.label7.Location = new System.Drawing.Point(1004, 79);
+            this.label7.Location = new System.Drawing.Point(1007, 93);
             this.label7.Name = "label7";
             this.label7.Size = new System.Drawing.Size(44, 17);
             this.label7.TabIndex = 844;
             this.label7.Text = "元SKU";
             // 
+            // cmbCat2
+            // 
+            this.cmbCat2.FormattingEnabled = true;
+            this.cmbCat2.Items.AddRange(new object[] {
+            "不限"});
+            this.cmbCat2.Location = new System.Drawing.Point(644, 30);
+            this.cmbCat2.Name = "cmbCat2";
+            this.cmbCat2.Size = new System.Drawing.Size(100, 25);
+            this.cmbCat2.TabIndex = 908;
+            this.cmbCat2.Text = "不限";
+            // 
+            // chkOverride
+            // 
+            this.chkOverride.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkOverride.AutoSize = true;
+            this.chkOverride.Location = new System.Drawing.Point(1064, 89);
+            this.chkOverride.Name = "chkOverride";
+            this.chkOverride.Size = new System.Drawing.Size(135, 21);
+            this.chkOverride.TabIndex = 757;
+            this.chkOverride.Text = "覆盖库中已存在商品";
+            this.chkOverride.UseVisualStyleBackColor = true;
+            // 
             // 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(849, 79);
+            this.label6.Location = new System.Drawing.Point(852, 93);
             this.label6.Name = "label6";
             this.label6.Size = new System.Drawing.Size(116, 17);
             this.label6.TabIndex = 843;
@@ -196,35 +266,65 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // txtMinPrice
             // 
             this.txtMinPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.txtMinPrice.Location = new System.Drawing.Point(965, 76);
+            this.txtMinPrice.Location = new System.Drawing.Point(968, 90);
             this.txtMinPrice.Name = "txtMinPrice";
             this.txtMinPrice.Size = new System.Drawing.Size(39, 23);
             this.txtMinPrice.TabIndex = 842;
             this.txtMinPrice.Text = "10";
             // 
-            // btnStopStop
+            // label9
             // 
-            this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control;
-            this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnStopStop.Location = new System.Drawing.Point(452, 75);
-            this.btnStopStop.Name = "btnStopStop";
-            this.btnStopStop.Size = new System.Drawing.Size(100, 25);
-            this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnStopStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.btnStopStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.btnStopStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.btnStopStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnStopStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.btnStopStop.Style.GradientAngle = 90;
-            this.btnStopStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnStopStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnStopStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnStopStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnStopStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.btnStopStop.TabIndex = 814;
-            this.btnStopStop.Text = "强制解除查询";
-            this.btnStopStop.Click += new System.EventHandler(this.btnStopStop_Click);
+            this.label9.AutoSize = true;
+            this.label9.Location = new System.Drawing.Point(582, 34);
+            this.label9.Name = "label9";
+            this.label9.Size = new System.Drawing.Size(68, 17);
+            this.label9.TabIndex = 909;
+            this.label9.Text = "二级类目：";
+            // 
+            // btnClear
+            // 
+            this.btnClear.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnClear.Location = new System.Drawing.Point(295, 88);
+            this.btnClear.Name = "btnClear";
+            this.btnClear.Size = new System.Drawing.Size(100, 25);
+            this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnClear.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnClear.Style.GradientAngle = 90;
+            this.btnClear.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnClear.TabIndex = 875;
+            this.btnClear.Text = "清除列表";
+            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
+            // 
+            // cmbCat1
+            // 
+            this.cmbCat1.FormattingEnabled = true;
+            this.cmbCat1.Items.AddRange(new object[] {
+            "不限"});
+            this.cmbCat1.Location = new System.Drawing.Point(476, 30);
+            this.cmbCat1.Name = "cmbCat1";
+            this.cmbCat1.Size = new System.Drawing.Size(100, 25);
+            this.cmbCat1.TabIndex = 907;
+            this.cmbCat1.Text = "不限";
+            this.cmbCat1.TextChanged += new System.EventHandler(this.cmbCat1_TextChanged);
+            // 
+            // label8
+            // 
+            this.label8.AutoSize = true;
+            this.label8.Location = new System.Drawing.Point(413, 34);
+            this.label8.Name = "label8";
+            this.label8.Size = new System.Drawing.Size(68, 17);
+            this.label8.TabIndex = 906;
+            this.label8.Text = "商品类目：";
             // 
             // btnSelectSuccess
             // 
@@ -233,9 +333,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSelectSuccess.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSelectSuccess.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSelectSuccess.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSelectSuccess.Location = new System.Drawing.Point(1022, 22);
+            this.btnSelectSuccess.Location = new System.Drawing.Point(1046, 29);
             this.btnSelectSuccess.Name = "btnSelectSuccess";
-            this.btnSelectSuccess.Size = new System.Drawing.Size(170, 25);
+            this.btnSelectSuccess.Size = new System.Drawing.Size(153, 25);
             this.btnSelectSuccess.Style.Alignment = System.Drawing.StringAlignment.Center;
             this.btnSelectSuccess.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
             this.btnSelectSuccess.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -251,12 +351,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSelectSuccess.Text = "一键勾选已采集详情商品";
             this.btnSelectSuccess.Click += new System.EventHandler(this.btnSelectSuccess_Click);
             // 
+            // txtSearchCount
+            // 
+            this.txtSearchCount.Location = new System.Drawing.Point(811, 31);
+            this.txtSearchCount.Name = "txtSearchCount";
+            this.txtSearchCount.Size = new System.Drawing.Size(40, 23);
+            this.txtSearchCount.TabIndex = 738;
+            this.txtSearchCount.Text = "500";
+            // 
             // btnStop
             // 
             this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnStop.Location = new System.Drawing.Point(343, 75);
+            this.btnStop.Location = new System.Drawing.Point(295, 26);
             this.btnStop.Name = "btnStop";
             this.btnStop.Size = new System.Drawing.Size(100, 25);
             this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -275,23 +383,39 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnStop.Text = "停止当前操作";
             this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
             // 
-            // txtSearchCount
-            // 
-            this.txtSearchCount.Location = new System.Drawing.Point(665, 23);
-            this.txtSearchCount.Name = "txtSearchCount";
-            this.txtSearchCount.Size = new System.Drawing.Size(100, 23);
-            this.txtSearchCount.TabIndex = 738;
-            this.txtSearchCount.Text = "500";
-            // 
             // label5
             // 
             this.label5.AutoSize = true;
-            this.label5.Location = new System.Drawing.Point(604, 26);
+            this.label5.Location = new System.Drawing.Point(750, 34);
             this.label5.Name = "label5";
             this.label5.Size = new System.Drawing.Size(68, 17);
             this.label5.TabIndex = 737;
             this.label5.Text = "搜索数量：";
             // 
+            // btnStopStop
+            // 
+            this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control;
+            this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty;
+            this.btnStopStop.Location = new System.Drawing.Point(295, 57);
+            this.btnStopStop.Name = "btnStopStop";
+            this.btnStopStop.Size = new System.Drawing.Size(100, 25);
+            this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnStopStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnStopStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+            this.btnStopStop.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+            this.btnStopStop.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnStopStop.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+            this.btnStopStop.Style.GradientAngle = 90;
+            this.btnStopStop.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnStopStop.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.btnStopStop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnStopStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.btnStopStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+            this.btnStopStop.TabIndex = 814;
+            this.btnStopStop.Text = "强制解除查询";
+            this.btnStopStop.Click += new System.EventHandler(this.btnStopStop_Click);
+            // 
             // cmbSearchLabel
             // 
             this.cmbSearchLabel.FormattingEnabled = true;
@@ -302,7 +426,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             "全网热销",
             "潜力商品",
             "热门商品"});
-            this.cmbSearchLabel.Location = new System.Drawing.Point(343, 22);
+            this.cmbSearchLabel.Location = new System.Drawing.Point(476, 58);
             this.cmbSearchLabel.Name = "cmbSearchLabel";
             this.cmbSearchLabel.Size = new System.Drawing.Size(100, 25);
             this.cmbSearchLabel.TabIndex = 653;
@@ -315,7 +439,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnAddToDb.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnAddToDb.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnAddToDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnAddToDb.Location = new System.Drawing.Point(1198, 75);
+            this.btnAddToDb.Location = new System.Drawing.Point(1205, 85);
             this.btnAddToDb.Name = "btnAddToDb";
             this.btnAddToDb.Size = new System.Drawing.Size(116, 25);
             this.btnAddToDb.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -340,7 +464,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnGetDetail.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnGetDetail.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnGetDetail.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnGetDetail.Location = new System.Drawing.Point(1198, 22);
+            this.btnGetDetail.Location = new System.Drawing.Point(1205, 29);
             this.btnGetDetail.Name = "btnGetDetail";
             this.btnGetDetail.Size = new System.Drawing.Size(116, 25);
             this.btnGetDetail.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -360,22 +484,22 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // txtShopId
             // 
-            this.txtShopId.Location = new System.Drawing.Point(76, 16);
+            this.txtShopId.Location = new System.Drawing.Point(76, 28);
             this.txtShopId.Name = "txtShopId";
             this.txtShopId.Size = new System.Drawing.Size(183, 23);
             this.txtShopId.TabIndex = 704;
             // 
             // txtSearchChance
             // 
-            this.txtSearchChance.Location = new System.Drawing.Point(499, 23);
+            this.txtSearchChance.Location = new System.Drawing.Point(476, 86);
             this.txtSearchChance.Name = "txtSearchChance";
-            this.txtSearchChance.Size = new System.Drawing.Size(100, 23);
+            this.txtSearchChance.Size = new System.Drawing.Size(268, 23);
             this.txtSearchChance.TabIndex = 679;
             // 
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(30, 19);
+            this.label2.Location = new System.Drawing.Point(30, 31);
             this.label2.Name = "label2";
             this.label2.Size = new System.Drawing.Size(57, 17);
             this.label2.TabIndex = 705;
@@ -384,7 +508,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(449, 26);
+            this.label1.Location = new System.Drawing.Point(426, 89);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(56, 17);
             this.label1.TabIndex = 678;
@@ -395,7 +519,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
             this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnEmpty.Location = new System.Drawing.Point(223, 88);
+            this.btnEmpty.Location = new System.Drawing.Point(223, 100);
             this.btnEmpty.Name = "btnEmpty";
             this.btnEmpty.Size = new System.Drawing.Size(36, 23);
             this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -416,7 +540,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // txtShopName
             // 
-            this.txtShopName.Location = new System.Drawing.Point(76, 40);
+            this.txtShopName.Location = new System.Drawing.Point(76, 52);
             this.txtShopName.Name = "txtShopName";
             this.txtShopName.Size = new System.Drawing.Size(183, 23);
             this.txtShopName.TabIndex = 706;
@@ -427,7 +551,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnSearch.Location = new System.Drawing.Point(780, 23);
+            this.btnSearch.Location = new System.Drawing.Point(855, 30);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(106, 25);
             this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -450,7 +574,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
             this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
             this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
-            this.pnlEmpty.Location = new System.Drawing.Point(892, 23);
+            this.pnlEmpty.Location = new System.Drawing.Point(965, 30);
             this.pnlEmpty.Name = "pnlEmpty";
             this.pnlEmpty.Size = new System.Drawing.Size(56, 25);
             this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -471,7 +595,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             // txtNotes
             // 
-            this.txtNotes.Location = new System.Drawing.Point(76, 64);
+            this.txtNotes.Location = new System.Drawing.Point(76, 76);
             this.txtNotes.Name = "txtNotes";
             this.txtNotes.Size = new System.Drawing.Size(183, 23);
             this.txtNotes.TabIndex = 708;
@@ -479,11 +603,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // lblGroupFilter
             // 
             this.lblGroupFilter.AutoSize = true;
-            this.lblGroupFilter.Location = new System.Drawing.Point(307, 26);
+            this.lblGroupFilter.Location = new System.Drawing.Point(413, 62);
             this.lblGroupFilter.Name = "lblGroupFilter";
-            this.lblGroupFilter.Size = new System.Drawing.Size(44, 17);
+            this.lblGroupFilter.Size = new System.Drawing.Size(68, 17);
             this.lblGroupFilter.TabIndex = 641;
-            this.lblGroupFilter.Text = "标签：";
+            this.lblGroupFilter.Text = "热门主题：";
             // 
             // btnRefreshShop
             // 
@@ -491,7 +615,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
             this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
             this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.btnRefreshShop.Location = new System.Drawing.Point(163, 88);
+            this.btnRefreshShop.Location = new System.Drawing.Point(163, 100);
             this.btnRefreshShop.Name = "btnRefreshShop";
             this.btnRefreshShop.Size = new System.Drawing.Size(58, 23);
             this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -512,7 +636,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(19, 67);
+            this.label4.Location = new System.Drawing.Point(19, 79);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(68, 17);
             this.label4.TabIndex = 709;
@@ -521,23 +645,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // label3
             // 
             this.label3.AutoSize = true;
-            this.label3.Location = new System.Drawing.Point(19, 43);
+            this.label3.Location = new System.Drawing.Point(19, 55);
             this.label3.Name = "label3";
             this.label3.Size = new System.Drawing.Size(68, 17);
             this.label3.TabIndex = 707;
             this.label3.Text = "店铺名称：";
             // 
-            // chkOverride
-            // 
-            this.chkOverride.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkOverride.AutoSize = true;
-            this.chkOverride.Location = new System.Drawing.Point(1058, 77);
-            this.chkOverride.Name = "chkOverride";
-            this.chkOverride.Size = new System.Drawing.Size(135, 21);
-            this.chkOverride.TabIndex = 757;
-            this.chkOverride.Text = "覆盖库中已存在商品";
-            this.chkOverride.UseVisualStyleBackColor = true;
-            // 
             // splitContainer2
             // 
             this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -556,8 +669,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.splitContainer2.Panel2.Controls.Add(this.chk);
             this.splitContainer2.Panel2.Controls.Add(this.statusBar);
             this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1);
-            this.splitContainer2.Size = new System.Drawing.Size(1344, 511);
-            this.splitContainer2.SplitterDistance = 482;
+            this.splitContainer2.Size = new System.Drawing.Size(1344, 491);
+            this.splitContainer2.SplitterDistance = 462;
             this.splitContainer2.TabIndex = 0;
             // 
             // splitContainer3
@@ -577,7 +690,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.splitContainer3.Panel2.Controls.Add(this.pbLoading);
             this.splitContainer3.Panel2.Controls.Add(this.panel2);
             this.splitContainer3.Panel2.Controls.Add(this.dgvChanceProduct);
-            this.splitContainer3.Size = new System.Drawing.Size(1336, 482);
+            this.splitContainer3.Size = new System.Drawing.Size(1336, 462);
             this.splitContainer3.SplitterDistance = 290;
             this.splitContainer3.TabIndex = 9;
             // 
@@ -585,7 +698,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbShopLoading.Location = new System.Drawing.Point(120, 216);
+            this.pbShopLoading.Location = new System.Drawing.Point(120, 206);
             this.pbShopLoading.Name = "pbShopLoading";
             this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
             this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -626,7 +739,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.dgvShop.ReadOnly = true;
             this.dgvShop.RowHeadersWidth = 25;
             this.dgvShop.RowTemplate.Height = 23;
-            this.dgvShop.Size = new System.Drawing.Size(290, 482);
+            this.dgvShop.Size = new System.Drawing.Size(290, 462);
             this.dgvShop.TabIndex = 7;
             this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
             // 
@@ -706,7 +819,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             // 
             this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(496, 216);
+            this.pbLoading.Location = new System.Drawing.Point(496, 206);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -721,7 +834,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panel2.Location = new System.Drawing.Point(409, 355);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(610, 107);
+            this.panel2.Size = new System.Drawing.Size(610, 87);
             this.panel2.TabIndex = 8;
             // 
             // dgvChanceProduct
@@ -759,7 +872,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.dgvChanceProduct.Name = "dgvChanceProduct";
             this.dgvChanceProduct.ReadOnly = true;
             this.dgvChanceProduct.RowTemplate.Height = 23;
-            this.dgvChanceProduct.Size = new System.Drawing.Size(1042, 482);
+            this.dgvChanceProduct.Size = new System.Drawing.Size(1042, 462);
             this.dgvChanceProduct.TabIndex = 6;
             this.dgvChanceProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvChanceProduct_CellContentClick);
             // 
@@ -884,30 +997,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.ucSplitPage1.TotalPage = 1;
             this.ucSplitPage1.PageChange += new System.Action<object>(this.ucSplitPage1_PageChange);
             // 
-            // btnClear
-            // 
-            this.btnClear.CanvasColor = System.Drawing.SystemColors.Control;
-            this.btnClear.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
-            this.btnClear.Location = new System.Drawing.Point(588, 75);
-            this.btnClear.Name = "btnClear";
-            this.btnClear.Size = new System.Drawing.Size(100, 25);
-            this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnClear.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.btnClear.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
-            this.btnClear.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
-            this.btnClear.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnClear.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
-            this.btnClear.Style.GradientAngle = 90;
-            this.btnClear.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnClear.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.btnClear.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnClear.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.btnClear.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
-            this.btnClear.TabIndex = 875;
-            this.btnClear.Text = "清除列表";
-            this.btnClear.Click += new System.EventHandler(this.btnClear_Click);
-            // 
             // PDDGetChanceProdForm
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1000,5 +1089,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         private System.Windows.Forms.Label label6;
         private System.Windows.Forms.TextBox txtMinPrice;
         private DevComponents.DotNetBar.PanelEx btnClear;
+        private System.Windows.Forms.ComboBox cmbCat2;
+        private System.Windows.Forms.Label label9;
+        private System.Windows.Forms.ComboBox cmbCat1;
+        private System.Windows.Forms.Label label8;
+        private System.Windows.Forms.Label label11;
+        private System.Windows.Forms.TextBox txtMaxPrice;
+        private System.Windows.Forms.TextBox textBox1;
+        private System.Windows.Forms.Label label10;
     }
 }

TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs

@@ -10,6 +10,7 @@ using System.ComponentModel;
 using System.Data;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
@@ -32,6 +33,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         public CancellationTokenSource cancellationTokenSource { get; set; } = null;
         public ConcurrentList<ShopLoginInfo> lstAdminShopInfo { get; set; } = new ConcurrentList<ShopLoginInfo>();
         public ConcurrentList<ChanceProductResult> lstChanceProductResult { get; set; } = new ConcurrentList<ChanceProductResult>();
+        public List<ChanceCateInfo> lstChanceCateInfo { get; set; } = new List<ChanceCateInfo>();
         /// <summary>
         /// 查找机会商品 
         /// </summary>
@@ -63,6 +65,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             this.txtShopId.TextChanged += Txt_TextChanged;
             this.txtShopName.TextChanged += Txt_TextChanged;
 
+            Task.Run(() => { ReacCate(); });
+
             var tmpChanceProductLst = NaiBa.Util.Helper.ConfigHelper.LoadConfig<List<ChanceProductResult>>("pdd_chance_product_list_" + MainForm.ProcessCount);
             if (tmpChanceProductLst == null)
                 tmpChanceProductLst = new List<ChanceProductResult>();
@@ -108,6 +112,53 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                 }));
             });
         }
+
+        void ReacCate()
+        {
+            string filePath = Path.Combine(Environment.CurrentDirectory, "temp\\pdd_chance_cate.cty");
+            if (!File.Exists(filePath))
+                return;
+            using (StreamReader sr = new StreamReader(filePath, System.Text.Encoding.UTF8))
+            {
+                try
+                {
+                    string cateStr = sr.ReadToEnd().Trim();
+                    lstChanceCateInfo = JsonHelper.DeserializeJsonToList<ChanceCateInfo>(cateStr);
+                }
+                catch (Exception ex)
+                {
+                    BaseMsgForm.ShowError("机会商品类目获取失败：" + ex.Message);
+                }
+                if (lstChanceCateInfo == null)
+                    lstChanceCateInfo = new List<ChanceCateInfo>();
+            }
+            var lstChanceCateInfo1 = lstChanceCateInfo.Where(c => c.cate_lvl == 1).ToList();
+            var lstChanceCateInfo2 = lstChanceCateInfo.Where(c => c.cate_lvl == 2).ToList();
+            Invoke(new Action(() =>
+            {
+                foreach(var cateInfo in lstChanceCateInfo1)
+                {
+                    this.cmbCat1.Items.Add(cateInfo.cate_name);
+                }
+            }));
+        }
+
+        private void cmbCat1_TextChanged(object sender, EventArgs e)
+        {
+            cmbCat2.Items.Clear();
+            cmbCat2.Items.Add("不限");
+
+            var chanceCateInfo1 = lstChanceCateInfo.FirstOrDefault(c => c.cate_lvl == 1 && c.cate_name == cmbCat1.Text);
+            if (chanceCateInfo1 != null)
+            {
+                var lstChanceCateInfo2 = lstChanceCateInfo.Where(c => c.cate_lvl == 2 && c.cate1_id == chanceCateInfo1.cate_id).ToList();
+                foreach (var cateInfo in lstChanceCateInfo2)
+                {
+                    this.cmbCat2.Items.Add(cateInfo.cate_name);
+                }
+            }
+        }
+
         private void Txt_TextChanged(object sender, EventArgs e)
         {
             chanceProductConfig.SearchNotes = this.txtNotes.Text.Trim();
@@ -402,7 +453,21 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                         Thread.Sleep(Randomx.GetId(3000, 8000)); 
                     }
 
-                    var rst = GetChanceGoodsList(shop, searchTxt, searchLabels, "hot_index", page);
+                    long? cat1 =  null;
+                    long? cat2 =  null;
+                    int? price1 = null;
+                    int? price2 = null;
+                    Invoke(new Action(() =>
+                    {
+                        cat1 = lstChanceCateInfo.FirstOrDefault(c => c.cate_lvl == 1 && c.cate_name == cmbCat1.Text)?.cate_id;
+                        cat2 = lstChanceCateInfo.FirstOrDefault(c => cat1 != null && c.cate_lvl == 2 && c.cate_name == cmbCat2.Text)?.cate_id;
+                        price1 = txtMinPrice.Text.Trim().ParseToInt();
+                        price2 = txtMaxPrice.Text.Trim().ParseToInt();
+                        if (price1 == 0 || price2 == 0)
+                            price1 = price2 = null;
+                    }));
+
+                    var rst = GetChanceGoodsList(shop, searchTxt, searchLabels, "hot_index", page, cat1, cat2, price1, price2);
                     if (!rst.Contains("success\":true"))
                     {
                         PDDAdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false);
@@ -445,7 +510,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                                         chanceProductResult.keywords,
                                         chanceProductResult.hot_index,
                                         chanceProductResult.cat_id_3.ParseToLong() == 0 ? new long?() : chanceProductResult.cat_id_3.ParseToLong(),
-                                        "采集详情后显示",
+                                        "预估：" + chanceProductResult.refer_price / 100.0 + " 采集详情后显示实际值",
                                         "删除"
                                     );
                                 dgvChanceProduct.Rows[rowId].Height = 60;
@@ -517,9 +582,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
             }
         }
 
-        private string GetChanceGoodsList(ShopLoginInfo shop, string searchWord, List<string> labels = null, string desc="", int page = 1)
+        private string GetChanceGoodsList(ShopLoginInfo shop, string searchWord, List<string> labels = null, string desc="", int page = 1,
+            long? cat1 = null, long? cat2 = null, int? price1 = null, int? price2 = null)
         {
-            return PDDDBProdUserSelectForm.GetChanceGoodsList(shop, searchWord, labels, desc, page);
+            return PDDDBProdUserSelectForm.GetChanceGoodsList(shop, searchWord, labels, desc, page, cat1, cat2, price1, price2);
         }
 
         private void pnlEmpty_Click(object sender, EventArgs e)
@@ -839,6 +905,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms
                         "&size_json=" + HttpUtility.UrlEncode(dbProd.size_json, Encoding.UTF8) +
                         "&main_img=" + HttpUtility.UrlEncode(dbProd.main_img, Encoding.UTF8) +
                         "&product_get_type=" + HttpUtility.UrlEncode("机会商品", Encoding.UTF8);
+                    if (dbProd.main_cat_id == "15543" || dbProd.main_cat_name == "书籍/杂志/报纸")
+                    {
+                        data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8);
+                    }
 
                     html = GetHtml.PostUtf8(url, data);
                     if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -971,4 +1041,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
         public string theme_detail_url { get; set; } // "https://pfile.pddpic.com/galerie-go/mms_img/season_goods.png"
 
     }
+
+    public class ChanceCateInfo
+    {
+        public long? cate_id { get; set; } // 245,
+        public string cate_name { get; set; } // "衬衫",
+        public long? parent_id { get; set; } // 239,
+        public int? cate_lvl { get; set; } // 2,
+        public string cate_desc { get; set; } // "男装二级",
+        public long? cate1_id { get; set; } // 239,
+        public string cate1_name { get; set; } // "男装",
+        public long? cate2_id { get; set; } // 245,
+        public string cate2_name { get; set; } // "衬衫"
+    }
 }

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs

@@ -40,7 +40,6 @@ namespace TemuKJD.WXForms.ProductForms
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
-            this.并发上传 = new DevComponents.DotNetBar.PanelEx();
             this.chkSkipUploaded = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.chkSameSpecPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.label5 = new System.Windows.Forms.Label();
@@ -71,8 +70,9 @@ namespace TemuKJD.WXForms.ProductForms
             this.label4 = new System.Windows.Forms.Label();
             this.label9 = new System.Windows.Forms.Label();
             this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
-            this.chkUpDraft = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+            this.cmbSpProdType = new System.Windows.Forms.ComboBox();
+            this.label17 = new System.Windows.Forms.Label();
             this.cmbWxSafe = new System.Windows.Forms.ComboBox();
             this.label13 = new System.Windows.Forms.Label();
             this.cmbSourceType = new System.Windows.Forms.ComboBox();
@@ -107,9 +107,11 @@ namespace TemuKJD.WXForms.ProductForms
             this.colUploadCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn();
             this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
+            this.并发上传 = new DevComponents.DotNetBar.PanelEx();
             this.pbLoading = new System.Windows.Forms.PictureBox();
             this.label11 = new System.Windows.Forms.Label();
             this.txtSinglePriceAdd = new System.Windows.Forms.TextBox();
+            this.chkUpDraft = new TemuKJD.UserComponent.UcCheckBox(this.components);
             this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx();
             this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
             this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -182,7 +184,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
             this.splitContainer1.Size = new System.Drawing.Size(1523, 546);
-            this.splitContainer1.SplitterDistance = 140;
+            this.splitContainer1.SplitterDistance = 150;
             this.splitContainer1.TabIndex = 11;
             // 
             // ucGroupBoxEx2
@@ -220,37 +222,11 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx2.Controls.Add(this.chkStepAddPrice);
             this.ucGroupBoxEx2.Location = new System.Drawing.Point(459, 2);
             this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
-            this.ucGroupBoxEx2.Size = new System.Drawing.Size(1062, 140);
+            this.ucGroupBoxEx2.Size = new System.Drawing.Size(1062, 150);
             this.ucGroupBoxEx2.TabIndex = 667;
             this.ucGroupBoxEx2.TabStop = false;
             this.ucGroupBoxEx2.Text = "商品上传";
             // 
-            // 并发上传
-            // 
-            this.并发上传.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.并发上传.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
-            this.并发上传.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.并发上传.DisabledBackColor = System.Drawing.Color.Empty;
-            this.并发上传.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.并发上传.Location = new System.Drawing.Point(1093, 30);
-            this.并发上传.Name = "并发上传";
-            this.并发上传.Size = new System.Drawing.Size(118, 23);
-            this.并发上传.Style.Alignment = System.Drawing.StringAlignment.Center;
-            this.并发上传.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.并发上传.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
-            this.并发上传.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
-            this.并发上传.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
-            this.并发上传.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
-            this.并发上传.Style.ForeColor.Color = System.Drawing.Color.White;
-            this.并发上传.Style.GradientAngle = 90;
-            this.并发上传.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
-            this.并发上传.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.并发上传.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
-            this.并发上传.TabIndex = 768;
-            this.并发上传.Text = "测试并发上传";
-            this.并发上传.Visible = false;
-            this.并发上传.Click += new System.EventHandler(this.并发上传_Click);
-            // 
             // chkSkipUploaded
             // 
             this.chkSkipUploaded.AutoSize = true;
@@ -396,7 +372,7 @@ namespace TemuKJD.WXForms.ProductForms
             // chkAddMorePriceFirst
             // 
             this.chkAddMorePriceFirst.AutoSize = true;
-            this.chkAddMorePriceFirst.Location = new System.Drawing.Point(213, 111);
+            this.chkAddMorePriceFirst.Location = new System.Drawing.Point(213, 121);
             this.chkAddMorePriceFirst.Name = "chkAddMorePriceFirst";
             this.chkAddMorePriceFirst.Size = new System.Drawing.Size(111, 21);
             this.chkAddMorePriceFirst.TabIndex = 625;
@@ -435,7 +411,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label14.AutoSize = true;
             this.label14.ForeColor = System.Drawing.SystemColors.GrayText;
-            this.label14.Location = new System.Drawing.Point(8, 62);
+            this.label14.Location = new System.Drawing.Point(8, 66);
             this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label14.Name = "label14";
             this.label14.Size = new System.Drawing.Size(68, 51);
@@ -446,7 +422,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label15.AutoSize = true;
-            this.label15.Location = new System.Drawing.Point(184, 113);
+            this.label15.Location = new System.Drawing.Point(184, 123);
             this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label15.Name = "label15";
             this.label15.Size = new System.Drawing.Size(20, 17);
@@ -461,7 +437,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.panel4.Controls.Add(this.panel3);
             this.panel4.Location = new System.Drawing.Point(76, 17);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(450, 89);
+            this.panel4.Size = new System.Drawing.Size(450, 99);
             this.panel4.TabIndex = 577;
             // 
             // panel3
@@ -474,7 +450,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.panel3.Controls.Add(this.fPnlPriceRule);
             this.panel3.Location = new System.Drawing.Point(1, 1);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(448, 87);
+            this.panel3.Size = new System.Drawing.Size(448, 97);
             this.panel3.TabIndex = 541;
             // 
             // fPnlPriceRule
@@ -579,7 +555,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtAddMorePrice
             // 
             this.txtAddMorePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtAddMorePrice.Location = new System.Drawing.Point(153, 110);
+            this.txtAddMorePrice.Location = new System.Drawing.Point(153, 120);
             this.txtAddMorePrice.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtAddMorePrice.Name = "txtAddMorePrice";
             this.txtAddMorePrice.Size = new System.Drawing.Size(31, 23);
@@ -590,7 +566,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtAddTimes
             // 
             this.txtAddTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtAddTimes.Location = new System.Drawing.Point(78, 110);
+            this.txtAddTimes.Location = new System.Drawing.Point(78, 120);
             this.txtAddTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtAddTimes.Name = "txtAddTimes";
             this.txtAddTimes.Size = new System.Drawing.Size(31, 23);
@@ -602,7 +578,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label10.AutoSize = true;
-            this.label10.Location = new System.Drawing.Point(109, 113);
+            this.label10.Location = new System.Drawing.Point(109, 123);
             this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label10.Name = "label10";
             this.label10.Size = new System.Drawing.Size(44, 17);
@@ -636,7 +612,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // txtStockNum
             // 
-            this.txtStockNum.Location = new System.Drawing.Point(393, 110);
+            this.txtStockNum.Location = new System.Drawing.Point(393, 120);
             this.txtStockNum.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtStockNum.Name = "txtStockNum";
             this.txtStockNum.Size = new System.Drawing.Size(32, 23);
@@ -647,7 +623,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(337, 113);
+            this.label4.Location = new System.Drawing.Point(337, 123);
             this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label4.Name = "label4";
             this.label4.Size = new System.Drawing.Size(56, 17);
@@ -658,7 +634,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label9.AutoSize = true;
-            this.label9.Location = new System.Drawing.Point(8, 113);
+            this.label9.Location = new System.Drawing.Point(8, 123);
             this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label9.Name = "label9";
             this.label9.Size = new System.Drawing.Size(68, 17);
@@ -676,24 +652,14 @@ namespace TemuKJD.WXForms.ProductForms
             this.chkStepAddPrice.UseVisualStyleBackColor = true;
             this.chkStepAddPrice.CheckedChanged += new System.EventHandler(this.chkStepAddPrice_CheckedChanged);
             // 
-            // chkUpDraft
-            // 
-            this.chkUpDraft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.chkUpDraft.AutoSize = true;
-            this.chkUpDraft.Location = new System.Drawing.Point(999, 31);
-            this.chkUpDraft.Name = "chkUpDraft";
-            this.chkUpDraft.Size = new System.Drawing.Size(99, 21);
-            this.chkUpDraft.TabIndex = 769;
-            this.chkUpDraft.Text = "上传到草稿箱";
-            this.chkUpDraft.UseVisualStyleBackColor = true;
-            this.chkUpDraft.Visible = false;
-            // 
             // ucGroupBoxEx4
             // 
             this.ucGroupBoxEx4.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | 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.cmbSpProdType);
+            this.ucGroupBoxEx4.Controls.Add(this.label17);
             this.ucGroupBoxEx4.Controls.Add(this.cmbWxSafe);
             this.ucGroupBoxEx4.Controls.Add(this.label13);
             this.ucGroupBoxEx4.Controls.Add(this.cmbSourceType);
@@ -714,11 +680,33 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx4.Controls.Add(this.label16);
             this.ucGroupBoxEx4.Location = new System.Drawing.Point(139, 2);
             this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
-            this.ucGroupBoxEx4.Size = new System.Drawing.Size(320, 140);
+            this.ucGroupBoxEx4.Size = new System.Drawing.Size(320, 150);
             this.ucGroupBoxEx4.TabIndex = 666;
             this.ucGroupBoxEx4.TabStop = false;
             this.ucGroupBoxEx4.Text = "待传商品";
             // 
+            // cmbSpProdType
+            // 
+            this.cmbSpProdType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbSpProdType.FormattingEnabled = true;
+            this.cmbSpProdType.Items.AddRange(new object[] {
+            "普通商品",
+            "书籍"});
+            this.cmbSpProdType.Location = new System.Drawing.Point(36, 95);
+            this.cmbSpProdType.Name = "cmbSpProdType";
+            this.cmbSpProdType.Size = new System.Drawing.Size(92, 25);
+            this.cmbSpProdType.TabIndex = 686;
+            // 
+            // label17
+            // 
+            this.label17.AutoSize = true;
+            this.label17.Location = new System.Drawing.Point(7, 99);
+            this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+            this.label17.Name = "label17";
+            this.label17.Size = new System.Drawing.Size(32, 17);
+            this.label17.TabIndex = 685;
+            this.label17.Text = "类别";
+            // 
             // cmbWxSafe
             // 
             this.cmbWxSafe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
@@ -726,7 +714,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.cmbWxSafe.Items.AddRange(new object[] {
             "安全商品",
             "未校验"});
-            this.cmbWxSafe.Location = new System.Drawing.Point(157, 78);
+            this.cmbWxSafe.Location = new System.Drawing.Point(157, 68);
             this.cmbWxSafe.Name = "cmbWxSafe";
             this.cmbWxSafe.Size = new System.Drawing.Size(92, 25);
             this.cmbWxSafe.TabIndex = 675;
@@ -734,7 +722,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label13
             // 
             this.label13.AutoSize = true;
-            this.label13.Location = new System.Drawing.Point(128, 82);
+            this.label13.Location = new System.Drawing.Point(128, 72);
             this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label13.Name = "label13";
             this.label13.Size = new System.Drawing.Size(32, 17);
@@ -749,7 +737,7 @@ namespace TemuKJD.WXForms.ProductForms
             "店铺采集",
             "机会商品",
             "外部数据"});
-            this.cmbSourceType.Location = new System.Drawing.Point(36, 78);
+            this.cmbSourceType.Location = new System.Drawing.Point(36, 68);
             this.cmbSourceType.Name = "cmbSourceType";
             this.cmbSourceType.Size = new System.Drawing.Size(92, 25);
             this.cmbSourceType.TabIndex = 673;
@@ -757,7 +745,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label12
             // 
             this.label12.AutoSize = true;
-            this.label12.Location = new System.Drawing.Point(7, 82);
+            this.label12.Location = new System.Drawing.Point(7, 72);
             this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label12.Name = "label12";
             this.label12.Size = new System.Drawing.Size(32, 17);
@@ -770,10 +758,10 @@ namespace TemuKJD.WXForms.ProductForms
             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(253, 22);
+            this.btnClearFilter.Location = new System.Drawing.Point(253, 16);
             this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnClearFilter.Name = "btnClearFilter";
-            this.btnClearFilter.Size = new System.Drawing.Size(58, 52);
+            this.btnClearFilter.Size = new System.Drawing.Size(58, 50);
             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)))));
@@ -793,7 +781,7 @@ namespace TemuKJD.WXForms.ProductForms
             // lblGoodsCount
             // 
             this.lblGoodsCount.AutoSize = true;
-            this.lblGoodsCount.Location = new System.Drawing.Point(9, 110);
+            this.lblGoodsCount.Location = new System.Drawing.Point(9, 122);
             this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.lblGoodsCount.Name = "lblGoodsCount";
             this.lblGoodsCount.Size = new System.Drawing.Size(71, 17);
@@ -807,7 +795,7 @@ namespace TemuKJD.WXForms.ProductForms
             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(253, 79);
+            this.btnClearUpload.Location = new System.Drawing.Point(253, 93);
             this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
             this.btnClearUpload.Name = "btnClearUpload";
             this.btnClearUpload.Size = new System.Drawing.Size(58, 23);
@@ -829,7 +817,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // txtIdFilter
             // 
-            this.txtIdFilter.Location = new System.Drawing.Point(157, 51);
+            this.txtIdFilter.Location = new System.Drawing.Point(157, 43);
             this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtIdFilter.Name = "txtIdFilter";
             this.txtIdFilter.Size = new System.Drawing.Size(92, 23);
@@ -838,7 +826,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(129, 54);
+            this.label1.Location = new System.Drawing.Point(129, 47);
             this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(32, 17);
@@ -848,7 +836,7 @@ namespace TemuKJD.WXForms.ProductForms
             // cmbCateFilter
             // 
             this.cmbCateFilter.FormattingEnabled = true;
-            this.cmbCateFilter.Location = new System.Drawing.Point(157, 22);
+            this.cmbCateFilter.Location = new System.Drawing.Point(157, 16);
             this.cmbCateFilter.Name = "cmbCateFilter";
             this.cmbCateFilter.Size = new System.Drawing.Size(92, 25);
             this.cmbCateFilter.TabIndex = 663;
@@ -856,7 +844,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label2
             // 
             this.label2.AutoSize = true;
-            this.label2.Location = new System.Drawing.Point(129, 26);
+            this.label2.Location = new System.Drawing.Point(129, 22);
             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);
@@ -866,7 +854,7 @@ namespace TemuKJD.WXForms.ProductForms
             // cmbGroupFilter
             // 
             this.cmbGroupFilter.FormattingEnabled = true;
-            this.cmbGroupFilter.Location = new System.Drawing.Point(36, 22);
+            this.cmbGroupFilter.Location = new System.Drawing.Point(36, 16);
             this.cmbGroupFilter.Name = "cmbGroupFilter";
             this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25);
             this.cmbGroupFilter.TabIndex = 641;
@@ -874,7 +862,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label20
             // 
             this.label20.AutoSize = true;
-            this.label20.Location = new System.Drawing.Point(7, 25);
+            this.label20.Location = new System.Drawing.Point(7, 19);
             this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label20.Name = "label20";
             this.label20.Size = new System.Drawing.Size(32, 17);
@@ -883,7 +871,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // txtExtCodeFilter
             // 
-            this.txtExtCodeFilter.Location = new System.Drawing.Point(36, 51);
+            this.txtExtCodeFilter.Location = new System.Drawing.Point(36, 43);
             this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtExtCodeFilter.Name = "txtExtCodeFilter";
             this.txtExtCodeFilter.Size = new System.Drawing.Size(92, 23);
@@ -895,7 +883,7 @@ namespace TemuKJD.WXForms.ProductForms
             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(119, 110);
+            this.lblWaitToUp.Location = new System.Drawing.Point(119, 122);
             this.lblWaitToUp.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.lblWaitToUp.Name = "lblWaitToUp";
             this.lblWaitToUp.Size = new System.Drawing.Size(71, 17);
@@ -905,7 +893,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             // txtAddCount
             // 
-            this.txtAddCount.Location = new System.Drawing.Point(213, 107);
+            this.txtAddCount.Location = new System.Drawing.Point(213, 119);
             this.txtAddCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtAddCount.Name = "txtAddCount";
             this.txtAddCount.Size = new System.Drawing.Size(36, 23);
@@ -918,7 +906,7 @@ namespace TemuKJD.WXForms.ProductForms
             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(253, 107);
+            this.panelEx2.Location = new System.Drawing.Point(253, 119);
             this.panelEx2.Name = "panelEx2";
             this.panelEx2.Size = new System.Drawing.Size(58, 23);
             this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -939,7 +927,7 @@ namespace TemuKJD.WXForms.ProductForms
             // label16
             // 
             this.label16.AutoSize = true;
-            this.label16.Location = new System.Drawing.Point(7, 54);
+            this.label16.Location = new System.Drawing.Point(7, 46);
             this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label16.Name = "label16";
             this.label16.Size = new System.Drawing.Size(32, 17);
@@ -955,7 +943,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
             this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
             this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
-            this.ucGroupBoxEx1.Size = new System.Drawing.Size(136, 140);
+            this.ucGroupBoxEx1.Size = new System.Drawing.Size(136, 150);
             this.ucGroupBoxEx1.TabIndex = 399;
             this.ucGroupBoxEx1.TabStop = false;
             this.ucGroupBoxEx1.Text = "基础";
@@ -1000,8 +988,8 @@ namespace TemuKJD.WXForms.ProductForms
             // splitContainer3.Panel2
             // 
             this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
-            this.splitContainer3.Size = new System.Drawing.Size(1523, 402);
-            this.splitContainer3.SplitterDistance = 372;
+            this.splitContainer3.Size = new System.Drawing.Size(1523, 392);
+            this.splitContainer3.SplitterDistance = 362;
             this.splitContainer3.TabIndex = 1;
             // 
             // splitContainer2
@@ -1025,7 +1013,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.splitContainer2.Panel2.Controls.Add(this.chkUpDraft);
             this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct);
             this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
-            this.splitContainer2.Size = new System.Drawing.Size(1523, 372);
+            this.splitContainer2.Size = new System.Drawing.Size(1523, 362);
             this.splitContainer2.SplitterDistance = 300;
             this.splitContainer2.TabIndex = 0;
             // 
@@ -1065,7 +1053,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.dgvShop.ReadOnly = true;
             this.dgvShop.RowHeadersWidth = 25;
             this.dgvShop.RowTemplate.Height = 23;
-            this.dgvShop.Size = new System.Drawing.Size(296, 372);
+            this.dgvShop.Size = new System.Drawing.Size(296, 362);
             this.dgvShop.TabIndex = 6;
             this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
             // 
@@ -1158,11 +1146,37 @@ namespace TemuKJD.WXForms.ProductForms
             this.colMessage.Name = "colMessage";
             this.colMessage.ReadOnly = true;
             // 
+            // 并发上传
+            // 
+            this.并发上传.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.并发上传.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+            this.并发上传.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.并发上传.DisabledBackColor = System.Drawing.Color.Empty;
+            this.并发上传.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.并发上传.Location = new System.Drawing.Point(1093, 30);
+            this.并发上传.Name = "并发上传";
+            this.并发上传.Size = new System.Drawing.Size(118, 23);
+            this.并发上传.Style.Alignment = System.Drawing.StringAlignment.Center;
+            this.并发上传.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.并发上传.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+            this.并发上传.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+            this.并发上传.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+            this.并发上传.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+            this.并发上传.Style.ForeColor.Color = System.Drawing.Color.White;
+            this.并发上传.Style.GradientAngle = 90;
+            this.并发上传.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+            this.并发上传.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.并发上传.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+            this.并发上传.TabIndex = 768;
+            this.并发上传.Text = "测试并发上传";
+            this.并发上传.Visible = false;
+            this.并发上传.Click += new System.EventHandler(this.并发上传_Click);
+            // 
             // pbLoading
             // 
             this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
             this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
-            this.pbLoading.Location = new System.Drawing.Point(584, 161);
+            this.pbLoading.Location = new System.Drawing.Point(584, 156);
             this.pbLoading.Name = "pbLoading";
             this.pbLoading.Size = new System.Drawing.Size(50, 50);
             this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1174,7 +1188,7 @@ namespace TemuKJD.WXForms.ProductForms
             // 
             this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.label11.AutoSize = true;
-            this.label11.Location = new System.Drawing.Point(25, 47);
+            this.label11.Location = new System.Drawing.Point(25, 37);
             this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
             this.label11.Name = "label11";
             this.label11.Size = new System.Drawing.Size(68, 17);
@@ -1185,7 +1199,7 @@ namespace TemuKJD.WXForms.ProductForms
             // txtSinglePriceAdd
             // 
             this.txtSinglePriceAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.txtSinglePriceAdd.Location = new System.Drawing.Point(93, 44);
+            this.txtSinglePriceAdd.Location = new System.Drawing.Point(93, 34);
             this.txtSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
             this.txtSinglePriceAdd.Name = "txtSinglePriceAdd";
             this.txtSinglePriceAdd.Size = new System.Drawing.Size(31, 23);
@@ -1194,6 +1208,18 @@ namespace TemuKJD.WXForms.ProductForms
             this.txtSinglePriceAdd.Visible = false;
             this.txtSinglePriceAdd.TextChanged += new System.EventHandler(this.txtAddPrice_TextChanged);
             // 
+            // chkUpDraft
+            // 
+            this.chkUpDraft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.chkUpDraft.AutoSize = true;
+            this.chkUpDraft.Location = new System.Drawing.Point(999, 31);
+            this.chkUpDraft.Name = "chkUpDraft";
+            this.chkUpDraft.Size = new System.Drawing.Size(99, 21);
+            this.chkUpDraft.TabIndex = 769;
+            this.chkUpDraft.Text = "上传到草稿箱";
+            this.chkUpDraft.UseVisualStyleBackColor = true;
+            this.chkUpDraft.Visible = false;
+            // 
             // dgvSelectProduct
             // 
             this.dgvSelectProduct.AllowUserToAddRows = false;
@@ -1240,7 +1266,7 @@ namespace TemuKJD.WXForms.ProductForms
             this.dgvSelectProduct.Name = "dgvSelectProduct";
             this.dgvSelectProduct.ReadOnly = true;
             this.dgvSelectProduct.RowTemplate.Height = 23;
-            this.dgvSelectProduct.Size = new System.Drawing.Size(1215, 372);
+            this.dgvSelectProduct.Size = new System.Drawing.Size(1215, 362);
             this.dgvSelectProduct.TabIndex = 187;
             this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
             // 
@@ -1661,5 +1687,7 @@ namespace TemuKJD.WXForms.ProductForms
         private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
         private DevComponents.DotNetBar.PanelEx 并发上传;
         private UserComponent.UcCheckBox chkUpDraft;
+        private System.Windows.Forms.ComboBox cmbSpProdType;
+        private System.Windows.Forms.Label label17;
     }
 }

TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs

@@ -52,6 +52,7 @@ namespace TemuKJD.WXForms.ProductForms
 
         private void UserSelectDbProductForm_Load(object sender, EventArgs e)
         {
+            cmbSpProdType.SelectedIndex = 0;
             this.splitContainer1.Dock = DockStyle.Fill;
             this.panel1.Location = new Point(40, 30);
             this.panel1.Width = this.Width - 80;
@@ -1944,6 +1945,7 @@ namespace TemuKJD.WXForms.ProductForms
                 data += "&in_cates=" + cmbCateFilter.Text;
                 data += "&product_get_type=" + cmbSourceType.Text.Trim();
                 data += "&wx_safe_status=" + cmbWxSafe.Text.Trim();
+                data += "&special_prod_type=" + cmbSpProdType.Text.Trim();
             }));
             var html = GetHtml.PostUtf8(url, data);
             if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
@@ -2094,6 +2096,7 @@ namespace TemuKJD.WXForms.ProductForms
             cmbGroupFilter.Text = "";
             cmbCateFilter.Text = "";
             cmbWxSafe.SelectedIndex = 0;
+            cmbSpProdType.SelectedIndex = 0;
             int prodCount;
             GetRandomProductList(out prodCount, 1, 1);
             lblGoodsCount.Text = "产品库 " + prodCount + " 件";

TEMUKJD/WXForms/ShopForms/WXShopBrowserObject.cs

@@ -25,862 +25,5 @@ namespace TemuKJD.WXForms.ShopForms
         public delegate void InfoReceivedHandler(string information);
         public event InfoReceivedHandler OnInfoReceived;
 
-        public string getProduct(string sProdId, string supplierId, PDDProductInfo prodInfo = null, bool notSaveDb = false)
-        {
-            var prodId = sProdId.ParseToLong();
-            if (prodId <= 0)
-            {
-                BaseMsgForm.ShowError("商品Id不存在！");
-                return "failed";
-            }
-            //var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == supplierId.ParseToString());
-            var shop = PDDAdminShopListForm.lstAdminShopInfo.FirstOrDefault(s => s.ShopId == supplierId.ParseToString());
-            if (string.IsNullOrEmpty(supplierId) || shop == null)
-            {
-                BaseMsgForm.ShowError("店铺不存在！");
-                return "failed";
-            }
-
-            Task.Run(() =>
-            {
-                try
-                {
-                    var sourceShop = shop;
-                    var sourceProdId = prodId;
-                    string success_err_msg = "";
-                    //string errorMsg = "";
-                    var commit_id_rst = GetPddProdCommitId(sourceShop, sourceProdId.ToString());
-                    if (!commit_id_rst.Contains("\"success\":true") || !commit_id_rst.Contains("\"result\""))
-                    {
-                        var errMsg = BaseRegex.GetStringJson(ref commit_id_rst, "error_msg");
-                        if (string.IsNullOrEmpty(errMsg))
-                            errMsg = commit_id_rst;
-                        OnInfoReceived("商品获取失败！" + errMsg);
-                        return;
-                    }
-                    var commitId = BaseRegex.GetStringJson(ref commit_id_rst, "goods_commit_id");
-                    if (string.IsNullOrEmpty(commitId))
-                    {
-                        OnInfoReceived("商品获取失败！商品提交编号获取失败！");
-                        return;
-                    }
-
-                    Thread.Sleep(Randomx.GetId(10, 50));
-                    var detail_json = "{}";
-                    PDDProductDetailInfo product = null;
-                    try
-                    {
-                        var prod_detail_rst = GetPddProdDetail(sourceShop, sourceProdId.ToString(), commitId);
-                        JObject prod_detail_obj = JObject.Parse(prod_detail_rst);
-                        detail_json = JsonHelper.SerializeObject(prod_detail_obj["result"]);
-
-                        product = JsonHelper.DeserializeJsonToObject<PDDProductDetailInfo>(detail_json);
-                        if (product == null || detail_json.Length < 10)
-                        {
-                            OnInfoReceived("商品获取失败！商品数据格式获取失败！");
-                            return;
-                        }
-                    }
-                    catch (Exception ex)
-                    {
-                        OnInfoReceived("商品获取失败！商品数据格式获取失败！" + ex.Message);
-                        return;
-                    }
-
-                    Thread.Sleep(Randomx.GetId(10, 50));
-                    var size_json = "{}";
-                    if (product.size_spec_id.ParseToLong() != 0)
-                    {
-                        try
-                        {
-                            var prod_size_rst = GetPddProdSizeSpec(sourceShop, sourceProdId.ToString(), commitId, product.size_spec_id.ParseToString());
-                            prod_size_rst = GetHtml.Unicode2String(prod_size_rst);
-                            JObject prod_size_obj = JObject.Parse(prod_size_rst);
-                            size_json = JsonHelper.SerializeObject(prod_size_obj["result"]);
-                            var size = JsonHelper.DeserializeJsonToObject<PDDSizeSpecInfo>(size_json);
-                            if (size == null)
-                            {
-                                OnInfoReceived("尺码表获取失败！尺码数据格式获取失败！");
-                                return;
-                            }
-                        }
-                        catch (Exception ex) 
-                        {
-                            OnInfoReceived("尺码表获取失败！尺码数据格式获取失败！" + ex.Message);
-                            return;
-                        }
-                    }
-                    //temu尺码表暂时注释
-                    //if (product.sizeTemplateId > 0)
-                    //{
-                    //    html = SizeSpecQuery(shop1, prodId1.ToString(), product.sizeTemplateId.ToString());
-                    //    if(!html.Contains("\"success\":true"))
-                    //    {
-                    //        success_err_msg += " 尺码表获取失败!" + BaseRegex.GetStringJson(ref html, "errorMsg");
-                    //    }
-                    //    else
-                    //    {
-                    //        obj = JObject.Parse(html);
-                    //        sizeRst = JsonHelper.SerializeObject(obj["result"]);
-                    //    }
-                    //}
-
-                    Thread.Sleep(Randomx.GetId(10, 50));
-                    var property_json = "{}";
-                    PDDProductPropertyInfo property = null;
-                    try
-                    {
-                        var prod_property_rst = GetPddProdProperty(sourceShop, sourceProdId.ToString(), commitId);
-                        prod_property_rst = GetHtml.Unicode2String(prod_property_rst);
-                        JObject prod_property_obj = JObject.Parse(prod_property_rst);
-                        property_json = JsonHelper.SerializeObject(prod_property_obj["result"]);
-                        property = JsonHelper.DeserializeJsonToObject<PDDProductPropertyInfo>(property_json);
-                    }
-                    catch (Exception ex) { }
-                    if (property == null)
-                    {
-                        OnInfoReceived("商品获取失败！商品属性获取失败！");
-                        return;
-                    }
-
-                    // 属性模板暂时注释
-                    //var prop_template_json = "{}";
-                    //PDDProductTemplateInfo templateInfo = null;
-                    //try
-                    //{
-                    //    var prop_template_rst = GetPddCatPropTemplate(sourceShop, product.cat_id.ParseToString(), sourceProdId.ToString(), commitId);
-                    //    JObject prop_template_obj = JObject.Parse(prop_template_rst);
-                    //    prop_template_json = JsonHelper.SerializeObject(prop_template_obj["result"]);
-                    //    templateInfo = JsonHelper.DeserializeJsonToObject<PDDProductTemplateInfo>(prop_template_json);
-                    //}
-                    //catch (Exception ex) { }
-                    //if (templateInfo == null)
-                    //{
-                    //    OnInfoReceived("商品获取失败！商品属性模板获取失败！");
-                    //    return;
-                    //}
-
-                    Thread.Sleep(Randomx.GetId(10, 50));
-                    var decoration_json = "{}";
-                    PDDProductDecorationInfo decoration = null;
-                    try
-                    {
-                        var prod_decoration_rst = GetPddProdDecoration(sourceShop, sourceProdId.ToString(), commitId);
-                        if (!prod_decoration_rst.Contains("\"success\":true"))
-                        {
-                            var errMsg = BaseRegex.GetStringJson(ref prod_decoration_rst, "error_msg");
-                            if (string.IsNullOrEmpty(errMsg))
-                                errMsg = prod_decoration_rst;
-                            OnInfoReceived("商品获取失败！商品详情图获取失败！" + errMsg);
-                            return;
-                        }
-                        JObject prod_decoration_obj = JObject.Parse(prod_decoration_rst);
-                        if (!prod_decoration_obj["result"].IsNullOrEmpty())
-                            decoration_json = JsonHelper.SerializeObject(prod_decoration_obj["result"]);
-                        decoration = JsonHelper.DeserializeJsonToObject<PDDProductDecorationInfo>(decoration_json);
-                    }
-                    catch (Exception ex)
-                    {
-                        OnInfoReceived("商品获取失败！商品详情图获取失败！" + ex.Message);
-                        return;
-                    }
-                    if (decoration != null && decoration_json.ParseToString().Length < 20)
-                    {
-                        //try
-                        //{ // 获取另一组详情数据，结构和主详情不一样无法通用
-                        //    var prod_detail_decoration_rst = GetPddProdOnShopDetail(sourceShop, sourceProdId.ToString(), commitId);
-                        //    JObject prod_detail_decoration_obj = JObject.Parse(prod_detail_decoration_rst);
-                        //    foreach (JObject ob in prod_detail_decoration_obj["result"]["carousel_gallery"])
-                        //    {
-
-                        //    }
-                        //}
-                        //catch (Exception ex)
-                        //{
-                        //    OnInfoReceived("商品获取失败！商品详情图获取失败！" + ex.Message);
-                        //    return;
-                        //}
-
-                        PDDProdDecorationCommitParam decorationParam = new PDDProdDecorationCommitParam();
-                        decorationParam.goods_id = product.goods_id;
-                        decorationParam.goods_commit_id = commitId.ParseToLong();
-                        decorationParam.preview_key = "";
-                        decorationParam.decoration_floor_list = new List<decoration_floor_param>();
-                        foreach (var gallary in product.galleries)
-                        {
-                            if (gallary.type != 2)
-                                continue;
-
-                            var floor_param = new decoration_floor_param();
-                            //floor_param.floor_id = 0; // floorItem.floor_id;
-                            floor_param.type = "image"; // floorItem.type;
-                            floor_param.content_list = new List<decoration_content_param>();
-                            //foreach (var c in floorItem.content_list)
-                            {
-                                var decorationContentParam = new decoration_content_param()
-                                {
-                                    //file_id = c.file_id,
-                                    img_url = gallary.url, //c.img_url,
-                                    //height = c.height,
-                                    //text = c.text,
-                                    //text_module_details = null,
-                                    //width = c.width,
-                                };
-                                //try { decorationContentParam.text_module_details = JsonHelper.DeserializeJsonToObject<text_module_detail_param>(JsonHelper.SerializeObject(c.text_module_details)); }
-                                //catch (Exception ex) { }
-                                floor_param.content_list.Add(decorationContentParam);
-                            }
-                            decorationParam.decoration_floor_list.Add(floor_param);
-                        }
-
-                        var addDecorationRst = save_decoration(shop, decorationParam, product.goods_id.ParseToString(), commitId);
-                        Thread.Sleep(Randomx.GetId(10, 50));
-
-                        // 第二次获取详情图
-                        try
-                        {
-                            var prod_decoration_rst = GetPddProdDecoration(sourceShop, sourceProdId.ToString(), commitId);
-                            if (!prod_decoration_rst.Contains("\"success\":true"))
-                            {
-                                var errMsg = BaseRegex.GetStringJson(ref prod_decoration_rst, "error_msg");
-                                if (string.IsNullOrEmpty(errMsg))
-                                    errMsg = prod_decoration_rst;
-                                OnInfoReceived("商品获取失败！商品详情图获取失败！" + errMsg);
-                                return;
-                            }
-                            JObject prod_decoration_obj = JObject.Parse(prod_decoration_rst);
-                            if (!prod_decoration_obj["result"].IsNullOrEmpty())
-                                decoration_json = JsonHelper.SerializeObject(prod_decoration_obj["result"]);
-                            decoration = JsonHelper.DeserializeJsonToObject<PDDProductDecorationInfo>(decoration_json);
-                        }
-                        catch (Exception ex)
-                        {
-                            OnInfoReceived("商品获取失败！商品详情图获取失败！" + ex.Message);
-                            return;
-                        }
-                    }
-                   
-
-                    if (decoration == null || decoration_json.ParseToString().Length < 20)
-                    {
-                        OnInfoReceived("商品获取失败！商品详情图获取失败！");
-                        return;
-                    }
-
-                    Thread.Sleep(Randomx.GetId(10, 50));
-                    var material3_json = "{}";
-                    PDDMaterialInfo material3 = null;
-                    try
-                    {
-                        var material3_rst = GetPddGoodsMaterial(sourceShop, sourceProdId.ToString(), commitId, 3);
-                        if (!material3_rst.Contains("\"success\":true"))
-                        {
-                            var errMsg = BaseRegex.GetStringJson(ref material3_rst, "error_msg");
-                            if (string.IsNullOrEmpty(errMsg))
-                                errMsg = material3_rst;
-                            OnInfoReceived("商品获取失败！商品长图获取失败！" + errMsg);
-                            return;
-                        }
-                        JObject material3_obj = JObject.Parse(material3_rst);
-                        if (!material3_obj["result"].IsNullOrEmpty())
-                            material3_json = JsonHelper.SerializeObject(material3_obj["result"]);
-                        material3 = JsonHelper.DeserializeJsonToObject<PDDMaterialInfo>(material3_json);
-                    }
-                    catch (Exception ex)
-                    {
-                        OnInfoReceived("商品获取失败！商品长图获取失败！" + ex.Message);
-                        return;
-                    }
-                    if (material3 == null)
-                    {
-                        OnInfoReceived("商品获取失败！商品长图获取失败！");
-                        return;
-                    }
-
-                    Thread.Sleep(Randomx.GetId(10, 50));
-                    var material1_json = "{}";
-                    PDDMaterialInfo material1 = null;
-                    try
-                    {
-                        var material1_rst = GetPddGoodsMaterial(sourceShop, sourceProdId.ToString(), commitId, 1);
-                        if (!material1_rst.Contains("\"success\":true"))
-                        {
-                            var errMsg = BaseRegex.GetStringJson(ref material1_rst, "error_msg");
-                            if (string.IsNullOrEmpty(errMsg))
-                                errMsg = material1_rst;
-                            OnInfoReceived("商品获取失败！商品白底图获取失败！" + errMsg);
-                            return;
-                        }
-                        JObject material1_obj = JObject.Parse(material1_rst);
-                        if (!material1_obj["result"].IsNullOrEmpty())
-                            material1_json = JsonHelper.SerializeObject(material1_obj["result"]);
-                        material1 = JsonHelper.DeserializeJsonToObject<PDDMaterialInfo>(material1_json);
-                    }
-                    catch (Exception ex)
-                    {
-                        OnInfoReceived("商品获取失败！商品白底图获取失败！" + ex.Message);
-                        return;
-                    }
-                    if (material1 == null)
-                    {
-                        OnInfoReceived("商品获取失败！商品白底图获取失败！");
-                        return;
-                    }
-
-
-                    bool isExist = false;
-                    var existUrl = BaseClass.BuildObjString("product/get_product_list");
-                    string existData = UserLogin.GetSignaturex() + "&search_spu=" + product.goods_id;
-                    string html = GetHtml.PostUtf8(existUrl, existData);
-                    if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
-                        html = GetHtml.PostUtf8(existUrl, existData);
-                    if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
-                        html = GetHtml.PostUtf8(existUrl, existData);
-                    if (!string.IsNullOrEmpty(html) && html.Contains("\"code\":200"))
-                    {
-                        if (html.Contains("\"data\":[") && !html.Contains("\"data\":[]"))
-                            isExist = true;
-                    }
-
-
-                    string product_json = "{\"detail\":" + detail_json + ",\"size\":" + size_json + ",\"decoration\":" + decoration_json +
-                    ",\"material3\":" + material3_json + ",\"material1\":" + material1_json + ",\"property\":" + property_json + "}";
-
-                    if (notSaveDb)
-                    {
-                        prodInfo = JsonHelper.DeserializeJsonToObject<PDDProductInfo>(product_json);
-                    }
-                    else
-                    {
-                        string main_img = product.image_url;
-                        if (string.IsNullOrEmpty(main_img))
-                            main_img = product.hd_thumb_url;
-                        if (string.IsNullOrEmpty(main_img))
-                            main_img = product.thumb_url;
-                        if (string.IsNullOrEmpty(main_img))
-                            main_img = (product.galleries?.FirstOrDefault()?.url).ParseToString().Replace("https://", "http://");
-                        var url = BaseClass.BuildObjString("product/add_product");
-                        if (isExist)
-                        {
-                            bool isCover = false;
-                            MainForm.instance.Invoke(new Action(() =>
-                            {
-                                var ok = BaseMsgForm.ShowConfirm("产品库内已存在相同id商品，是否更新？").DialogResult;
-                                if (ok == DialogResult.OK)
-                                    isCover = true;
-                            }));
-                            if (isCover)
-                                url = BaseClass.BuildObjString("product/mdy_product");
-                            else
-                                return;
-                        }
-
-                        var data = Work.UserLogin.GetSignaturex() +
-                            "&from_shop_id=" + shop.ShopId +
-                            "&spu_id=" + product.goods_id.ParseToString() +
-                            "&skc_id=" + product.goods_id.ParseToString() +
-                            "&price_text=" + product.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + product.sku.Max(s => s.multi_price).ParseToInt() * 0.01m +
-                            "&main_cat_id=" + (product.cat_ids?.FirstOrDefault(c => c != null)).ParseToString() +
-                            "&main_cat_name=" + HttpUtility.UrlEncode((product.cats?.FirstOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) +
-                            "&cat_id=" + (product.cat_id).ParseToString() +
-                            "&cat_name=" + HttpUtility.UrlEncode((product.cats?.LastOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) +
-                            "&ext_code=" + HttpUtility.UrlEncode(product.out_goods_sn, Encoding.UTF8) +
-                            "&product_name=" + HttpUtility.UrlEncode(product.goods_name, Encoding.UTF8) +
-                            "&product_json=" + HttpUtility.UrlEncode(product_json, Encoding.UTF8) +
-                            "&size_json=" + HttpUtility.UrlEncode(size_json, Encoding.UTF8) +
-                            "&main_img=" + HttpUtility.UrlEncode(main_img, Encoding.UTF8);
-
-                        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"))
-                        {
-                            string msg = "选品商品保存失败!请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg");
-                            //OnInfoReceived(msg);
-                            MainForm.instance.Invoke(new Action(() =>
-                            {
-                                BaseMsgForm.ShowError(msg);
-                            }));
-                        }
-                        else
-                        {
-                            //OnInfoReceived("选品商品保存成功!" + success_err_msg);
-                            MainForm.instance.Invoke(new Action(() =>
-                            {
-                                BaseMsgForm.ShowInfo("选品商品保存成功!" + success_err_msg);
-                            }));
-                        }
-
-                        //// 创建 SaveFileDialog 的实例
-                        //SaveFileDialog saveFileDialog = new SaveFileDialog();
-
-                        //// 单线程单元(STA)模式运行文件对话框，否则会报错。
-                        //System.Threading.Thread InvokeThread = new System.Threading.Thread(new System.Threading.ThreadStart(()=> {
-
-                        //    // 设置对话框的属性
-                        //    saveFileDialog.Title = "保存商品";
-                        //    saveFileDialog.Filter = "商品文件 (*.prd)|*.prd|所有文件 (*.*)|*.*"; // 过滤文件类型
-                        //    saveFileDialog.FileName = product.productId.ParseToString(); // 默认文件名
-                        //    saveFileDialog.DefaultExt = "txt"; // 默认文件扩展名
-
-                        //    // 显示对话框并获取结果
-                        //    if (saveFileDialog.ShowDialog() == DialogResult.OK)
-                        //    {
-                        //        // 用户点击了“保存”按钮，此时可以获取文件的路径
-                        //        string filePath = saveFileDialog.FileName;
-                        //        // 在这里处理文件保存逻辑，例如写入数据到文件
-                        //        System.IO.File.WriteAllText(filePath, result);
-
-                        //        //BaseMsgForm.ShowInfo("商品保存成功!");
-                        //    }
-                        //}));
-                        //InvokeThread.SetApartmentState(System.Threading.ApartmentState.STA);
-                        //InvokeThread.Start();
-                        //InvokeThread.Join();
-                    }
-                }
-                catch (Exception ex)
-                {
-                }
-            });
-
-            return "success";
-        }
-
-        /// <summary>
-        /// 第三方获取商品并直接提交到第三方待上传列表
-        /// </summary>
-        /// <param name="sProdId"></param>
-        /// <param name="supplierId"></param>
-        /// <returns></returns>
-        public string getThirdProduct(string sProdId, string supplierId)
-        {
-            var prodId = sProdId.ParseToLong();
-            if (prodId <= 0)
-            {
-                BaseMsgForm.ShowError("商品Id不存在！");
-                return "failed";
-            }
-            var shop = GlobalConfig.ShopLoginList.FirstOrDefault(s => s.ShopId == supplierId.ParseToString());
-            if (string.IsNullOrEmpty(supplierId) || shop == null)
-            {
-                BaseMsgForm.ShowError("店铺不存在！");
-                return "failed";
-            }
-
-            Task.Run(() =>
-            {
-                try
-                {
-                    var sourceShop = shop;
-                    var sourceProdId = prodId;
-                    string success_err_msg = "";
-                    string errorMsg = "";
-                    var html = GetPddProdCommitId(sourceShop, sourceProdId.ToString());
-                    if (!html.Contains("\"success\":true") || !html.Contains("\"result\""))
-                    {
-                        var errMsg = BaseRegex.GetStringJson(ref html, "error_msg");
-                        if (string.IsNullOrEmpty(errMsg))
-                            errMsg = html;
-                        OnInfoReceived("商品获取失败！" + errMsg);
-                        return;
-                    }
-                    var commitId = BaseRegex.GetStringJson(ref html, "goods_commit_id");
-                    if (string.IsNullOrEmpty(commitId))
-                    {
-                        OnInfoReceived("商品获取失败！商品提交编号获取失败！");
-                        return;
-                    }
-                    html = GetPddProdDetail(sourceShop, sourceProdId.ToString(), commitId);
-
-                    JObject obj = JObject.Parse(html);
-                    var result = JsonHelper.SerializeObject(obj["result"]);
-                    var sizeRst = "";
-                    PDDProductDetailInfo product = JsonHelper.DeserializeJsonToObject<PDDProductDetailInfo>(result);
-                    if (product == null)
-                    {
-                        OnInfoReceived("商品获取失败！商品数据格式获取失败！");
-                        return;
-                    }
-
-                    //拼多多暂时注释尺码
-                    //if (product.sizeTemplateId > 0)
-                    //{
-                    //    html = SizeSpecQuery(sourceShop, sourceProdId.ToString(), product.sizeTemplateId.ToString());
-                    //    if (!html.Contains("\"success\":true"))
-                    //    {
-                    //        success_err_msg += " 尺码表获取失败!" + BaseRegex.GetStringJson(ref html, "errorMsg");
-                    //    }
-                    //    else
-                    //    {
-                    //        obj = JObject.Parse(html);
-                    //        sizeRst = JsonHelper.SerializeObject(obj["result"]);
-                    //    }
-                    //}
-
-                    List<ShopLoginInfo> shopLst = new List<ShopLoginInfo>();
-                    WXShopListForm.Instance.Invoke(new Action(() =>
-                    {
-                        PDDThirdProdSelectAddShopForm shopForm = new PDDThirdProdSelectAddShopForm();
-                        shopForm.ShowDialog();
-                        shopLst.AddRange(shopForm.lstSelectShop);
-                    }));
-                    if (shopLst.Count == 0)
-                    { 
-                        OnInfoReceived("库存上传操作取消或未选择上传店铺！");
-                        return; 
-                    }
-
-                    var main_img = product.image_url;
-                    if (string.IsNullOrEmpty(main_img))
-                        main_img = product.hd_thumb_url;
-                    if (string.IsNullOrEmpty(main_img))
-                        main_img = product.thumb_url;
-                    if (string.IsNullOrEmpty(main_img))
-                        main_img = (product.galleries?.FirstOrDefault()?.url).ParseToString().Replace("https://", "http://");
-                    var url = BaseClass.BuildObjString("product_third/add_product");
-                    var data = UserLogin.GetSignaturex() +
-                        "&from_shop_id=" + shop.ShopId +
-                        "&spu_id=" + product.goods_id.ParseToString() +
-                        "&skc_id=" + product.goods_id.ParseToString() +
-                        "&cat_id=" + (product.cat_id).ParseToString() +
-                        "&cat_name=" + HttpUtility.UrlEncode((product.cats?.LastOrDefault(c => !string.IsNullOrEmpty(c))).ParseToString(), Encoding.UTF8) +
-                        "&ext_code=" + HttpUtility.UrlEncode(product.out_goods_sn, Encoding.UTF8) +
-                        "&product_name=" + HttpUtility.UrlEncode(product.goods_name, Encoding.UTF8) +
-                        "&product_json=" + HttpUtility.UrlEncode(result, Encoding.UTF8) +
-                        "&size_json=" + HttpUtility.UrlEncode(sizeRst, Encoding.UTF8) +
-                        "&main_img=" + HttpUtility.UrlEncode(main_img, Encoding.UTF8);
-                    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"))
-                    {
-                        errorMsg = "库存商品保存失败!请检查网络连接：" +
-                            BaseRegex.GetStringJson(ref html, "msg").ParseToString().Replace("'", "\\'").Replace("\"", "\\\"");
-                    }
-                    var id = BaseRegex.GetLongJson(ref html, "id");
-                    if (id == 0)
-                        goto end;
-
-                    foreach (var addProdShop in shopLst)
-                    {
-                        url = BaseClass.BuildObjString("product_third/add_user_select_product");
-                        data = UserLogin.GetSignaturex() +
-                                "&out_product_id=" + id +
-                                "&shop_id=" + addProdShop.ShopId +
-                                "&shop_account=" + addProdShop.ShopAccount +
-                                "&main_user_name=" + addProdShop.UserName +
-                                "&sub_user_name=" + addProdShop.SubUserName +
-                                "&add_product_remaining=" + addProdShop.AddProductRemaining +
-                                "&status=待上传";
-                        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"))
-                        {
-                            errorMsg += product?.goods_id + " " + BaseRegex.GetStringJson(ref html, "msg") + "; ";
-                        }
-                        else
-                        {
-                            addProdShop.AddProductRemaining = addProdShop.AddProductRemaining - 1;
-                        }
-                    }
-                end:;
-                    if (!string.IsNullOrEmpty(errorMsg))
-                    {
-                        OnInfoReceived(errorMsg);
-                    }
-                    else
-                    {
-                        OnInfoReceived("库存上传保存成功!" + success_err_msg);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    OnInfoReceived("发生错误：" + ex.Message);
-                }
-            });
-
-            return "success";
-        }
-
-        TemuCat GetCat(TemuDetailProductInfo product)
-        {
-            if (product == null)
-                return new TemuCat();
-
-            var cat = product.categories.cat10;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat9;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat8;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat7;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat6;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat5;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat4;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat3;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat2;
-            if (string.IsNullOrWhiteSpace(cat.catName))
-                cat = product.categories.cat1;
-
-            return cat;
-        }
-
-
-
-        private string GetPddProdCommitId(ShopLoginInfo shop, string prodId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/glide/v2/mms/edit/commit/create_by_sn";
-            string body = @"{""goods_id"":" + prodId + "}";
-            string refere = "https://mms.pinduoduo.com/goods/goods_list?msfrom=mms_sidenav";
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.FirstOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-        private string GetPddProdDetail(ShopLoginInfo shop, string prodId, string commitId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            //string url = "https://mms.pinduoduo.com/glide/v2/mms/query/commit/on_shop/detail"; //on_shop获取到的结构不对
-            string url = "https://mms.pinduoduo.com/glide/v2/mms/query/commit/detail";
-            //string body = @"{""goods_id"":" + prodId + "}";
-            string body = @"{""goods_commit_id"":""" + commitId + @""",""goods_id"":""" + prodId + @"""}";
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + prodId + "&type=edit";
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.FirstOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-
-
-        private string GetPddProdOnShopDetail(ShopLoginInfo shop, string prodId, string commitId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/glide/v2/mms/query/commit/on_shop/detail"; //获取详情图
-            //string url = "https://mms.pinduoduo.com/glide/v2/mms/query/commit/detail";
-            //string body = @"{""goods_id"":" + prodId + "}";
-            string body = @"{""goods_commit_id"":""" + commitId + @""",""goods_id"":""" + prodId + @"""}";
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + prodId + "&type=edit";
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.FirstOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// 保存商品详情图装修列表
-        /// gorse/mms/goods/decoration/commit/save
-        /// </summary>
-        /// <param name="shop"></param>
-        /// <param name="decoration"></param>
-        /// <param name="goodsId"></param>
-        /// <param name="commitId"></param>
-        /// <returns></returns>
-        private string save_decoration(ShopLoginInfo shop, PDDProdDecorationCommitParam decoration, string goodsId, string commitId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/gorse/mms/goods/decoration/commit/save";
-            string body = @"{""goods_id"":" + goodsId + "}";
-            body = JsonHelper.SerializeObject(decoration);
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + goodsId + "&type=edit";
-
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.FirstOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-
-
-        private string GetPddProdSizeSpec(ShopLoginInfo shop, string prodId, string commitId, string sizeSpecId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/cabernet/mms/sizespec/query/draft";
-            //string body = @"{""goods_id"":" + prodId + "}";
-            string body = @"{""id"":" + sizeSpecId + @"}";
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + prodId + "&type=edit";
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.FirstOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-        private string GetPddProdProperty(ShopLoginInfo shop, string prodId, string commitId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/draco-ms/mms/query-goods-property";
-            string body = @"{""goods_id"":" + prodId + "}";
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + prodId + "&type=edit";
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.FirstOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-        private string GetPddProdDecoration(ShopLoginInfo shop, string prodId, string commitId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/gorse/mms/goods/decoration/commit/query/V2";
-                   url = "https://mms.pinduoduo.com/gorse/mms/goods/decoration/commit/query/V2";
-            string body = @"{""goods_commit_id"":" + commitId + @",""goods_id"":" + prodId + @"}";
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + prodId + "&type=edit";
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && result.Contains("网络繁忙，请不要频繁操作"); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.FirstOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-
-        /// <summary>
-        /// 获取物料详情 type = 1 或者 3   1是白底图，3是长图
-        /// </summary>
-        /// <param name="shop"></param>
-        /// <param name="catId"></param>
-        /// <param name="prodId"></param>
-        /// <param name="commitId"></param>
-        /// <param name="type"></param>
-        /// <returns></returns>
-        private string GetPddGoodsMaterial(ShopLoginInfo shop, string prodId, string commitId, int type)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/giraffe/mms/material/goodsMaterialInfo";
-            string body = @"{""goods_id"":" + prodId + @",""type"":" + type + "}";
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + prodId + "&type=edit";
-            var result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && (result.Contains("操作太过频繁") || result.Contains("网络繁忙，请不要频繁操作")); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.LastOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDPostResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-
-        private string GetPddCatPropTemplate(ShopLoginInfo shop, string catId, string prodId, string commitId)
-        {
-            var anti = shop.AntiContents.LastOrDefault().ParseToString();
-            if (shop.AntiContents.Count > 0)
-                anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-            string url = "https://mms.pinduoduo.com/draco-ms/mms/template/mall?catId=" + catId +
-                "&goodsCommitId=" + commitId + "&goodsId=" + prodId;
-            string body = @"";
-            string refere = "https://mms.pinduoduo.com/goods/goods_add/index?id=" + commitId + "&goods_id=" + prodId + "&type=edit";
-            var result = HttpResponseBLL.PDDGetResponse(shop, url, body, refere, anti);
-            for (int i = 0; i < 5 && (result.Contains("操作太过频繁") || result.Contains("网络繁忙，请不要频繁操作")); i++)
-            {
-                shop.AntiContents.Remove(anti);
-                anti = shop.AntiContents.LastOrDefault().ParseToString();
-                if (shop.AntiContents.Count > 0)
-                {
-                    Thread.Sleep(Randomx.GetId(300, 500));
-                    anti = shop.AntiContents[Randomx.GetId(shop.AntiContents.Count)];
-                    result = HttpResponseBLL.PDDGetResponse(shop, url, body, refere, anti);
-                }
-            }
-            return result;
-        }
-
-        private string SizeSpecQuery(ShopLoginInfo shop, string prodId, string sizeSpecId)
-        {
-            //string url = "https://seller.kuajingmaihuo.com/bg-anniston-mms/sizespec/query";
-            //string body = @"{""businessId"":" + sizeSpecId + @",""reusable"":false}";
-            //string refere = "https://seller.kuajingmaihuo.com/goods/product-create/product-edit?from=productList&productId=" + prodId;
-            //return HttpResponseBLL.PostResponse(shop, url, body, refere);
-
-            return "";
-        }
     }
 }

Work/Initialization.cs

@@ -691,6 +691,9 @@ offCountPara,false;offProductPara,100;IrregularitiesPara,true;noNeerPara,true;no
             if (!FileBase.Exists("FiddlerCore4.dll"))
                 if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/" + "FiddlerCore4.dll", "FiddlerCore4.dll" + ".bak"))
                     FileBase.Move("FiddlerCore4.dll" + ".bak", "FiddlerCore4.dll");
+            if (!FileBase.Exists("temp\\pdd_chance_cate.cty"))
+                if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/" + "pdd_chance_cate.dll", "temp\\pdd_chance_cate.dll" + ".bak"))
+                    FileBase.Move("temp\\pdd_chance_cate.dll" + ".bak", "temp\\pdd_chance_cate.cty");
             if (!FileBase.Exists("temp\\9527.wav"))
                 if (GetHtml.DownloadFile(BaseClass.ServerUrl + "/Download/Sound/" + "9527.wav", "temp\\9527.wav" + ".bak"))
                     FileBase.Move("temp\\9527.wav" + ".bak", "temp\\9527.wav");