diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 82d6a23..dcabae4 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,7 +27,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1028; + public static int VersionCount = 1029; //public static int VersionCount = 613; /// diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index 0bdbae8..ff6cd34 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -51,6 +51,7 @@ namespace KJD_Web.BLL.BXX string product_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "product_json")); string size_json = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "size_json")); string main_img = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "main_img"))?.Replace("'", "\\'"); + string group = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "group"))?.Replace("'", "\\'"); string notes = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "notes"))?.Replace("'", "\\'"); 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("'", "\\'"); @@ -59,6 +60,7 @@ namespace KJD_Web.BLL.BXX string special_prod_type = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "special_prod_type"))?.Replace("'", "\\'"); if (special_prod_type == null) special_prod_type = "普通商品"; + string add_user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_user_name"))?.Replace("'", "\\'"); if (string.IsNullOrEmpty(product_get_type)) { @@ -95,17 +97,28 @@ namespace KJD_Web.BLL.BXX } } - sql = "insert into "; - sql += "bxx.product "; - sql += "(from_shop_id,from_shop_name,offline_supplier_id,offline_supplier_name,spu_id,skc_id,real_coid,real_spu_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," + - "distribution_set,ban_wx,ban_pdd,add_time,mdy_time) " + - "values ('" + from_shop_id + "','" + from_shop_name + "','" + offline_supplier_id + "','" + offline_supplier_name + "','" + spu_id + "','" + - skc_id + "','" + real_coid + "','" + real_spu_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 + "'," + distribution_set.ParseToInt() + "," + ban_wx + "," + ban_pdd + ",'" + - DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "','" + - DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "');"; + sql = "INSERT INTO bxx.product("; + sql += "from_shop_id,from_shop_name,offline_supplier_id,offline_supplier_name,spu_id,skc_id,real_coid,real_spu_id,main_cat_id,main_cat_name,cat_id,"; + sql += "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,"; + sql += "distribution_set,ban_wx,ban_pdd,add_time,mdy_time,"; + if (add_user_name != null) + sql += "add_user_name,"; + if (group != null) + sql += "`group`,"; + sql = sql.TrimEnd(','); + sql += ") "; + sql += "values ('" + from_shop_id + "','" + from_shop_name + "','" + offline_supplier_id + "','" + offline_supplier_name + "','" + spu_id + "','" + + skc_id + "','" + real_coid + "','" + real_spu_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 + "'," + distribution_set.ParseToInt() + "," + ban_wx + "," + ban_pdd + ","; + sql += "'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; + sql += "'" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + "',"; + if (add_user_name != null) + sql += "'" + add_user_name + "',"; + if (group != null) + sql += "'" + group + "',"; + sql = sql.TrimEnd(','); + sql += ");"; List paramLst = new List(); paramLst.Add(new MySqlParameter() { DbType = DbType.String, ParameterName = "product_json", Value = product_json, }); @@ -502,6 +515,7 @@ namespace KJD_Web.BLL.BXX var end_time = RegexUtils.GetStringQuery(ref inputData, "end_time")?.Replace("'", "\\'"); var ban_wx = RegexUtils.GetStringQuery(ref inputData, "ban_wx")?.Replace("'", "\\'"); var ban_pdd = RegexUtils.GetStringQuery(ref inputData, "ban_pdd")?.Replace("'", "\\'"); + var add_user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_user_name"))?.Replace("'", "\\'"); int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); int page_size= RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); @@ -658,6 +672,11 @@ namespace KJD_Web.BLL.BXX { where += " and p.ban_pdd=" + ban_pdd; } + if (!string.IsNullOrEmpty(add_user_name)) + { + add_user_name = "'" + string.Join("','", add_user_name.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.add_user_name in (" + add_user_name + ")"; + } sql += where; var count = 0; @@ -1155,6 +1174,7 @@ namespace KJD_Web.BLL.BXX int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(200); var product_get_type = RegexUtils.GetStringQuery(ref inputData, "product_get_type")?.Replace("'", "\\'"); + var add_user_name = RegexUtils.GetStringQuery(ref inputData, "add_user_name")?.Replace("'", "\\'"); string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); @@ -1164,6 +1184,11 @@ namespace KJD_Web.BLL.BXX string where = ""; if (!string.IsNullOrEmpty(product_get_type)) where += " and p.product_get_type ='" + product_get_type + "'"; + if (!string.IsNullOrEmpty(add_user_name)) + { + add_user_name = "'" + string.Join("','", add_user_name.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.add_user_name in (" + add_user_name + ")"; + } sql += where; var dt = mySql.ExecuteDataTable(sql); @@ -1432,6 +1457,7 @@ namespace KJD_Web.BLL.BXX var is_relation = RegexUtils.GetStringQuery(ref inputData, "is_relation").ParseToNullableInt(); var ban_wx = RegexUtils.GetStringQuery(ref inputData, "ban_wx")?.Replace("'", "\\'"); var ban_pdd = RegexUtils.GetStringQuery(ref inputData, "ban_pdd")?.Replace("'", "\\'"); + var add_user_name = HtmlUtils.UrlDecodeUtf8(RegexUtils.GetStringQuery(ref inputData, "add_user_name"))?.Replace("'", "\\'"); int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); int page_size = RegexUtils.GetStringQuery(ref inputData, "page_size").ParseToInt(50); @@ -1522,6 +1548,11 @@ namespace KJD_Web.BLL.BXX { where += " and p.ban_pdd=" + ban_pdd; } + if (!string.IsNullOrEmpty(add_user_name)) + { + add_user_name = "'" + string.Join("','", add_user_name.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.add_user_name in (" + add_user_name + ")"; + } sql += where; int count = prod_count; diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj.user b/KJDService/KJD_WebService/KJD_WebService.csproj.user index 4bcdc04..1b87364 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj.user +++ b/KJDService/KJD_WebService/KJD_WebService.csproj.user @@ -8,7 +8,7 @@ - Release|Any CPU + Debug|Any CPU ShowAllFiles diff --git a/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs b/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs index ffda937..032ed5f 100644 --- a/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs +++ b/TEMUKJD/BLL/VDian/VDianUpProdMappingBLL.cs @@ -354,8 +354,8 @@ namespace TemuKJD.BLL.VDian wdAttr.attr_values = new List(); foreach (var propValue in prop.Values) { - if (propValue.name.Contains("收藏")) - continue; + //if (propValue.name.Contains("收藏")) + // continue; var propValue_name = propValue.name.Replace("少先队", "SXD").Replace("共产党", "GCD").Replace("烟酒", "YJ").Replace("口罩", "KZ").Replace("*", "").Replace("收藏", "S-C").Replace("新品", "XP").Replace("推荐", "TJ"); //propValue_name = propValue_name.Replace("/", "-"); var attrValue = new VDianParam.VDianAttrValue() diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 488517c..077d6a7 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -274,6 +274,12 @@ WXWaybillManageForm.cs + + Form + + + WXUserCollectAuthProdListForm.cs + Form @@ -1328,6 +1334,9 @@ WXWaybillManageForm.cs + + WXUserCollectAuthProdListForm.cs + WXUserProdListForm.cs diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.Designer.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.Designer.cs index 4769fb1..e795718 100644 --- a/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.Designer.cs +++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.Designer.cs @@ -31,18 +31,19 @@ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("超级店铺管理"); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("超级用户管理"); System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("产品数据库"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("SKU替换图"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("机会商品采集"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("以图搜品采集"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("厂家商品采集"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("选品加价管理"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("认领待上传"); - System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("库存上传"); - System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("商品核价"); - System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("随机厂商商品"); - System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("商品导入"); - System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("微店管理"); - System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("设置禁售"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("SKU替换图"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("机会商品采集"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("以图搜品采集"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("厂家商品采集"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("选品加价管理"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("认领待上传"); + System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("库存上传"); + System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("商品核价"); + System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("随机厂商商品"); + System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("商品导入"); + System.Windows.Forms.TreeNode treeNode15 = new System.Windows.Forms.TreeNode("微店管理"); + System.Windows.Forms.TreeNode treeNode16 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, @@ -56,7 +57,8 @@ treeNode11, treeNode12, treeNode13, - treeNode14}); + treeNode14, + treeNode15}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -79,7 +81,7 @@ this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(0, 0); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(792, 446); + this.panel1.Size = new System.Drawing.Size(792, 574); this.panel1.TabIndex = 2; // // panel3 @@ -87,7 +89,7 @@ this.panel3.Dock = System.Windows.Forms.DockStyle.Fill; this.panel3.Location = new System.Drawing.Point(0, 28); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(792, 418); + this.panel3.Size = new System.Drawing.Size(792, 546); this.panel3.TabIndex = 1; // // panel2 @@ -124,7 +126,7 @@ // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.panel1); - this.splitContainer1.Size = new System.Drawing.Size(933, 446); + this.splitContainer1.Size = new System.Drawing.Size(933, 574); this.splitContainer1.SplitterDistance = 140; this.splitContainer1.SplitterWidth = 1; this.splitContainer1.TabIndex = 3; @@ -153,41 +155,43 @@ treeNode2.Text = "超级用户管理"; treeNode3.Name = "产品数据库"; treeNode3.Text = "产品数据库"; - treeNode4.Name = "SKU替换图"; - treeNode4.Text = "SKU替换图"; - treeNode5.Name = "机会商品采集"; - treeNode5.Text = "机会商品采集"; - treeNode6.Name = "以图搜品采集"; - treeNode6.Text = "以图搜品采集"; - treeNode7.Name = "厂家商品采集"; - treeNode7.Text = "厂家商品采集"; - treeNode8.Name = "选品加价管理"; - treeNode8.Text = "选品加价管理"; - treeNode9.Name = "认领待上传"; - treeNode9.Text = "认领待上传"; - treeNode10.Name = "库存上传"; - treeNode10.Text = "库存上传"; - treeNode11.Name = "商品核价"; - treeNode11.Text = "商品核价"; - treeNode12.Name = "随机厂商商品"; - treeNode12.Text = "随机厂商商品"; - treeNode13.Name = "商品导入"; - treeNode13.Text = "商品导入"; - treeNode14.Name = "微店管理"; - treeNode14.Text = "微店管理"; - treeNode15.Name = "超级权限管理"; - treeNode15.Text = "超级权限管理"; + treeNode4.Name = "设置禁售"; + treeNode4.Text = "设置禁售"; + treeNode5.Name = "SKU替换图"; + treeNode5.Text = "SKU替换图"; + treeNode6.Name = "机会商品采集"; + treeNode6.Text = "机会商品采集"; + treeNode7.Name = "以图搜品采集"; + treeNode7.Text = "以图搜品采集"; + treeNode8.Name = "厂家商品采集"; + treeNode8.Text = "厂家商品采集"; + treeNode9.Name = "选品加价管理"; + treeNode9.Text = "选品加价管理"; + treeNode10.Name = "认领待上传"; + treeNode10.Text = "认领待上传"; + treeNode11.Name = "库存上传"; + treeNode11.Text = "库存上传"; + treeNode12.Name = "商品核价"; + treeNode12.Text = "商品核价"; + treeNode13.Name = "随机厂商商品"; + treeNode13.Text = "随机厂商商品"; + treeNode14.Name = "商品导入"; + treeNode14.Text = "商品导入"; + treeNode15.Name = "微店管理"; + treeNode15.Text = "微店管理"; + treeNode16.Name = "超级权限管理"; + treeNode16.Text = "超级权限管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode15}); + treeNode16}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); - this.tv.Size = new System.Drawing.Size(140, 446); + this.tv.Size = new System.Drawing.Size(140, 574); this.tv.TabIndex = 1; this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect); // // PDDAdminForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(933, 446); + this.ClientSize = new System.Drawing.Size(933, 574); this.Controls.Add(this.splitContainer1); this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); diff --git a/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs b/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs index de5be43..a0fe956 100644 --- a/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs +++ b/TEMUKJD/PDDForms/AdminForms/PDDAdminForm.cs @@ -24,6 +24,7 @@ namespace TemuKJD.PDDForms.AdminForms public Lazy adminAccountForm = new Lazy(); public Lazy adminShopForm = new Lazy(); public Lazy dbProdListForm = new Lazy(); + public Lazy banPlatformForm = new Lazy(); public Lazy dbProdImgListForm = new Lazy(); public Lazy getChanceProdForm = new Lazy(); public Lazy getChanceProdByImgForm = new Lazy(); @@ -95,6 +96,11 @@ namespace TemuKJD.PDDForms.AdminForms case "产品数据库": SetForm(dbProdListForm.Value); break; + + case "设置禁售": + SetForm(banPlatformForm.Value); + break; + case "SKU替换图": SetForm(dbProdImgListForm.Value); break; diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index ccfd99b..d59a893 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -772,7 +772,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(743, 5); + this.cmbPddRelation.Location = new System.Drawing.Point(743, 7); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Size = new System.Drawing.Size(47, 25); @@ -827,7 +827,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat2.FormattingEnabled = true; - this.cmbCat2.Location = new System.Drawing.Point(278, 77); + this.cmbCat2.Location = new System.Drawing.Point(278, 75); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(46, 25); @@ -912,7 +912,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(278, 42); + this.cmbSourceType.Location = new System.Drawing.Point(278, 40); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(46, 25); @@ -958,7 +958,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(622, 7); + this.cmbWxCat.Location = new System.Drawing.Point(622, 5); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(47, 25); @@ -980,7 +980,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "认领总数"}); - this.cmbSort.Location = new System.Drawing.Point(381, 42); + this.cmbSort.Location = new System.Drawing.Point(381, 40); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(46, 25); @@ -1056,7 +1056,7 @@ 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(175, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(175, 40); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(46, 25); @@ -1071,7 +1071,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 42); + this.cmbExportToOutServer.Location = new System.Drawing.Point(622, 40); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Size = new System.Drawing.Size(47, 25); @@ -1107,7 +1107,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(501, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(501, 40); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(47, 25); @@ -1149,7 +1149,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat1.FormattingEnabled = true; - this.cmbCat1.Location = new System.Drawing.Point(175, 77); + this.cmbCat1.Location = new System.Drawing.Point(175, 75); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(46, 25); @@ -1171,7 +1171,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); this.cmbCat3.FormattingEnabled = true; - this.cmbCat3.Location = new System.Drawing.Point(381, 77); + this.cmbCat3.Location = new System.Drawing.Point(381, 75); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(46, 25); @@ -1268,7 +1268,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "修复回传未拉回"}); - this.cmbHasReturn.Location = new System.Drawing.Point(743, 42); + this.cmbHasReturn.Location = new System.Drawing.Point(743, 40); this.cmbHasReturn.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHasReturn.Name = "cmbHasReturn"; this.cmbHasReturn.Size = new System.Drawing.Size(47, 25); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index 78a7ff5..6f52d1e 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -775,21 +775,23 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } - GetPDDProductGroup(new List { cmbGroup }); + GetPDDProductGroup(new List { cmbGroup }, "", "无分组"); GetPDDProductGroup(new List { cmbGroupFilter }, "", "无分组"); } - public static void GetPDDProductGroup(ComboBox box, string get_type = "", string addItems = "") + public static void GetPDDProductGroup(ComboBox box, string product_get_type = "", string addMoreItems = "", string group_add_user_name = "") { - GetPDDProductGroup(new List { box }, get_type, addItems); + GetPDDProductGroup(new List { box }, product_get_type, addMoreItems, group_add_user_name); } - public static void GetPDDProductGroup(List boxs, string get_type = "", string addItems = "") + public static void GetPDDProductGroup(List boxs, string product_get_type = "", string addMoreItems = "", string group_add_user_name = "") { var url = BaseClass.BuildPDDObjString("product/get_product_groups"); var data = UserLogin.GetSignaturex(); - if (!string.IsNullOrWhiteSpace(get_type)) - data += "&product_get_type=" + get_type; + if (!string.IsNullOrWhiteSpace(product_get_type)) + data += "&product_get_type=" + product_get_type; + if (!string.IsNullOrWhiteSpace(group_add_user_name)) + data += "&add_user_name=" + group_add_user_name; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -808,9 +810,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms box.Items.Clear(); var groups = BaseRegex.GetStringJson(ref html, "data"); box.Items.Add(""); - if (!string.IsNullOrEmpty(addItems)) + if (!string.IsNullOrEmpty(addMoreItems)) { - foreach (var item in addItems.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) + foreach (var item in addMoreItems.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) { box.Items.Add(item); } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs index 316aca0..7ad6b7f 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs @@ -280,9 +280,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void RefreshDbProd() { Task.Run(() => - { + { // 同时刷新下商品分组 - PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter); + PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, "", "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); // 刷新类目信息 GetPddProductCate(); @@ -6197,6 +6197,8 @@ Content-Type: image/jpeg data += "&in_spu_ids=" + txtIdFilter.Text; data += "&in_groups=" + cmbGroupFilter.Text; + data += "&add_user_name=" + (BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); + if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") { data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs index 1a69994..463d0b2 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.Designer.cs @@ -30,20 +30,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); - this.splitContainer2 = new System.Windows.Forms.SplitContainer(); - this.splitContainer3 = new System.Windows.Forms.SplitContainer(); - this.pbShopLoading = new System.Windows.Forms.PictureBox(); - this.pbLoading = new System.Windows.Forms.PictureBox(); - this.panel2 = new System.Windows.Forms.Panel(); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.btnShowMyCollect = new DevComponents.DotNetBar.PanelEx(); this.btnSelectNotGetDetail = new DevComponents.DotNetBar.PanelEx(); this.cmbFilterType = new System.Windows.Forms.ComboBox(); this.btnFilter = new DevComponents.DotNetBar.PanelEx(); @@ -82,6 +78,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkOverride = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label6 = new System.Windows.Forms.Label(); this.txtMinPrice = new System.Windows.Forms.TextBox(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.splitContainer3 = new System.Windows.Forms.SplitContainer(); + this.pbShopLoading = new System.Windows.Forms.PictureBox(); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -92,10 +91,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn(); this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.panel2 = new System.Windows.Forms.Panel(); this.dgvChanceProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.chk = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colChanceId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -106,10 +104,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colCate = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.chk = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); this.splitContainer1.SuspendLayout(); + this.ucGroupBoxEx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); this.splitContainer2.Panel2.SuspendLayout(); @@ -119,9 +121,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer3.Panel2.SuspendLayout(); this.splitContainer3.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).BeginInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); - this.ucGroupBoxEx1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvChanceProduct)).BeginInit(); this.SuspendLayout(); // @@ -145,82 +146,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer1.SplitterDistance = 140; this.splitContainer1.TabIndex = 4; // - // splitContainer2 - // - this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; - this.splitContainer2.Location = new System.Drawing.Point(0, 0); - this.splitContainer2.Name = "splitContainer2"; - this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; - // - // splitContainer2.Panel1 - // - this.splitContainer2.Panel1.Controls.Add(this.splitContainer3); - this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); - // - // splitContainer2.Panel2 - // - 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(1424, 491); - this.splitContainer2.SplitterDistance = 462; - this.splitContainer2.TabIndex = 0; - // - // splitContainer3 - // - this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; - this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; - this.splitContainer3.Location = new System.Drawing.Point(4, 0); - this.splitContainer3.Name = "splitContainer3"; - // - // splitContainer3.Panel1 - // - this.splitContainer3.Panel1.Controls.Add(this.pbShopLoading); - this.splitContainer3.Panel1.Controls.Add(this.dgvShop); - // - // splitContainer3.Panel2 - // - 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(1416, 462); - this.splitContainer3.SplitterDistance = 290; - this.splitContainer3.TabIndex = 9; - // - // pbShopLoading - // - 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, 206); - this.pbShopLoading.Name = "pbShopLoading"; - this.pbShopLoading.Size = new System.Drawing.Size(50, 50); - this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbShopLoading.TabIndex = 8; - this.pbShopLoading.TabStop = false; - // - // 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(536, 206); - this.pbLoading.Name = "pbLoading"; - this.pbLoading.Size = new System.Drawing.Size(50, 50); - this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbLoading.TabIndex = 7; - this.pbLoading.TabStop = false; - this.pbLoading.Visible = false; - // - // panel2 - // - this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) - | System.Windows.Forms.AnchorStyles.Left) - | 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(690, 87); - this.panel2.TabIndex = 8; - // // ucGroupBoxEx1 // this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) @@ -228,6 +153,7 @@ 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.btnShowMyCollect); this.ucGroupBoxEx1.Controls.Add(this.btnSelectNotGetDetail); this.ucGroupBoxEx1.Controls.Add(this.cmbFilterType); this.ucGroupBoxEx1.Controls.Add(this.btnFilter); @@ -273,6 +199,31 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "操作"; // + // btnShowMyCollect + // + this.btnShowMyCollect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnShowMyCollect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnShowMyCollect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnShowMyCollect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnShowMyCollect.Location = new System.Drawing.Point(287, 103); + this.btnShowMyCollect.Name = "btnShowMyCollect"; + this.btnShowMyCollect.Size = new System.Drawing.Size(100, 25); + this.btnShowMyCollect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnShowMyCollect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnShowMyCollect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnShowMyCollect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnShowMyCollect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnShowMyCollect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnShowMyCollect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnShowMyCollect.Style.GradientAngle = 90; + this.btnShowMyCollect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnShowMyCollect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnShowMyCollect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnShowMyCollect.TabIndex = 1049; + this.btnShowMyCollect.Text = "查看我的采集"; + this.btnShowMyCollect.Visible = false; + this.btnShowMyCollect.Click += new System.EventHandler(this.btnGetMyCollect_Click); + // // btnSelectNotGetDetail // this.btnSelectNotGetDetail.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -399,7 +350,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(287, 88); + this.btnClear.Location = new System.Drawing.Point(287, 75); this.btnClear.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(100, 25); this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -477,7 +428,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(287, 26); + this.btnStop.Location = new System.Drawing.Point(287, 19); this.btnStop.Name = "btnStop"; this.btnStop.Size = new System.Drawing.Size(100, 25); this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -510,7 +461,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(287, 57); + this.btnStopStop.Location = new System.Drawing.Point(287, 47); this.btnStopStop.Name = "btnStopStop"; this.btnStopStop.Size = new System.Drawing.Size(100, 25); this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -804,23 +755,77 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtMinPrice.TabIndex = 842; this.txtMinPrice.Text = "10"; // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.splitContainer3); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); + // + // splitContainer2.Panel2 + // + 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(1424, 491); + this.splitContainer2.SplitterDistance = 462; + this.splitContainer2.TabIndex = 0; + // + // splitContainer3 + // + this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer3.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer3.Location = new System.Drawing.Point(4, 0); + this.splitContainer3.Name = "splitContainer3"; + // + // splitContainer3.Panel1 + // + this.splitContainer3.Panel1.Controls.Add(this.pbShopLoading); + this.splitContainer3.Panel1.Controls.Add(this.dgvShop); + // + // splitContainer3.Panel2 + // + 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(1416, 462); + this.splitContainer3.SplitterDistance = 290; + this.splitContainer3.TabIndex = 9; + // + // pbShopLoading + // + 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, 206); + this.pbShopLoading.Name = "pbShopLoading"; + this.pbShopLoading.Size = new System.Drawing.Size(50, 50); + this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbShopLoading.TabIndex = 8; + this.pbShopLoading.TabStop = false; + // // dgvShop // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvShop.AutoRowNumber = true; this.dgvShop.BackgroundColor = System.Drawing.Color.White; this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -915,24 +920,46 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // + // 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(536, 206); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 7; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // + // panel2 + // + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | 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(690, 87); + this.panel2.TabIndex = 8; + // // dgvChanceProduct // this.dgvChanceProduct.AllowUserToAddRows = false; this.dgvChanceProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvChanceProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvChanceProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10; this.dgvChanceProduct.AutoRowNumber = true; this.dgvChanceProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvChanceProduct.BackgroundColor = System.Drawing.Color.White; this.dgvChanceProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvChanceProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvChanceProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11; this.dgvChanceProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvChanceProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -955,46 +982,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvChanceProduct.TabIndex = 6; this.dgvChanceProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvChanceProduct_CellContentClick); // - // chk - // - this.chk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chk.AutoSize = true; - this.chk.Checked = true; - this.chk.CheckState = System.Windows.Forms.CheckState.Checked; - this.chk.Location = new System.Drawing.Point(1357, 3); - this.chk.Name = "chk"; - this.chk.Size = new System.Drawing.Size(63, 21); - this.chk.TabIndex = 671; - this.chk.Text = "多选框"; - this.chk.UseVisualStyleBackColor = true; - this.chk.Visible = false; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Left; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(296, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(743, 25); - this.statusBar.TabIndex = 5; - // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; - this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.ucSplitPage1.PageSize = 50; - this.ucSplitPage1.Size = new System.Drawing.Size(296, 25); - this.ucSplitPage1.TabIndex = 6; - this.ucSplitPage1.TotalPage = 1; - this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); - // // colCheck // this.colCheck.FillWeight = 26F; @@ -1038,8 +1025,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colGoodsName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle12; this.colGoodsName.FillWeight = 120F; this.colGoodsName.HeaderText = "商品名称"; this.colGoodsName.Name = "colGoodsName"; @@ -1060,8 +1047,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colPrice // - dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle6; + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle13; this.colPrice.FillWeight = 70F; this.colPrice.HeaderText = "价格"; this.colPrice.Name = "colPrice"; @@ -1069,13 +1056,53 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colMsg // - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle14; this.colMsg.FillWeight = 200F; this.colMsg.HeaderText = "操作结果"; this.colMsg.Name = "colMsg"; this.colMsg.ReadOnly = true; // + // chk + // + this.chk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chk.AutoSize = true; + this.chk.Checked = true; + this.chk.CheckState = System.Windows.Forms.CheckState.Checked; + this.chk.Location = new System.Drawing.Point(1357, 3); + this.chk.Name = "chk"; + this.chk.Size = new System.Drawing.Size(63, 21); + this.chk.TabIndex = 671; + this.chk.Text = "多选框"; + this.chk.UseVisualStyleBackColor = true; + this.chk.Visible = false; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Left; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(296, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(743, 25); + this.statusBar.TabIndex = 5; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Left; + this.ucSplitPage1.IsShowPageSize = false; + this.ucSplitPage1.Location = new System.Drawing.Point(0, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.PageSize = 50; + this.ucSplitPage1.Size = new System.Drawing.Size(296, 25); + this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalPage = 1; + this.ucSplitPage1.PageChange += new System.Action(this.ucSplitPage1_PageChange); + // // PDDGetChanceProdForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1091,6 +1118,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer1.Panel2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); this.splitContainer1.ResumeLayout(false); + this.ucGroupBoxEx1.ResumeLayout(false); + this.ucGroupBoxEx1.PerformLayout(); this.splitContainer2.Panel1.ResumeLayout(false); this.splitContainer2.Panel2.ResumeLayout(false); this.splitContainer2.Panel2.PerformLayout(); @@ -1101,10 +1130,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms ((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit(); this.splitContainer3.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbShopLoading)).EndInit(); - ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); - this.ucGroupBoxEx1.ResumeLayout(false); - this.ucGroupBoxEx1.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvChanceProduct)).EndInit(); this.ResumeLayout(false); @@ -1181,5 +1208,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colCate; private System.Windows.Forms.DataGridViewTextBoxColumn colPrice; private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; + private DevComponents.DotNetBar.PanelEx btnShowMyCollect; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs index c6ebf6a..ee308e3 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDGetChanceProdForm.cs @@ -22,12 +22,18 @@ using TemuKJD.Extension; using TemuKJD.PDDForms.AdminForms; using TemuKJD.PDDForms.ShopForms; using TemuKJD.ToolForms; +using TemuKJD.WXForms.ProductForms; using Work; namespace TemuKJD.PDDForms.ProductSelectForms { public partial class PDDGetChanceProdForm : Form { + /// + /// 是否是普通授权用户 + /// + public bool IsAuthorityUser { get; set; } = false; + CheckBox chkSelectAll; ChanceProductConfig chanceProductConfig; public CancellationTokenSource cancellationTokenSource { get; set; } = null; @@ -44,6 +50,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void PDDGetChanceProd_Load(object sender, EventArgs e) { + if (IsAuthorityUser) + btnShowMyCollect.Visible = true; + this.panel2.Location = new Point(45, 55); this.panel2.Width = Math.Max(10, this.panel2.Parent.Width - 90); this.panel2.Height = Math.Max(10, this.panel2.Parent.Height - 90); @@ -280,7 +289,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms List list = new List(); pageCount = 1; - var url = BaseClass.BuildObjString("shop/admin_get_shop_list"); + var url = BaseClass.BuildPDDObjString("shop/admin_get_shop_list"); var data = UserLogin.GetSignaturex() + "&page=" + page + "&page_size=" + pageSize + @@ -332,7 +341,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms { { PDDAdminShopListForm.Instance.CheckShopLogin(new ShopLoginInfo[] { shop }, false); - if (shop.LoginStatus == "登录成功") + if (IsAuthorityUser) + displayShopStatus(shop); + else if (shop.LoginStatus == "登录成功") { PDDAdminShopLoginForm shopLoginForm = new PDDAdminShopLoginForm(shop); shopLoginForm.openType = EnumOpenType.manage; @@ -877,10 +888,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms continue; } + // 机会商品采集权限用户采集的数据加上用户前缀（商品前缀显示给用户的时候隐藏） + string userAuthorityTag = ""; + if (IsAuthorityUser) + userAuthorityTag = "-" + BaseClass.UserName; + bool isExist = false; - var existUrl = BaseClass.BuildObjString("product/get_product_list"); + var existUrl = BaseClass.BuildPDDObjString("product/get_product_list"); // 每次获取的机会商品goods_id都不同，此处根据机会商品的chanceId来获取库中是否存在 - string existData = UserLogin.GetSignaturex() + "&from_shop_id=" + chanceId; + string existData = UserLogin.GetSignaturex() + "&from_shop_id=" + chanceId + userAuthorityTag; string html = GetHtml.PostUtf8(existUrl, existData); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(existUrl, existData); @@ -900,19 +916,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms isExist = true; } - var url = BaseClass.BuildObjString("product/add_product"); + var url = BaseClass.BuildPDDObjString("product/add_product"); if (isExist) { if (chkOverride.Checked) { - var oldSpuId = BaseRegex.GetLongJson(ref html, "spu_id"); + // 将商品编号前缀给还原 + var oldSpuId = BaseRegex.GetStringJson(ref html, "spu_id").Replace("-" + BaseClass.UserName, "").ParseToLong(); if (oldSpuId > 0) { // 将商品Id替换成老的商品Id dbProd.product_json = dbProd.product_json.Replace(prodDetail.goods_id.ParseToString(), oldSpuId.ParseToString()); prodDetail.goods_id = oldSpuId; } - url = BaseClass.BuildObjString("product/mdy_product"); + url = BaseClass.BuildPDDObjString("product/mdy_product"); } else { @@ -925,8 +942,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms } var data = Work.UserLogin.GetSignaturex() + - "&from_shop_id=" + chanceId + - "&spu_id=" + prodDetail.goods_id.ParseToString() + + "&from_shop_id=" + chanceId + userAuthorityTag + + "&spu_id=" + prodDetail.goods_id.ParseToString() + userAuthorityTag + "&skc_id=" + prodDetail.goods_id.ParseToString() + "&price_text=" + prodDetail.sku.Min(s => s.multi_price).ParseToInt() * 0.01m + "-" + prodDetail.sku.Max(s => s.multi_price).ParseToInt() * 0.01m + "&main_cat_id=" + (prodDetail.cat_ids?.FirstOrDefault(c => c != null)).ParseToString() + @@ -939,6 +956,11 @@ 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 (IsAuthorityUser) + { + data += "&add_user_name=" + BaseClass.UserName; + data += "&group=用户" + BaseClass.UserName; + } if (dbProd.main_cat_id == "15543" || dbProd.main_cat_name == "书籍/杂志/报纸") { data += "&special_prod_type=" + HttpUtility.UrlEncode("书籍", Encoding.UTF8); @@ -1118,6 +1140,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } } + + private void btnGetMyCollect_Click(object sender, EventArgs e) + { + WXUserCollectAuthProdListForm userCollectAuthProdListForm = new WXUserCollectAuthProdListForm(); + userCollectAuthProdListForm.ShowDialog(); + } } public class ChanceProductConfig diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs index 097fd99..2aa05dc 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs @@ -108,7 +108,9 @@ namespace TemuKJD.PDDForms.ShopForms //OnInfoReceived("商品获取失败！商品数据格式获取失败！"); return "商品获取失败！商品数据格式获取失败！"; } - if (catId.IsNullOrEmpty()) + //if (catId.IsNullOrEmpty()) + // catId = product.cat_id.ParseToString(); + if (!product.cat_id.IsNullOrZero()) catId = product.cat_id.ParseToString(); } catch (Exception ex) diff --git a/TEMUKJD/VDianForms/VDianUploadProductForm.cs b/TEMUKJD/VDianForms/VDianUploadProductForm.cs index d69f153..70a46e5 100644 --- a/TEMUKJD/VDianForms/VDianUploadProductForm.cs +++ b/TEMUKJD/VDianForms/VDianUploadProductForm.cs @@ -400,11 +400,12 @@ namespace KJD.VDianForms { id = skuInfo.id.ParseToLong(), price = skuInfo.price.ParseToDecimal() * 0.01m, - name = string.Join(";", skuInfo.spec.Select(s => s.spec_name).ToList()), + name = string.Join(";", skuInfo.spec.Select(s => s.spec_name).Take(2).ToList()), number = skuInfo.quantity.ParseToInt() == 0 ? skuInfo.quantity_delta.ParseToInt() : skuInfo.quantity.ParseToInt(), pinduoduo_image = skuInfo.thumb_url, }; - product.SkuMaps.Add(skuMap); + if (!product.SkuMaps.Any(s => s.name == skuMap.name)) + product.SkuMaps.Add(skuMap); } VDianParam.VDianProductBase vDianProduct = null; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs index 6a49b7a..2efb2b0 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.Designer.cs @@ -86,6 +86,7 @@ namespace TemuKJD.WXForms.AdminForms this.editColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.deleteColumn = new System.Windows.Forms.DataGridViewLinkColumn(); this.btnExportShopErp = new DevComponents.DotNetBar.PanelEx(); + this.chkChanceProdCollect = new TemuKJD.UserComponent.UcCheckBox(this.components); ((System.ComponentModel.ISupportInitialize)(this.splitContainer5)).BeginInit(); this.splitContainer5.Panel1.SuspendLayout(); this.splitContainer5.Panel2.SuspendLayout(); @@ -108,6 +109,7 @@ namespace TemuKJD.WXForms.AdminForms // splitContainer5.Panel1 // this.splitContainer5.Panel1.BackColor = System.Drawing.Color.WhiteSmoke; + this.splitContainer5.Panel1.Controls.Add(this.chkChanceProdCollect); this.splitContainer5.Panel1.Controls.Add(this.chkShopPoints); this.splitContainer5.Panel1.Controls.Add(this.chkWXShowProdGetFromType); this.splitContainer5.Panel1.Controls.Add(this.label7); @@ -154,12 +156,13 @@ namespace TemuKJD.WXForms.AdminForms // // chkShopPoints // - this.chkShopPoints.Location = new System.Drawing.Point(112, 419); + this.chkShopPoints.Location = new System.Drawing.Point(59, 518); this.chkShopPoints.Name = "chkShopPoints"; this.chkShopPoints.Size = new System.Drawing.Size(68, 21); this.chkShopPoints.TabIndex = 811; this.chkShopPoints.Text = "积分用户"; this.chkShopPoints.UseVisualStyleBackColor = true; + this.chkShopPoints.Visible = false; // // chkWXShowProdGetFromType // @@ -708,6 +711,15 @@ namespace TemuKJD.WXForms.AdminForms this.btnExportShopErp.Visible = false; this.btnExportShopErp.Click += new System.EventHandler(this.btnExportShopErp_Click); // + // chkProdCollect + // + this.chkChanceProdCollect.Location = new System.Drawing.Point(112, 421); + this.chkChanceProdCollect.Name = "chkProdCollect"; + this.chkChanceProdCollect.Size = new System.Drawing.Size(96, 21); + this.chkChanceProdCollect.TabIndex = 812; + this.chkChanceProdCollect.Text = "机会商品采集"; + this.chkChanceProdCollect.UseVisualStyleBackColor = true; + // // WXAdminAccountForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -788,5 +800,6 @@ namespace TemuKJD.WXForms.AdminForms private System.Windows.Forms.DataGridViewLinkColumn editColumn; private System.Windows.Forms.DataGridViewLinkColumn deleteColumn; private UserComponent.UcCheckBox chkShopPoints; + private UserComponent.UcCheckBox chkChanceProdCollect; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs index 1f6f471..685fc7f 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountForm.cs @@ -81,6 +81,8 @@ namespace TemuKJD.WXForms.AdminForms authority += "微信回采,"; if (chkWXShowProdGetFromType.Checked) authority += "货源选择,"; + if (chkChanceProdCollect.Checked) + authority += "机会商品采集,"; if (chkShopPoints.Checked) authority += "积分用户,"; data.Append("&authority=" + authority.Trim(',')); @@ -191,6 +193,7 @@ namespace TemuKJD.WXForms.AdminForms cmbSaLevel.Text = "普通用户"; chkWXComplateProd.Checked = false; chkWXShowProdGetFromType.Checked = false; + chkChanceProdCollect.Checked = false; chkShopPoints.Checked = false; } @@ -225,6 +228,8 @@ namespace TemuKJD.WXForms.AdminForms cmbSaLevel.Text = saLevelName; chkWXComplateProd.Checked = authority.Contains(chkWXComplateProd.Text); chkShopPoints.Checked = authority.Contains(chkShopPoints.Text); + chkChanceProdCollect.Checked = authority.Contains(chkChanceProdCollect.Text); + chkWXShowProdGetFromType.Checked = authority.Contains(chkWXShowProdGetFromType.Text); } if (columname == "删除") { diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs index 8aeef02..c079593 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs @@ -31,12 +31,12 @@ System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("超级店铺管理"); System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("超级用户管理"); System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("PDD产品库"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("厂家商品采集"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("Sku采集回传"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("1688厂家采集"); - System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("随机厂商商品"); - System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("地址管理"); - System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("设置禁售"); + System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("设置禁售"); + System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("厂家商品采集"); + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("Sku采集回传"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("1688厂家采集"); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("随机厂商商品"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("地址管理"); System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("图片工具"); System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("运单管理"); System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] { @@ -147,18 +147,18 @@ treeNode2.Text = "超级用户管理"; treeNode3.Name = "PDD产品库"; treeNode3.Text = "PDD产品库"; - treeNode4.Name = "厂家商品采集"; - treeNode4.Text = "厂家商品采集"; - treeNode5.Name = "Sku采集回传"; - treeNode5.Text = "Sku采集回传"; - treeNode6.Name = "1688厂家采集"; - treeNode6.Text = "1688厂家采集"; - treeNode7.Name = "随机厂商商品"; - treeNode7.Text = "随机厂商商品"; - treeNode8.Name = "地址管理"; - treeNode8.Text = "地址管理"; - treeNode9.Name = "设置禁售"; - treeNode9.Text = "设置禁售"; + treeNode4.Name = "设置禁售"; + treeNode4.Text = "设置禁售"; + treeNode5.Name = "厂家商品采集"; + treeNode5.Text = "厂家商品采集"; + treeNode6.Name = "Sku采集回传"; + treeNode6.Text = "Sku采集回传"; + treeNode7.Name = "1688厂家采集"; + treeNode7.Text = "1688厂家采集"; + treeNode8.Name = "随机厂商商品"; + treeNode8.Text = "随机厂商商品"; + treeNode9.Name = "地址管理"; + treeNode9.Text = "地址管理"; treeNode10.Name = "图片工具"; treeNode10.Text = "图片工具"; treeNode11.Name = "运单管理"; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs index 90a5e48..7589c70 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs @@ -90,6 +90,9 @@ namespace TemuKJD.WXForms.AdminForms case "PDD产品库": SetForm(pddDbProdListForm.Value); break; + case "设置禁售": + SetForm(banPlatformForm.Value); + break; case "厂家商品采集": SetForm(getJuShuitanProdForm.Value); break; @@ -102,9 +105,6 @@ namespace TemuKJD.WXForms.AdminForms case "地址管理": SetForm(getAddressForm.Value); break; - case "设置禁售": - SetForm(banPlatformForm.Value); - break; case "图片工具": SetForm(imgToolForm.Value); break; diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index 25998c1..44186d6 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -469,7 +469,7 @@ namespace TemuKJD.WXForms.ProductForms string sourceType = cmbSourceType.Text.Trim(); Task.Run(() => { - PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType); // 同时刷新下商品分组 + PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType, "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); // 同时刷新下商品分组 GetPddProductCate(); Invoke(new Action(() => { @@ -3011,6 +3011,19 @@ namespace TemuKJD.WXForms.ProductForms if (propInfo.values.FirstOrDefault().value.Contains("岁以上") || propInfo.values.FirstOrDefault().value.Contains("个月以上")) attrValue = propInfo.values.FirstOrDefault().value; } + else if (attr.value == "个") + { + if ((propInfo.values.FirstOrDefault()?.value).ParseToString().EndsWith("个")) + { + attrValue = propInfo.values.FirstOrDefault()?.value; + if (attrValue.TrimEnd('个').ParseToInt() == 0) + attrValue = BaseRegex.GetMatchMaxRegexString(ref attrValue, "(\\d{1,6})") + (attrValue.Contains("只") ? " 只" : " 个"); + if (attrValue.TrimEnd('个').ParseToInt() == 0) + attrValue = "1 个"; + } + else + attrValue = "1 个"; + } else if (attr.value == "只;个") { if ((propInfo.values.FirstOrDefault()?.value).ParseToString().EndsWith("只") || (propInfo.values.FirstOrDefault()?.value).ParseToString().EndsWith("个")) @@ -3200,6 +3213,8 @@ namespace TemuKJD.WXForms.ProductForms attrValue = "7 岁以上"; else if (attr.value == "只;个") attrValue = "1 个"; + else if (attr.value == "个") + attrValue = "1 个"; else if (attr.value == "ml") attrValue = "100 ml"; else if (attr.value == "L") @@ -4415,6 +4430,8 @@ namespace TemuKJD.WXForms.ProductForms data += "&in_spu_ids=" + txtIdFilter.Text; data += "&in_groups=" + cmbGroupFilter.Text; + data += "&add_user_name=" + (BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); + if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") data += "&in_cates=" + (cmbCateFilter1.Text == "全部" ? "" : cmbCateFilter1.Text); else @@ -4879,7 +4896,7 @@ namespace TemuKJD.WXForms.ProductForms string sourceType = cmbSourceType.Text.Trim(); Task.Run(() => { - PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType); // 同时刷新下商品分组 + PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter, sourceType, "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); // 同时刷新下商品分组 }); if (!string.IsNullOrWhiteSpace(cmbSourceType.Text)) { diff --git a/TEMUKJD/WXForms/ProductForms/WXProductForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXProductForm.Designer.cs index 5e6829f..1d40b66 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProductForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProductForm.Designer.cs @@ -33,12 +33,14 @@ System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("爆单神器"); System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("达人广场"); System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("商品同步"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("机会商品采集"); + System.Windows.Forms.TreeNode treeNode7 = new System.Windows.Forms.TreeNode("商品管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, treeNode4, - treeNode5}); + treeNode5, + treeNode6}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -139,10 +141,12 @@ treeNode4.Text = "达人广场"; treeNode5.Name = "商品同步"; treeNode5.Text = "商品同步"; - treeNode6.Name = "商品管理"; - treeNode6.Text = "商品管理"; + treeNode6.Name = "机会商品采集"; + treeNode6.Text = "机会商品采集"; + treeNode7.Name = "商品管理"; + treeNode7.Text = "商品管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode6}); + treeNode7}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 521); this.tv.TabIndex = 1; diff --git a/TEMUKJD/WXForms/ProductForms/WXProductForm.cs b/TEMUKJD/WXForms/ProductForms/WXProductForm.cs index b131376..f317d82 100644 --- a/TEMUKJD/WXForms/ProductForms/WXProductForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXProductForm.cs @@ -10,6 +10,7 @@ using System.Threading.Tasks; using System.Windows.Forms; using TemuKJD.BaseForms; using AllBase; +using TemuKJD.PDDForms.ProductSelectForms; namespace TemuKJD.WXForms.ProductForms { @@ -21,6 +22,7 @@ namespace TemuKJD.WXForms.ProductForms public Lazy wxProdCouponForm = new Lazy(); public Lazy wxProdSyncForm = new Lazy(); public Lazy wxFinderSquareForm = new Lazy(); + public Lazy getChanceProdForm = new Lazy(); public WXProductForm() { @@ -30,8 +32,10 @@ namespace TemuKJD.WXForms.ProductForms { tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "商品列表", "爆单神器1", "商品同步1" }; + List hideName = new List() { "机会商品采集", "商品列表", "爆单神器1", "商品同步1" }; + if (BaseClass.UserAuthority.Contains("机会商品采集")) + hideName.Remove("机会商品采集"); if (BaseClass.GroupId == 3) { //hideName.Remove("设置进货价"); @@ -84,6 +88,10 @@ namespace TemuKJD.WXForms.ProductForms case "商品同步": SetForm(wxProdSyncForm.Value); break; + case "机会商品采集": + getChanceProdForm.Value.IsAuthorityUser = true; + SetForm(getChanceProdForm.Value); + break; } })); }).Start(); diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs new file mode 100644 index 0000000..22a7c9a --- /dev/null +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs @@ -0,0 +1,1376 @@ + +namespace TemuKJD.WXForms.ProductForms +{ + partial class WXUserCollectAuthProdListForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.components = new System.ComponentModel.Container(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(WXUserCollectAuthProdListForm)); + this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnDel = new DevComponents.DotNetBar.PanelEx(); + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.lblRelation = new System.Windows.Forms.Label(); + this.txtCatBoundLessThan = new System.Windows.Forms.TextBox(); + this.txtCatBoundMoreThan = new System.Windows.Forms.TextBox(); + this.chkCatBoundLessThan = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkCatBoundMoreThan = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.btnSearch = new DevComponents.DotNetBar.PanelEx(); + this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); + this.cmbCat3 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.label17 = new System.Windows.Forms.Label(); + this.cmbCat2 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.label14 = new System.Windows.Forms.Label(); + this.cmbCat1 = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); + this.label2 = new System.Windows.Forms.Label(); + this.txtProdName = new System.Windows.Forms.TextBox(); + this.label3 = new System.Windows.Forms.Label(); + this.lblWxSafe = new System.Windows.Forms.Label(); + this.cmbWxSafe = new System.Windows.Forms.ComboBox(); + this.lblGroup = new System.Windows.Forms.Label(); + this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); + this.cmbSourceType = new System.Windows.Forms.ComboBox(); + this.lblSourceType = new System.Windows.Forms.Label(); + this.cmbRelation = new System.Windows.Forms.ComboBox(); + this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.btnStopStop = new DevComponents.DotNetBar.PanelEx(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + this.label16 = new System.Windows.Forms.Label(); + this.txtRealCoid = new System.Windows.Forms.TextBox(); + this.txtSKC = new System.Windows.Forms.TextBox(); + this.cmbWxCat = new System.Windows.Forms.ComboBox(); + this.label13 = new System.Windows.Forms.Label(); + this.label12 = new System.Windows.Forms.Label(); + this.txtSPU = new System.Windows.Forms.TextBox(); + this.txtSecretStyleCode = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.lblNotes = new System.Windows.Forms.Label(); + this.label5 = new System.Windows.Forms.Label(); + this.txtNotes = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.txtExtCode = new System.Windows.Forms.TextBox(); + this.label4 = new System.Windows.Forms.Label(); + this.cmbExportToOutServer = new System.Windows.Forms.ComboBox(); + this.cmbSort = new System.Windows.Forms.ComboBox(); + this.label6 = new System.Windows.Forms.Label(); + this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx(); + this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.col_db_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFromShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colFromShopName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_product_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMainImg = new System.Windows.Forms.DataGridViewImageColumn(); + this.colSkuReplaceImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSkuReplaceImg = new System.Windows.Forms.DataGridViewImageColumn(); + this.col_spu_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_skc_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colMainCate = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_cat_name = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colCatBound = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_ext_code = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colStyleCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colPriceText = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colExtCodePrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colEdit = new System.Windows.Forms.DataGridViewLinkColumn(); + this.colAddTimes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSelectTotalCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSaleCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.col_notes = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colHeadWords = new System.Windows.Forms.DataGridViewTextBoxColumn(); + 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(); + this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); + this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); + this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); + this.splitContainer1.Panel1.SuspendLayout(); + this.splitContainer1.Panel2.SuspendLayout(); + this.splitContainer1.SuspendLayout(); + this.tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); + this.splitContainer2.Panel1.SuspendLayout(); + this.splitContainer2.Panel2.SuspendLayout(); + this.splitContainer2.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).BeginInit(); + this.SuspendLayout(); + // + // splitContainer1 + // + this.splitContainer1.BackColor = System.Drawing.Color.White; + this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer1.FixedPanel = System.Windows.Forms.FixedPanel.Panel1; + this.splitContainer1.Location = new System.Drawing.Point(1, 33); + this.splitContainer1.Name = "splitContainer1"; + this.splitContainer1.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer1.Panel1 + // + this.splitContainer1.Panel1.Controls.Add(this.btnDel); + this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1); + // + // splitContainer1.Panel2 + // + this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); + this.splitContainer1.Size = new System.Drawing.Size(1438, 686); + this.splitContainer1.SplitterDistance = 74; + this.splitContainer1.TabIndex = 1; + // + // btnDel + // + this.btnDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDel.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnDel.DisabledBackColor = System.Drawing.Color.Empty; + this.btnDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDel.Location = new System.Drawing.Point(1336, 9); + this.btnDel.Name = "btnDel"; + this.btnDel.Size = new System.Drawing.Size(84, 25); + this.btnDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnDel.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnDel.Style.GradientAngle = 90; + this.btnDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDel.TabIndex = 647; + this.btnDel.Text = "删除选中商品"; + this.btnDel.Click += new System.EventHandler(this.btnDel_Click); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.tableLayoutPanel1.ColumnCount = 12; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.0018F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.0018F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 19.99581F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20.00059F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F)); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.lblRelation, 8, 1); + this.tableLayoutPanel1.Controls.Add(this.txtCatBoundLessThan, 5, 1); + this.tableLayoutPanel1.Controls.Add(this.txtCatBoundMoreThan, 3, 1); + this.tableLayoutPanel1.Controls.Add(this.chkCatBoundLessThan, 4, 1); + this.tableLayoutPanel1.Controls.Add(this.chkCatBoundMoreThan, 2, 1); + this.tableLayoutPanel1.Controls.Add(this.btnSearch, 10, 0); + this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 11, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbCat3, 7, 0); + this.tableLayoutPanel1.Controls.Add(this.label17, 6, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbCat2, 5, 0); + this.tableLayoutPanel1.Controls.Add(this.label14, 4, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbCat1, 3, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0); + this.tableLayoutPanel1.Controls.Add(this.txtProdName, 1, 0); + this.tableLayoutPanel1.Controls.Add(this.label3, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.lblWxSafe, 0, 1); + this.tableLayoutPanel1.Controls.Add(this.cmbWxSafe, 1, 1); + this.tableLayoutPanel1.Controls.Add(this.lblGroup, 8, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbGroupFilter, 9, 0); + this.tableLayoutPanel1.Controls.Add(this.cmbSourceType, 7, 1); + this.tableLayoutPanel1.Controls.Add(this.lblSourceType, 6, 1); + this.tableLayoutPanel1.Controls.Add(this.cmbRelation, 9, 1); + this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 4); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 3; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33444F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33445F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33112F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(1193, 105); + this.tableLayoutPanel1.TabIndex = 679; + // + // lblRelation + // + this.lblRelation.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblRelation.AutoSize = true; + this.lblRelation.Location = new System.Drawing.Point(870, 44); + this.lblRelation.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblRelation.Name = "lblRelation"; + this.lblRelation.Size = new System.Drawing.Size(68, 17); + this.lblRelation.TabIndex = 884; + this.lblRelation.Text = "数据转换："; + this.lblRelation.Visible = false; + // + // txtCatBoundLessThan + // + this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(515, 41); + this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; + this.txtCatBoundLessThan.Size = new System.Drawing.Size(146, 23); + this.txtCatBoundLessThan.TabIndex = 883; + this.txtCatBoundLessThan.Text = "100000"; + this.txtCatBoundLessThan.Visible = false; + // + // txtCatBoundMoreThan + // + this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(293, 41); + this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; + this.txtCatBoundMoreThan.Size = new System.Drawing.Size(146, 23); + this.txtCatBoundMoreThan.TabIndex = 882; + this.txtCatBoundMoreThan.Text = "1000"; + this.txtCatBoundMoreThan.Visible = false; + // + // chkCatBoundLessThan + // + this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkCatBoundLessThan.Location = new System.Drawing.Point(448, 42); + this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); + this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; + this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); + this.chkCatBoundLessThan.TabIndex = 882; + this.chkCatBoundLessThan.Text = "保证金≤"; + this.chkCatBoundLessThan.UseVisualStyleBackColor = true; + this.chkCatBoundLessThan.CheckedChanged += new System.EventHandler(this.chkCatBoundLessThan_CheckedChanged); + // + // chkCatBoundMoreThan + // + this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(226, 42); + this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); + this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; + this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); + this.chkCatBoundMoreThan.TabIndex = 815; + this.chkCatBoundMoreThan.Text = "保证金≥"; + this.chkCatBoundMoreThan.UseVisualStyleBackColor = true; + this.chkCatBoundMoreThan.CheckedChanged += new System.EventHandler(this.chkCatBoundMoreThan_CheckedChanged); + // + // btnSearch + // + this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + 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(1090, 5); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(46, 25); + this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSearch.Style.GradientAngle = 90; + this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSearch.TabIndex = 643; + 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(1142, 5); + this.pnlEmpty.Name = "pnlEmpty"; + this.pnlEmpty.Size = new System.Drawing.Size(46, 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); + // + // cmbCat3 + // + this.cmbCat3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbCat3.DefaultText = "全部"; + this.cmbCat3.DropDownHeight = 1; + this.cmbCat3.DropDownWidth = 1; + this.cmbCat3.FormattingEnabled = true; + this.cmbCat3.IntegralHeight = false; + this.cmbCat3.Location = new System.Drawing.Point(718, 5); + this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbCat3.Name = "cmbCat3"; + this.cmbCat3.Size = new System.Drawing.Size(146, 25); + this.cmbCat3.TabIndex = 811; + this.cmbCat3.Text = "全部"; + this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged); + this.cmbCat3.TextChanged += new System.EventHandler(this.cmbCat3_MultiSelectChanged); + // + // label17 + // + this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(667, 9); + this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(51, 17); + this.label17.TabIndex = 811; + this.label17.Text = "类目3："; + // + // cmbCat2 + // + this.cmbCat2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbCat2.DefaultText = "全部"; + this.cmbCat2.DropDownHeight = 1; + this.cmbCat2.DropDownWidth = 1; + this.cmbCat2.FormattingEnabled = true; + this.cmbCat2.IntegralHeight = false; + this.cmbCat2.Location = new System.Drawing.Point(515, 5); + this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbCat2.Name = "cmbCat2"; + this.cmbCat2.Size = new System.Drawing.Size(146, 25); + this.cmbCat2.TabIndex = 804; + this.cmbCat2.Text = "全部"; + this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged); + this.cmbCat2.TextChanged += new System.EventHandler(this.cmbCat2_MultiSelectChanged); + // + // label14 + // + this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label14.AutoSize = true; + this.label14.Location = new System.Drawing.Point(464, 9); + this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(51, 17); + this.label14.TabIndex = 784; + this.label14.Text = "类目2："; + // + // cmbCat1 + // + this.cmbCat1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbCat1.DefaultText = "全部"; + this.cmbCat1.DropDownHeight = 1; + this.cmbCat1.DropDownWidth = 1; + this.cmbCat1.FormattingEnabled = true; + this.cmbCat1.IntegralHeight = false; + this.cmbCat1.Location = new System.Drawing.Point(293, 5); + this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbCat1.Name = "cmbCat1"; + this.cmbCat1.Size = new System.Drawing.Size(146, 25); + this.cmbCat1.TabIndex = 805; + this.cmbCat1.Text = "全部"; + this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged); + this.cmbCat1.TextChanged += new System.EventHandler(this.cmbCat1_MultiSelectChanged); + // + // label2 + // + this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(242, 9); + this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(51, 17); + this.label2.TabIndex = 426; + this.label2.Text = "类目1："; + // + // 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(71, 6); + this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtProdName.Name = "txtProdName"; + this.txtProdName.Size = new System.Drawing.Size(146, 23); + this.txtProdName.TabIndex = 427; + // + // label3 + // + this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(3, 9); + this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(68, 17); + this.label3.TabIndex = 428; + this.label3.Text = "商品标题："; + // + // lblWxSafe + // + this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.lblWxSafe.AutoSize = true; + this.lblWxSafe.Location = new System.Drawing.Point(3, 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 = "微信安检："; + // + // 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(71, 40); + this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbWxSafe.Name = "cmbWxSafe"; + this.cmbWxSafe.Size = new System.Drawing.Size(146, 25); + this.cmbWxSafe.TabIndex = 676; + this.cmbWxSafe.Text = "安全+未校验"; + // + // lblGroup + // + this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblGroup.AutoSize = true; + this.lblGroup.Location = new System.Drawing.Point(894, 9); + 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); + this.lblGroup.TabIndex = 641; + this.lblGroup.Text = "分组："; + this.lblGroup.Visible = false; + // + // cmbGroupFilter + // + 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(938, 5); + this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbGroupFilter.Name = "cmbGroupFilter"; + this.cmbGroupFilter.Size = new System.Drawing.Size(146, 25); + this.cmbGroupFilter.TabIndex = 653; + this.cmbGroupFilter.Visible = false; + // + // cmbSourceType + // + this.cmbSourceType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbSourceType.Enabled = false; + this.cmbSourceType.FormattingEnabled = true; + this.cmbSourceType.Items.AddRange(new object[] { + "", + "厂商直采", + "1688厂家", + "微信小店", + "微信店采", + "母店采集", + "机会商品", + "以图搜品", + "外部数据"}); + this.cmbSourceType.Location = new System.Drawing.Point(718, 40); + this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbSourceType.Name = "cmbSourceType"; + this.cmbSourceType.Size = new System.Drawing.Size(146, 25); + this.cmbSourceType.TabIndex = 654; + this.cmbSourceType.Text = "机会商品"; + this.cmbSourceType.Visible = false; + this.cmbSourceType.SelectedIndexChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); + this.cmbSourceType.TextChanged += new System.EventHandler(this.cmbSourceType_SelectedIndexChanged); + // + // lblSourceType + // + this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblSourceType.AutoSize = true; + this.lblSourceType.Location = new System.Drawing.Point(674, 44); + this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblSourceType.Name = "lblSourceType"; + this.lblSourceType.Size = new System.Drawing.Size(44, 17); + this.lblSourceType.TabIndex = 651; + this.lblSourceType.Text = "来源："; + this.lblSourceType.Visible = false; + // + // cmbRelation + // + this.cmbRelation.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbRelation.FormattingEnabled = true; + this.cmbRelation.Items.AddRange(new object[] { + "", + "是", + "否"}); + this.cmbRelation.Location = new System.Drawing.Point(938, 40); + this.cmbRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbRelation.Name = "cmbRelation"; + this.cmbRelation.Size = new System.Drawing.Size(146, 25); + this.cmbRelation.TabIndex = 882; + this.cmbRelation.Visible = false; + // + // splitContainer2 + // + this.splitContainer2.Dock = System.Windows.Forms.DockStyle.Fill; + this.splitContainer2.FixedPanel = System.Windows.Forms.FixedPanel.Panel2; + this.splitContainer2.Location = new System.Drawing.Point(0, 0); + this.splitContainer2.Name = "splitContainer2"; + this.splitContainer2.Orientation = System.Windows.Forms.Orientation.Horizontal; + // + // splitContainer2.Panel1 + // + this.splitContainer2.Panel1.Controls.Add(this.btnStopStop); + this.splitContainer2.Panel1.Controls.Add(this.pbLoading); + this.splitContainer2.Panel1.Controls.Add(this.label16); + this.splitContainer2.Panel1.Controls.Add(this.txtRealCoid); + this.splitContainer2.Panel1.Controls.Add(this.txtSKC); + this.splitContainer2.Panel1.Controls.Add(this.cmbWxCat); + this.splitContainer2.Panel1.Controls.Add(this.label13); + this.splitContainer2.Panel1.Controls.Add(this.label12); + this.splitContainer2.Panel1.Controls.Add(this.txtSPU); + this.splitContainer2.Panel1.Controls.Add(this.txtSecretStyleCode); + this.splitContainer2.Panel1.Controls.Add(this.label1); + this.splitContainer2.Panel1.Controls.Add(this.chkWXComplateProd); + this.splitContainer2.Panel1.Controls.Add(this.lblNotes); + this.splitContainer2.Panel1.Controls.Add(this.label5); + this.splitContainer2.Panel1.Controls.Add(this.txtNotes); + this.splitContainer2.Panel1.Controls.Add(this.label15); + this.splitContainer2.Panel1.Controls.Add(this.txtExtCode); + this.splitContainer2.Panel1.Controls.Add(this.label4); + this.splitContainer2.Panel1.Controls.Add(this.cmbExportToOutServer); + this.splitContainer2.Panel1.Controls.Add(this.cmbSort); + this.splitContainer2.Panel1.Controls.Add(this.label6); + this.splitContainer2.Panel1.Controls.Add(this.dgvDbProduct); + this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); + // + // splitContainer2.Panel2 + // + this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); + this.splitContainer2.Panel2.Controls.Add(this.statusBar); + this.splitContainer2.Size = new System.Drawing.Size(1438, 608); + this.splitContainer2.SplitterDistance = 579; + this.splitContainer2.TabIndex = 0; + // + // btnStopStop + // + this.btnStopStop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + 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(88, 383); + this.btnStopStop.Name = "btnStopStop"; + this.btnStopStop.Size = new System.Drawing.Size(76, 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 = 878; + this.btnStopStop.Text = "停止查询"; + this.btnStopStop.Visible = false; + this.btnStopStop.Click += new System.EventHandler(this.btnStopStop_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(694, 264); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 7; + this.pbLoading.TabStop = false; + // + // label16 + // + this.label16.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label16.AutoSize = true; + this.label16.Location = new System.Drawing.Point(19, 270); + this.label16.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(69, 17); + this.label16.TabIndex = 812; + this.label16.Text = "coid/skc："; + this.label16.Visible = false; + // + // txtRealCoid + // + this.txtRealCoid.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtRealCoid.Location = new System.Drawing.Point(88, 175); + this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtRealCoid.Name = "txtRealCoid"; + this.txtRealCoid.Size = new System.Drawing.Size(133, 23); + this.txtRealCoid.TabIndex = 814; + this.txtRealCoid.Visible = false; + // + // txtSKC + // + this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtSKC.Location = new System.Drawing.Point(88, 267); + this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtSKC.Name = "txtSKC"; + this.txtSKC.Size = new System.Drawing.Size(133, 23); + this.txtSKC.TabIndex = 432; + this.txtSKC.Visible = false; + // + // cmbWxCat + // + this.cmbWxCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbWxCat.FormattingEnabled = true; + this.cmbWxCat.Items.AddRange(new object[] { + "", + "是", + "否"}); + this.cmbWxCat.Location = new System.Drawing.Point(88, 236); + this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbWxCat.Name = "cmbWxCat"; + this.cmbWxCat.Size = new System.Drawing.Size(133, 25); + this.cmbWxCat.TabIndex = 802; + this.cmbWxCat.Visible = false; + // + // label13 + // + this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label13.AutoSize = true; + this.label13.Location = new System.Drawing.Point(20, 209); + this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(68, 17); + this.label13.TabIndex = 802; + this.label13.Text = "导出入库："; + this.label13.Visible = false; + // + // label12 + // + this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label12.AutoSize = true; + this.label12.Location = new System.Drawing.Point(20, 240); + this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(68, 17); + this.label12.TabIndex = 801; + this.label12.Text = "类目识别："; + this.label12.Visible = false; + // + // txtSPU + // + this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtSPU.Location = new System.Drawing.Point(88, 54); + this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtSPU.Name = "txtSPU"; + this.txtSPU.Size = new System.Drawing.Size(133, 23); + this.txtSPU.TabIndex = 434; + this.txtSPU.Visible = false; + // + // txtSecretStyleCode + // + this.txtSecretStyleCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtSecretStyleCode.Location = new System.Drawing.Point(88, 83); + this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtSecretStyleCode.Name = "txtSecretStyleCode"; + this.txtSecretStyleCode.Size = new System.Drawing.Size(133, 23); + this.txtSecretStyleCode.TabIndex = 812; + this.txtSecretStyleCode.Visible = false; + // + // label1 + // + this.label1.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(19, 179); + this.label1.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(69, 17); + this.label1.TabIndex = 813; + this.label1.Text = "真实coid："; + this.label1.Visible = false; + // + // chkWXComplateProd + // + this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.chkWXComplateProd.Location = new System.Drawing.Point(88, 356); + this.chkWXComplateProd.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); + this.chkWXComplateProd.Name = "chkWXComplateProd"; + this.chkWXComplateProd.Size = new System.Drawing.Size(87, 21); + this.chkWXComplateProd.TabIndex = 808; + this.chkWXComplateProd.Text = "微信回采商品"; + this.chkWXComplateProd.UseVisualStyleBackColor = true; + this.chkWXComplateProd.Visible = false; + // + // lblNotes + // + this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.lblNotes.AutoSize = true; + this.lblNotes.Location = new System.Drawing.Point(44, 299); + this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.lblNotes.Name = "lblNotes"; + this.lblNotes.Size = new System.Drawing.Size(44, 17); + this.lblNotes.TabIndex = 440; + this.lblNotes.Text = "备注："; + this.lblNotes.Visible = false; + // + // label5 + // + this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left; + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(31, 57); + this.label5.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(57, 17); + this.label5.TabIndex = 435; + this.label5.Text = "商品ID："; + this.label5.Visible = false; + // + // txtNotes + // + this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.txtNotes.Location = new System.Drawing.Point(88, 296); + this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtNotes.Name = "txtNotes"; + this.txtNotes.Size = new System.Drawing.Size(133, 23); + this.txtNotes.TabIndex = 439; + this.txtNotes.Visible = false; + // + // label15 + // + this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label15.AutoSize = true; + this.label15.Location = new System.Drawing.Point(44, 86); + this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(44, 17); + this.label15.TabIndex = 811; + this.label15.Text = "编码："; + this.label15.Visible = false; + // + // 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(88, 113); + this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txtExtCode.Name = "txtExtCode"; + this.txtExtCode.Size = new System.Drawing.Size(133, 23); + this.txtExtCode.TabIndex = 429; + this.txtExtCode.Visible = false; + // + // label4 + // + this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label4.AutoSize = true; + this.label4.Location = new System.Drawing.Point(44, 116); + 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); + this.label4.TabIndex = 430; + this.label4.Text = "货号："; + this.label4.Visible = false; + // + // cmbExportToOutServer + // + this.cmbExportToOutServer.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbExportToOutServer.FormattingEnabled = true; + this.cmbExportToOutServer.Items.AddRange(new object[] { + "", + "是", + "否", + "导出未拉回"}); + this.cmbExportToOutServer.Location = new System.Drawing.Point(88, 205); + this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbExportToOutServer.Name = "cmbExportToOutServer"; + this.cmbExportToOutServer.Size = new System.Drawing.Size(133, 25); + this.cmbExportToOutServer.TabIndex = 803; + this.cmbExportToOutServer.Visible = false; + // + // cmbSort + // + this.cmbSort.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.cmbSort.FormattingEnabled = true; + this.cmbSort.Items.AddRange(new object[] { + "入库时间", + "认领总数"}); + this.cmbSort.Location = new System.Drawing.Point(88, 142); + this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cmbSort.Name = "cmbSort"; + this.cmbSort.Size = new System.Drawing.Size(133, 25); + this.cmbSort.TabIndex = 448; + this.cmbSort.Text = "入库时间"; + this.cmbSort.Visible = false; + // + // label6 + // + this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.label6.AutoSize = true; + this.label6.Location = new System.Drawing.Point(44, 146); + 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); + this.label6.TabIndex = 449; + this.label6.Text = "排序："; + this.label6.Visible = false; + // + // dgvDbProduct + // + this.dgvDbProduct.AllowUserToAddRows = false; + this.dgvDbProduct.AllowUserToDeleteRows = false; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvDbProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + this.dgvDbProduct.AutoRowNumber = true; + this.dgvDbProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; + this.dgvDbProduct.BackgroundColor = System.Drawing.Color.White; + this.dgvDbProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvDbProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; + this.dgvDbProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dgvDbProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.colSelect, + this.col_db_id, + this.colFromShopId, + this.colFromShopName, + this.col_product_name, + this.colImgUrl, + this.colMainImg, + this.colSkuReplaceImgUrl, + this.colSkuReplaceImg, + this.col_spu_id, + this.col_skc_id, + this.colMainCate, + this.col_cat_name, + this.colCatBound, + this.col_ext_code, + this.colStyleCode, + this.colGroup, + this.colPriceText, + this.colExtCodePrice, + this.colEdit, + this.colAddTimes, + this.colSelectTotalCount, + this.colSaleCount, + this.col_notes, + this.colHeadWords, + this.colEndWords, + this.colFissionWords, + this.colGetType, + this.colSpProdType, + this.colWxSafe, + this.colAddTime, + this.colMdyTime, + this.col_edit, + this.col_delete, + this.col_select_product}); + this.dgvDbProduct.Dock = System.Windows.Forms.DockStyle.Fill; + this.dgvDbProduct.Location = new System.Drawing.Point(4, 0); + this.dgvDbProduct.MultiSelectCheckBox = true; + this.dgvDbProduct.Name = "dgvDbProduct"; + this.dgvDbProduct.ReadOnly = true; + this.dgvDbProduct.RowTemplate.Height = 23; + this.dgvDbProduct.Size = new System.Drawing.Size(1430, 579); + this.dgvDbProduct.TabIndex = 6; + this.dgvDbProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellContentClick); + this.dgvDbProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvDbProduct_Scroll); + // + // colSelect + // + this.colSelect.FillWeight = 26F; + this.colSelect.HeaderText = "选"; + this.colSelect.Name = "colSelect"; + this.colSelect.ReadOnly = true; + this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // col_db_id + // + this.col_db_id.FillWeight = 50F; + this.col_db_id.HeaderText = "数据库Id"; + this.col_db_id.Name = "col_db_id"; + this.col_db_id.ReadOnly = true; + this.col_db_id.Visible = false; + // + // colFromShopId + // + this.colFromShopId.HeaderText = "来源店铺Id"; + this.colFromShopId.Name = "colFromShopId"; + this.colFromShopId.ReadOnly = true; + this.colFromShopId.Visible = false; + // + // colFromShopName + // + this.colFromShopName.HeaderText = "来源店铺名称"; + this.colFromShopName.Name = "colFromShopName"; + this.colFromShopName.ReadOnly = true; + this.colFromShopName.Visible = false; + // + // col_product_name + // + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_product_name.DefaultCellStyle = dataGridViewCellStyle3; + this.col_product_name.FillWeight = 140F; + this.col_product_name.HeaderText = "标题"; + this.col_product_name.Name = "col_product_name"; + this.col_product_name.ReadOnly = true; + // + // colImgUrl + // + this.colImgUrl.HeaderText = "主图路径"; + this.colImgUrl.Name = "colImgUrl"; + this.colImgUrl.ReadOnly = true; + this.colImgUrl.Visible = false; + // + // colMainImg + // + this.colMainImg.FillWeight = 35F; + this.colMainImg.HeaderText = "主图"; + this.colMainImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colMainImg.Name = "colMainImg"; + this.colMainImg.ReadOnly = true; + this.colMainImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colMainImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + // + // colSkuReplaceImgUrl + // + this.colSkuReplaceImgUrl.HeaderText = "sku替换图路径"; + this.colSkuReplaceImgUrl.Name = "colSkuReplaceImgUrl"; + this.colSkuReplaceImgUrl.ReadOnly = true; + this.colSkuReplaceImgUrl.Visible = false; + // + // colSkuReplaceImg + // + this.colSkuReplaceImg.FillWeight = 70F; + this.colSkuReplaceImg.HeaderText = "sku替换图"; + this.colSkuReplaceImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; + this.colSkuReplaceImg.Name = "colSkuReplaceImg"; + this.colSkuReplaceImg.ReadOnly = true; + this.colSkuReplaceImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colSkuReplaceImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colSkuReplaceImg.Visible = false; + // + // col_spu_id + // + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_spu_id.DefaultCellStyle = dataGridViewCellStyle4; + this.col_spu_id.HeaderText = "商品Id"; + this.col_spu_id.Name = "col_spu_id"; + this.col_spu_id.ReadOnly = true; + this.col_spu_id.Visible = false; + // + // col_skc_id + // + this.col_skc_id.HeaderText = "SKC Id"; + this.col_skc_id.Name = "col_skc_id"; + this.col_skc_id.ReadOnly = true; + this.col_skc_id.Visible = false; + // + // colMainCate + // + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMainCate.DefaultCellStyle = dataGridViewCellStyle5; + this.colMainCate.FillWeight = 50F; + this.colMainCate.HeaderText = "主类目"; + this.colMainCate.Name = "colMainCate"; + this.colMainCate.ReadOnly = true; + // + // col_cat_name + // + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_cat_name.DefaultCellStyle = dataGridViewCellStyle6; + this.col_cat_name.FillWeight = 50F; + this.col_cat_name.HeaderText = "类目"; + this.col_cat_name.Name = "col_cat_name"; + this.col_cat_name.ReadOnly = true; + // + // colCatBound + // + this.colCatBound.FillWeight = 50F; + this.colCatBound.HeaderText = "类目保证金"; + this.colCatBound.Name = "colCatBound"; + this.colCatBound.ReadOnly = true; + // + // col_ext_code + // + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_ext_code.DefaultCellStyle = dataGridViewCellStyle7; + this.col_ext_code.HeaderText = "货号"; + this.col_ext_code.Name = "col_ext_code"; + this.col_ext_code.ReadOnly = true; + this.col_ext_code.Visible = false; + // + // colStyleCode + // + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colStyleCode.DefaultCellStyle = dataGridViewCellStyle8; + this.colStyleCode.HeaderText = "资料编码/真实上家"; + this.colStyleCode.Name = "colStyleCode"; + this.colStyleCode.ReadOnly = true; + this.colStyleCode.Visible = false; + // + // colGroup + // + dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGroup.DefaultCellStyle = dataGridViewCellStyle9; + this.colGroup.HeaderText = "分组"; + this.colGroup.Name = "colGroup"; + this.colGroup.ReadOnly = true; + this.colGroup.Visible = false; + // + // colPriceText + // + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPriceText.DefaultCellStyle = dataGridViewCellStyle10; + this.colPriceText.FillWeight = 65F; + this.colPriceText.HeaderText = "母店价格"; + this.colPriceText.Name = "colPriceText"; + this.colPriceText.ReadOnly = true; + // + // colExtCodePrice + // + this.colExtCodePrice.FillWeight = 60F; + this.colExtCodePrice.HeaderText = "货号价格"; + this.colExtCodePrice.Name = "colExtCodePrice"; + this.colExtCodePrice.ReadOnly = true; + this.colExtCodePrice.Visible = false; + // + // colEdit + // + this.colEdit.FillWeight = 40F; + this.colEdit.HeaderText = "编辑"; + this.colEdit.Name = "colEdit"; + this.colEdit.ReadOnly = true; + this.colEdit.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colEdit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.colEdit.Visible = false; + // + // colAddTimes + // + this.colAddTimes.FillWeight = 52F; + this.colAddTimes.HeaderText = "单店认领次数"; + this.colAddTimes.Name = "colAddTimes"; + this.colAddTimes.ReadOnly = true; + this.colAddTimes.Visible = false; + // + // colSelectTotalCount + // + this.colSelectTotalCount.FillWeight = 52F; + this.colSelectTotalCount.HeaderText = "认领总数"; + this.colSelectTotalCount.Name = "colSelectTotalCount"; + this.colSelectTotalCount.ReadOnly = true; + this.colSelectTotalCount.Visible = false; + // + // colSaleCount + // + this.colSaleCount.FillWeight = 60F; + this.colSaleCount.HeaderText = "销量"; + this.colSaleCount.Name = "colSaleCount"; + this.colSaleCount.ReadOnly = true; + this.colSaleCount.Visible = false; + // + // col_notes + // + dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.col_notes.DefaultCellStyle = dataGridViewCellStyle11; + this.col_notes.FillWeight = 70F; + this.col_notes.HeaderText = "备注"; + this.col_notes.Name = "col_notes"; + this.col_notes.ReadOnly = true; + this.col_notes.Visible = false; + // + // colHeadWords + // + dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colHeadWords.DefaultCellStyle = dataGridViewCellStyle12; + this.colHeadWords.HeaderText = "标题前缀"; + this.colHeadWords.Name = "colHeadWords"; + this.colHeadWords.ReadOnly = true; + this.colHeadWords.Visible = false; + // + // colEndWords + // + dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colEndWords.DefaultCellStyle = dataGridViewCellStyle13; + this.colEndWords.HeaderText = "标题后缀"; + this.colEndWords.Name = "colEndWords"; + this.colEndWords.ReadOnly = true; + this.colEndWords.Visible = false; + // + // colFissionWords + // + dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colFissionWords.DefaultCellStyle = dataGridViewCellStyle14; + this.colFissionWords.HeaderText = "裂变词"; + this.colFissionWords.Name = "colFissionWords"; + this.colFissionWords.ReadOnly = true; + this.colFissionWords.Visible = false; + // + // colGetType + // + dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGetType.DefaultCellStyle = dataGridViewCellStyle15; + this.colGetType.FillWeight = 70F; + this.colGetType.HeaderText = "采集来源"; + this.colGetType.Name = "colGetType"; + this.colGetType.ReadOnly = true; + this.colGetType.Visible = false; + // + // colSpProdType + // + this.colSpProdType.FillWeight = 70F; + this.colSpProdType.HeaderText = "商品类型"; + this.colSpProdType.Name = "colSpProdType"; + this.colSpProdType.ReadOnly = true; + this.colSpProdType.Visible = false; + // + // colWxSafe + // + this.colWxSafe.FillWeight = 70F; + this.colWxSafe.HeaderText = "微信安检"; + this.colWxSafe.Name = "colWxSafe"; + this.colWxSafe.ReadOnly = true; + // + // colAddTime + // + dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16; + this.colAddTime.FillWeight = 70F; + this.colAddTime.HeaderText = "入库时间"; + this.colAddTime.Name = "colAddTime"; + this.colAddTime.ReadOnly = true; + // + // colMdyTime + // + dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMdyTime.DefaultCellStyle = dataGridViewCellStyle17; + this.colMdyTime.FillWeight = 70F; + this.colMdyTime.HeaderText = "更新时间"; + this.colMdyTime.Name = "colMdyTime"; + this.colMdyTime.ReadOnly = true; + // + // col_edit + // + this.col_edit.FillWeight = 42F; + this.col_edit.HeaderText = "详情"; + this.col_edit.Name = "col_edit"; + this.col_edit.ReadOnly = true; + this.col_edit.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.col_edit.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.col_edit.Visible = false; + // + // col_delete + // + this.col_delete.FillWeight = 42F; + this.col_delete.HeaderText = "删除"; + this.col_delete.Name = "col_delete"; + this.col_delete.ReadOnly = true; + this.col_delete.Visible = false; + // + // col_select_product + // + this.col_select_product.FillWeight = 42F; + this.col_select_product.HeaderText = "认领"; + this.col_select_product.Name = "col_select_product"; + this.col_select_product.ReadOnly = true; + this.col_select_product.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; + this.col_select_product.Visible = false; + // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.Location = new System.Drawing.Point(985, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.PageSize = 100; + this.ucSplitPage1.Size = new System.Drawing.Size(453, 25); + this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalPage = 1; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1438, 25); + this.statusBar.TabIndex = 5; + // + // WXUserCollectAuthProdListForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.ClientSize = new System.Drawing.Size(1440, 720); + this.Controls.Add(this.splitContainer1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.KeyPreview = true; + this.Name = "WXUserCollectAuthProdListForm"; + this.Text = "采集数据库"; + this.TitleText = "采集数据库"; + this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.WXUserProdListForm_FormClosing); + this.Load += new System.EventHandler(this.ProductListForm_Load); + this.VisibleChanged += new System.EventHandler(this.ProductListForm_VisibleChanged); + this.KeyDown += new System.Windows.Forms.KeyEventHandler(this.PDDDBProdListForm_KeyDown); + this.KeyUp += new System.Windows.Forms.KeyEventHandler(this.PDDDBProdListForm_KeyUp); + this.Controls.SetChildIndex(this.splitContainer1, 0); + this.splitContainer1.Panel1.ResumeLayout(false); + this.splitContainer1.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit(); + this.splitContainer1.ResumeLayout(false); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.splitContainer2.Panel1.ResumeLayout(false); + this.splitContainer2.Panel1.PerformLayout(); + this.splitContainer2.Panel2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); + this.splitContainer2.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.SplitContainer splitContainer1; + private System.Windows.Forms.SplitContainer splitContainer2; + private UserControls.UcSplitPage ucSplitPage1; + private UserControls.StatusBarUserControl statusBar; + private System.Windows.Forms.TextBox txtSPU; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.TextBox txtSKC; + private DevComponents.DotNetBar.PanelEx pnlEmpty; + private System.Windows.Forms.TextBox txtExtCode; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.TextBox txtProdName; + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private UserComponent.DataGridViewEx dgvDbProduct; + private System.Windows.Forms.PictureBox pbLoading; + private System.Windows.Forms.TextBox txtNotes; + private System.Windows.Forms.Label lblNotes; + private System.Windows.Forms.ComboBox cmbSort; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label lblGroup; + private DevComponents.DotNetBar.PanelEx btnSearch; + private DevComponents.DotNetBar.PanelEx btnDel; + private System.Windows.Forms.ComboBox cmbGroupFilter; + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label lblSourceType; + private System.Windows.Forms.Label lblWxSafe; + private System.Windows.Forms.ComboBox cmbWxSafe; + private System.Windows.Forms.ComboBox cmbWxCat; + private System.Windows.Forms.Label label12; + private System.Windows.Forms.ComboBox cmbExportToOutServer; + private System.Windows.Forms.Label label13; + private UserComponent.UcComboBoxMutiSelect cmbCat2; + private System.Windows.Forms.Label label14; + private UserComponent.UcComboBoxMutiSelect cmbCat1; + private DevComponents.DotNetBar.PanelEx btnStopStop; + private System.Windows.Forms.TextBox txtSecretStyleCode; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.TextBox txtRealCoid; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label17; + private UserComponent.UcComboBoxMutiSelect cmbCat3; + private UserComponent.UcCheckBox chkWXComplateProd; + private UserComponent.UcCheckBox chkCatBoundMoreThan; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn col_product_name; + private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl; + private System.Windows.Forms.DataGridViewImageColumn colMainImg; + private System.Windows.Forms.DataGridViewTextBoxColumn colSkuReplaceImgUrl; + private System.Windows.Forms.DataGridViewImageColumn colSkuReplaceImg; + private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id; + private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colMainCate; + private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name; + private System.Windows.Forms.DataGridViewTextBoxColumn colCatBound; + private System.Windows.Forms.DataGridViewTextBoxColumn col_ext_code; + private System.Windows.Forms.DataGridViewTextBoxColumn colStyleCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewTextBoxColumn colPriceText; + private System.Windows.Forms.DataGridViewTextBoxColumn colExtCodePrice; + private System.Windows.Forms.DataGridViewLinkColumn colEdit; + private System.Windows.Forms.DataGridViewTextBoxColumn colAddTimes; + private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount; + private System.Windows.Forms.DataGridViewTextBoxColumn colSaleCount; + private System.Windows.Forms.DataGridViewTextBoxColumn col_notes; + private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords; + 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; + private System.Windows.Forms.DataGridViewLinkColumn col_edit; + private System.Windows.Forms.DataGridViewLinkColumn col_delete; + private System.Windows.Forms.DataGridViewLinkColumn col_select_product; + private System.Windows.Forms.TextBox txtCatBoundLessThan; + private System.Windows.Forms.TextBox txtCatBoundMoreThan; + private UserComponent.UcCheckBox chkCatBoundLessThan; + public System.Windows.Forms.ComboBox cmbSourceType; + public System.Windows.Forms.ComboBox cmbRelation; + public System.Windows.Forms.Label lblRelation; + } +} \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs new file mode 100644 index 0000000..d955643 --- /dev/null +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -0,0 +1,903 @@ +using AllBase; +using AllBase.Helper; +using AllBase.Model.Param; +using AllBase.Model.Result; +using AllBase.Model.Result.PDDResult; +using AllBase.Model.Result.WXResult; +using NaiBa.Util; +using NaiBa.Util.Extension; +using Newtonsoft.Json.Linq; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Diagnostics; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Net; +using System.Text; +using System.Text.RegularExpressions; +using System.Threading; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.BaseForms; +using TemuKJD.BLL; +using TemuKJD.Extension; +using TemuKJD.PDDForms.ProductSelectForms; +using TemuKJD.ToolForms; +using Work; + +namespace TemuKJD.WXForms.ProductForms +{ + public partial class WXUserCollectAuthProdListForm : BaseGeneralForm + { + ShopLoginInfo shop = null; + public CancellationTokenSource cancellationTokenSource { get; set; } = new CancellationTokenSource(); + + ConcurrentList lstTemuDbProduct = new ConcurrentList(); + public ConcurrentList lstTemuDBProductSelect { get; set; } = new ConcurrentList(); + + public WXUserCollectAuthProdListForm() + { + InitializeComponent(); + } + + public WXUserCollectAuthProdListForm(ShopLoginInfo _shop) + { + InitializeComponent(); + shop = _shop; + } + + private void ProductListForm_Load(object sender, EventArgs e) + { + chkCatBoundLessThan.Visible = false; + chkCatBoundMoreThan.Visible = false; + tableLayoutPanel1.SetColumn(lblSourceType, 2); + tableLayoutPanel1.SetColumn(cmbSourceType, 3); + + if (BaseClass.MainPath == "binxixi") + { + chkCatBoundLessThan.Visible = false; + chkCatBoundMoreThan.Visible = false; + lblWxSafe.Visible = false; + cmbWxSafe.Visible = false; + tableLayoutPanel1.SetColumn(lblSourceType, 0); + tableLayoutPanel1.SetColumn(cmbSourceType, 1); + dgvDbProduct.Columns["colCatBound"].Visible = false; + dgvDbProduct.Columns["colWxSafe"].Visible = false; + dgvDbProduct.Columns["colMainImg"].FillWeight = 25; + } + + Task.Run(() => + { + PDDDBProdListForm.GetPDDProductGroup(new List { cmbGroupFilter, }, "", "", BaseClass.UserName); + GetPddProductCate(); + }); + if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态 + { + this.dgvDbProduct.Columns["colPriceText"].Visible = true; + } + else + { + this.dgvDbProduct.Columns["colPriceText"].Visible = true; + lblGroup.Visible = false; + } + if (BaseClass.MainPath != "binxixi") + { + this.dgvDbProduct.Columns["colExtCodePrice"].Visible = false; + this.dgvDbProduct.Columns["colEdit"].Visible = false; + } + + btnDel.Visible = true; + this.dgvDbProduct.Columns["col_select_product"].Visible = false; + this.dgvDbProduct.Columns["colAddTimes"].Visible = false; + + this.ucSplitPage1.PageChange += UcSplitPage1_PageChange; + this.dgvDbProduct.AddSelectorColumn("colSelect"); + + this.dgvDbProduct.AddImgColumn("colSkuReplaceImg", "colSkuReplaceImgUrl"); + + + this.dgvDbProduct.AddMergeColumnHeader(new List() { "colExtCodePrice", "colEdit" }, "货号价格"); + this.dgvDbProduct.AddMergeColumn(new List() { "colExtCodePrice", "colEdit" }); + + //this.dtpStart.Value = new DateTime(2026, 3, 12, 0, 0, 0); + //this.dtpEnd.Value = new DateTime(2026, 3, 13, 13, 0, 0); + ucSplitPage1.lblTotal.Visible = false; + ucSplitPage1.cmbPageSize.Items.Clear(); + ucSplitPage1.cmbPageSize.Items.Add(50); + ucSplitPage1.cmbPageSize.Items.Add(100); + ucSplitPage1.cmbPageSize.Items.Add(200); + ucSplitPage1.cmbPageSize.Items.Add(500); + ucSplitPage1.cmbPageSize.Items.Add(1000); + ucSplitPage1.cmbPageSize.DropDownStyle = ComboBoxStyle.DropDownList; + ucSplitPage1.cmbPageSize.SelectedIndex = 0; + + if (BaseClass.SaLevel > 0 || BaseClass.UserAuthority.ParseToString().Contains("货源选择")) + { + lblSourceType.Visible = true; + cmbSourceType.Visible = true; + lblGroup.Visible = true; + cmbGroupFilter.Visible = true; + tableLayoutPanel1.ColumnStyles[9].SizeType = SizeType.Percent; + tableLayoutPanel1.ColumnStyles[9].Width = 20; + } + else + { + tableLayoutPanel1.ColumnStyles[9].SizeType = SizeType.AutoSize; + } + } + + private void btnSearch_Click(object sender, EventArgs e) + { + if (this.ucSplitPage1.CurrentPage != 1) + this.ucSplitPage1.CurrentPage = 1; + else + SearchDbProd(1); + } + + public void SearchDbProd(int page) + { + if (InvokeRequired) + { + Invoke(new Action(() => + { + this.pbLoading.Visible = true; + this.dgvDbProduct.Rows.Clear(); + lstTemuDbProduct.Clear(); + })); + } + else + { + this.pbLoading.Visible = true; + this.dgvDbProduct.Rows.Clear(); + lstTemuDbProduct.Clear(); + } + Task.Run(() => + { + int pageCount; + int pageSize = 100; + decimal seconds; + Invoke(new Action(() => { pageSize = this.ucSplitPage1.PageSize; })); + var list = GetProductList(out pageCount, out seconds, page, pageSize); + lstTemuDbProduct.AddRange(list); + this.ucSplitPage1.TotalPage = pageCount; + + if (defaultBitmap == null) + defaultBitmap = new Bitmap(80, 80); + // 获取Bitmap的Graphics对象 + using (Graphics g = Graphics.FromImage(defaultBitmap)) + { + // 清除整个Bitmap为白色 + g.Clear(Color.White); + } + foreach (var prod in lstTemuDbProduct) + { + string catName = prod.cat_name ?? prod.cat_id; + if (prod.wx_cat_leaf != null) + { + var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == prod.wx_cat_leaf.ParseToString())?.name; + if (!string.IsNullOrEmpty(catN)) + { + catName = catN; + } + } + if (prod.wx_cat_3 != null) + { + var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == prod.wx_cat_3.ParseToString())?.name; + if (!string.IsNullOrEmpty(catN)) + { + catName = catN + " >> " + catName; + } + } + if (prod.wx_cat_2 != null) + { + var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == prod.wx_cat_2.ParseToString())?.name; + if (!string.IsNullOrEmpty(catN)) + { + catName = catN + " >> " + catName; + } + } + if (prod.wx_cat_1 != null) + { + var catN = GlobalConfig.WxCatList.FirstOrDefault(c => c.cat_id == prod.wx_cat_1.ParseToString())?.name; + if (!string.IsNullOrEmpty(catN)) + { + catName = catN + " >> " + catName; + } + } + Invoke(new Action(() => + { + // 显示的价格需要加价10%最低1元 + decimal price1 = (prod.price_text.Split('-').FirstOrDefault().Trim()).ParseToDecimal() * 100; + decimal price2 = (prod.price_text.Split('-').LastOrDefault().Trim()).ParseToDecimal() * 100; + price1 += Math.Max(100, price1 * 0.1m).ParseToInt(); + price2 += Math.Max(100, price2 * 0.1m).ParseToInt(); + price1 = price1 * 0.01m; + price2 = price2 * 0.01m; + + int rowIndex = this.dgvDbProduct.Rows.Add( + false, + prod.id, + prod.from_shop_id, + prod.from_shop_name, + prod.product_name, + prod?.main_img?.Replace("https", "http") + "?imageView2/2/w/90/h/90", + defaultBitmap, // prod.main_img, + prod.sku_img_replace_url, + DataGridViewExtension.defaultBitmap, + (prod.spu_id).Trim(), + prod.skc_id, + prod.main_cat_name ?? prod.main_cat_id, + catName.Split('>').LastOrDefault()?.Trim(), + GlobalConfig.WxCatBoundList.FirstOrDefault(cb => cb.leaf_id == prod.wx_cat_leaf)?.cat_bound, + prod.ext_code, + (prod.secret_spu_id + " " + prod.real_spu_id + " " + prod.real_coid).Trim(), + prod.group, + price1.ToString("f2") + " - " + price2.ToString("f2"), //prod.price_text.Replace("-", " - "), // 母店价格 + prod.ext_code_price * 0.01m, // 货号价格 + "编辑", + prod.select_count, + prod.select_total_count, + prod.sale_count_text, // 销售数量 + prod.notes, + prod.head_words, + prod.end_words, + prod.fission_words, + prod.product_get_type_text == "厂商直采" ? (prod.product_get_type_text + " " + prod.skc_id).Trim() : 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"), + "编辑", + "删除", + "认领"); + + dgvDbProduct.Rows[rowIndex].Height = dgvDbProduct.Columns["colMainImg"].Width; + })); + } + + Invoke(new Action(() => + { + ShowDgvImg(); + this.pbLoading.Visible = false; + this.statusBar.lblTaskStatus.Text = "商品查询完毕"; +#if DEBUG + this.statusBar.lblTaskStatus.Text += "，耗时：" + seconds; +#endif + })); + }); + } + + Bitmap defaultBitmap = null; + void ShowDgvImg() + { + Task.Run(() => + { + foreach (DataGridViewRow row in this.dgvDbProduct.Rows) + { + if (row.Index > 0 && row.Cells["colMainImg"].Displayed == false) + { + Invoke(new Action(() => + { + try + { + row.Cells["colMainImg"].Value = defaultBitmap; + } + catch + { + } + })); + continue; + } + + if (row.Cells["colMainImg"].Value != null && row.Cells["colMainImg"].Value != defaultBitmap) + continue; + + Image image = null; + string imgUrl = row.Cells["colImgUrl"]?.Value.ParseToString(); + string getImgError = ""; + if (!string.IsNullOrWhiteSpace(imgUrl)) + image = GetHtml.GetUrlImg(imgUrl, out getImgError); + if (!string.IsNullOrEmpty(getImgError)) + //BaseMsgForm.ShowError("图片加载失败 " + getImgError); + image = TemuKJD.Properties.Resources.errpic; + + Invoke(new Action(() => + { + try + { + row.Cells["colMainImg"].Value = image; + } + catch + { + } + })); + } + }); + } + + public List GetProductList(out int pageCount, out decimal seconds, int page = 1, int pageSize = 200) + { + List list = new List(); + pageCount = 1; + seconds = 0; + + var url = BaseClass.BuildPDDObjString("product/get_product_list"); + if (shop != null && shop.DbId.ParseToInt() != 0) + url = BaseClass.BuildPDDObjString("product/get_product_list"); + var data = ""; + + Invoke(new Action(() => + { + data = UserLogin.GetSignaturex() + + "&page=" + page + + "&page_size=" + pageSize + + "&search_spu=" + txtSPU.Text.Trim() + + "&search_skc=" + txtSKC.Text.Trim() + + "&search_notes=" + txtNotes.Text.Trim() + + "&search_ext_code=" + txtExtCode.Text.Trim() + + "&search_group=" + cmbGroupFilter.Text.Trim() + + "&search_prod_name=" + txtProdName.Text.Trim() + + "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验").Replace("违规商品", ""); + data += "&add_user_name=" + BaseClass.UserName; + if (BaseClass.MainPath == "weixin") + data += "&ban_wx=0"; + if (BaseClass.MainPath == "binxixi") + data += "&ban_pdd=0"; + if (cmbRelation.Text == "否") + data += "&is_relation=0"; + else if (cmbRelation.Text == "是") + data += "&is_relation=1"; + + //if (chkEditTime.Checked) + //{ + // data += "&start_time=" + dtpStart.Value.ToString("yyyy-MM-dd HH:mm:ss"); + // data += "&end_time=" + dtpEnd.Value.ToString("yyyy-MM-dd HH:mm:ss"); + //} + + if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + { + data += "&search_cat1=" + (cmbCat1.Text.Trim() == "全部" ? "" : cmbCat1.Text.Trim()); + data += "&search_cat=" + (cmbCat2.Text.Trim() == "全部" ? "" : cmbCat2.Text.Trim()); + } + else + { + var selectCate1 = GlobalConfig.WxCatList.Where(c => c.level == 1 && (/*cmbCat1.Text.Trim() == cmbCat1.DefaultText ||*/ (";" + cmbCat1.Text.Trim() + ";").Contains(";" + c.name + ";"))).ToList(); + var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList(); + var selectCate2 = cates2.Where(c => c.level == 2 && (/*cmbCat2.Text.Trim() == cmbCat2.DefaultText ||*/ (";" + cmbCat2.Text.Trim() + ";").Contains(";" + c.name + ";"))).ToList(); + var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList(); + var selectCate3 = cates3.Where(c => c.level == 3 && (/*cmbCat3.Text.Trim() == cmbCat3.DefaultText ||*/ (";" + cmbCat3.Text.Trim() + ";").Contains(";" + c.name + ";"))).ToList(); + + if (!string.IsNullOrEmpty(cmbCat1.Text) && selectCate1?.Count > 0) + data += "&wx_cat_1=" + string.Join(",", selectCate1.Select(c => c.cat_id).ToList()); + //else if (chkSkipQualification.Checked) + //{ + // // 厂商直采普通店铺不要随特殊商品 + // data += "&wx_cat_1=" + string.Join(",", GlobalConfig.WxCatList.Where(c => c.level == 1 && !(c.name == "图书" || c.name == "食品饮料" || c.name == "成人用品")) + // .Select(c => c.cat_id)); + //} + if (!string.IsNullOrEmpty(cmbCat2.Text) && selectCate2?.Count > 0) + data += "&wx_cat_2=" + string.Join(",", selectCate2.Select(c => c.cat_id).ToList()); + if (!string.IsNullOrEmpty(cmbCat3.Text) && selectCate3?.Count > 0) + data += "&wx_cat_3=" + string.Join(",", selectCate3.Select(c => c.cat_id).ToList()); + + if (chkCatBoundMoreThan.Checked || chkCatBoundLessThan.Checked) + { + var catBoundLst = GlobalConfig.WxCatBoundList.ToList(); + if (chkCatBoundMoreThan.Checked) + { + catBoundLst = catBoundLst.Where(cb => cb.cat_bound >= txtCatBoundMoreThan.Text.Trim().ParseToInt()).ToList(); + } + if (chkCatBoundLessThan.Checked) + { + catBoundLst = catBoundLst.Where(cb => cb.cat_bound <= txtCatBoundLessThan.Text.Trim().ParseToInt()).ToList(); + } + data += "&wx_cat_leaf=" + string.Join(",", catBoundLst.Select(c => c.leaf_id).ToList()); + } + + } + + if (!string.IsNullOrEmpty(txtSecretStyleCode.Text.Trim())) + { + data += "&search_secret_spu_ids=" + string.Join(",", txtSecretStyleCode.Text.Trim().Split(new string[] { " ", ",", "，" }, StringSplitOptions.RemoveEmptyEntries)); + } + if (!string.IsNullOrEmpty(cmbWxCat.Text)) + { + data += "&has_wx_cat=" + (cmbWxCat.Text.Trim() == "是").ParseToString().ToLower(); + } + if (!string.IsNullOrEmpty(cmbExportToOutServer.Text)) + { + //data += "&has_send_to_out_server=" + (cmbExportToOutServer.Text.Trim() == "是").ParseToString().ToLower(); + if (cmbExportToOutServer.Text.Trim() == "是") + data += "&send_to_out_server=1"; + else if (cmbExportToOutServer.Text.Trim() == "否") + data += "&send_to_out_server=0"; + else if (cmbExportToOutServer.Text.Trim() == "导出未拉回") + data += "&send_to_out_server=2"; + } + + if (cmbSourceType.Text.Trim() != "全部") + { + data += "&product_get_type=" + cmbSourceType.Text.Trim(); + } + if (shop != null && !string.IsNullOrEmpty(shop.ShopId)) + { + data += "&get_select_count=true"; + data += "&select_shop_id=" + shop.ShopId; + } + if (this.cmbSort.Text == "认领总数") + { + data += "&sort_field=select_total_count"; + } + if (!this.txtRealCoid.Text.Trim().IsNullOrEmpty()) + { + data += "&real_coid=" + this.txtRealCoid.Text.Trim(); + } + if (chkWXComplateProd.Checked) + data += "&has_wx_format=1"; + })); + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + Invoke(new Action(() => + { + BaseMsgForm.ShowError("获取商品列表失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + })); + 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); + + var jArr = JObject.Parse(html)["data"]; + if (jArr.Count() == 0) + return list; + var sProd = JsonHelper.SerializeObject(jArr); + + try + { + list = JsonHelper.DeserializeJsonToList(sProd); + return list; + } + catch (Exception ex) + { + return new List(); + } + } + + bool first = true; + private void ProductListForm_VisibleChanged(object sender, EventArgs e) + { + if (this.Visible == true && first) + { + first = false; + + this.pbLoading.Visible = true; + SearchDbProd(this.ucSplitPage1.CurrentPage); + } + } + + private void UcSplitPage1_PageChange(object obj) + { + SearchDbProd(this.ucSplitPage1.CurrentPage); + } + + private void pnlEmpty_Click(object sender, EventArgs e) + { + this.cmbCat1.Text = "全部"; + this.cmbCat2.Text = "全部"; + this.cmbCat3.Text = "全部"; + this.txtExtCode.Text = ""; + this.txtProdName.Text = ""; + this.txtSKC.Text = ""; + this.txtSPU.Text = ""; + this.txtNotes.Text = ""; + this.cmbGroupFilter.Text = ""; + this.cmbSort.Text = "入库时间"; + this.cmbSourceType.Text = "厂商直采"; + this.cmbWxSafe.Text = "安全+未校验"; + this.cmbWxCat.Text = ""; + this.cmbExportToOutServer.Text = ""; + this.txtSecretStyleCode.Text = ""; + } + + private void cmbCat1_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void cmbCat2_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void cmbCat3_SelectedIndexChanged(object sender, EventArgs e) + { + + } + + private void cmbCat1_MultiSelectChanged(object sender, EventArgs e) + { + if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + return; + + cmbCat2.Text = ""; + cmbCat2.Items.Clear(); + cmbCat3.Text = ""; + cmbCat3.Items.Clear(); + var selectCate1 = GlobalConfig.WxCatList.Where(c => c.level == 1 && (cmbCat1.Text.Trim() == cmbCat1.DefaultText || (";" + cmbCat1.Text.Trim() + ";").Contains(";" + c.name + ";"))).ToList(); + var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList(); + //foreach (var cate2 in cates2) + //{ + // cmbCat2.Items.Add(cate2.name); + //} + cmbCat2.Items.AddRange(cates2.Select(c => c.name).ToArray()); + } + + private void cmbCat2_MultiSelectChanged(object sender, EventArgs e) + { + if (cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + return; + + cmbCat3.Text = ""; + cmbCat3.Items.Clear(); + var selectCate1 = GlobalConfig.WxCatList.Where(c => c.level == 1 && (cmbCat1.Text.Trim() == cmbCat1.DefaultText || (";" + cmbCat1.Text.Trim() + ";").Contains(";" + c.name + ";"))).ToList(); + var cates2 = GlobalConfig.WxCatList.Where(c => selectCate1.Any(c1 => c.f_cat_id == c1.cat_id)).ToList(); + var selectCate2 = cates2.Where(c => c.level == 2 && (cmbCat2.Text.Trim() == cmbCat1.DefaultText || (";" + cmbCat2.Text.Trim() + ";").Contains(c.name))).ToList(); + var cates3 = GlobalConfig.WxCatList.Where(c => selectCate2.Any(c2 => c.f_cat_id == c2.cat_id)).ToList(); + //foreach (var cate3 in cates3) + //{ + // cmbCat3.Items.Add(cate3.name); + //} + cmbCat3.Items.AddRange(cates3.Select(c => c.name).ToArray()); + } + + private void cmbCat3_MultiSelectChanged(object sender, EventArgs e) + { + //var cate1 = GlobalConfig.WxCatList.FirstOrDefault(c => c.level == 1 && c.name == cmbCat1.Text.Trim()); + //var cates2 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate1?.cat_id).ToList(); + //var cate2 = cates2.FirstOrDefault(c => c.level == 2 && c.name == cmbCat1.Text.Trim()); + //var cates3 = GlobalConfig.WxCatList.Where(c => c.f_cat_id == cate2?.cat_id).ToList(); + //var cate3 = cates3.FirstOrDefault(c => c.level == 3 && c.name == cmbCat1.Text.Trim()); + } + + private void dgvDbProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) + { + if (e.ColumnIndex < 0 || e.RowIndex < 0) + return; + string headerText = dgvDbProduct.Columns[e.ColumnIndex].HeaderText; + var dbId = dgvDbProduct.Rows[e.RowIndex].Cells["col_db_id"].Value.ParseToString(); + var dbProduct = lstTemuDbProduct.FirstOrDefault(p => p.id.ToString() == dbId); + + switch (headerText) + { + case "删除": + if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) + return; + DeleteProduct(dbId); + break; + case "详情": + case "编辑/详情": + //PDDDBProdEditForm editForm = new PDDDBProdEditForm(dbProduct); + //if (BaseClass.MainPath != "binxixi") + //{ + // editForm.pnlSkuOption.Visible = false; + // editForm.txtProductName.ReadOnly = true; + // editForm.txtExtCode.ReadOnly = true; + // editForm.lblSkcId.Text = "仓库编码"; + //} + //editForm.ShowDialog(); + //dgvDbProduct.Rows[e.RowIndex].Cells["col_notes"].Value = dbProduct.notes; + //dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value = dbProduct.ext_code; + //dgvDbProduct.Rows[e.RowIndex].Cells["colHeadWords"].Value = dbProduct.head_words; + //dgvDbProduct.Rows[e.RowIndex].Cells["colEndWords"].Value = dbProduct.end_words; + //dgvDbProduct.Rows[e.RowIndex].Cells["colFissionWords"].Value = dbProduct.fission_words; + //dgvDbProduct.Rows[e.RowIndex].Cells["col_product_name"].Value = dbProduct.product_name; + //dgvDbProduct.Rows[e.RowIndex].Cells["colSkuReplaceImgUrl"].Value = dbProduct.sku_img_replace_url; + break; + case "主图": + ShowImgForm imgFrom = new ShowImgForm(dgvDbProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", "")); + imgFrom.ShowDialog(); + break; + case "认领": + //Task.Run(() => { SelectProduct(new KJDDBProduct[] { dbProduct }); }); + break; + case "资料编码/真实上家": + try + { + string url = ""; + if (string.IsNullOrEmpty(dbProduct.real_spu_id) || string.IsNullOrEmpty(dbProduct.real_coid)) + url = "https://sc.scm121.com/manage/goods/qualitySupplier/goodsDetail/" + dbProduct.spu_id + "?itemCoId=" + dbProduct.skc_id + "&noBack=true"; + else + url = "https://sc.scm121.com/manage/goods/qualitySupplier/goodsDetail/" + dbProduct.real_spu_id + "?itemCoId=" + dbProduct.real_coid + "&noBack=true"; + Process.Start(new ProcessStartInfo(url) + { + UseShellExecute = true + }); + } + catch + { + // 可能需要手动指定浏览器路径 + Process.Start(new ProcessStartInfo("https://www.baidu.com") { UseShellExecute = true }); + } + break; + case "": + dgvDbProduct.Rows[e.RowIndex].Cells["colSelect"].Value = !(bool)dgvDbProduct.Rows[e.RowIndex].Cells["colSelect"].Value; + //rowIndex1 = rowIndex2; + //rowIndex2 = e.RowIndex; + //if (IsShiftDown) + //{ + // if (rowIndex1 > -1 && rowIndex2 > -1) + // { + // try + // { + // if (rowIndex1 > rowIndex2) + // { + // for (int i = rowIndex2; i <= rowIndex1; i++) + // { + // dgvDbProduct.Rows[i].Cells["colSelect"].Value = dgvDbProduct.Rows[rowIndex1].Cells["colSelect"].Value; + // } + // } + // else + // { + // for (int i = rowIndex1; i <= rowIndex2; i++) + // { + // dgvDbProduct.Rows[i].Cells["colSelect"].Value = dgvDbProduct.Rows[rowIndex1].Cells["colSelect"].Value; + // } + // } + // } + // catch + // { + // } + // //rowIndex1 = -1; + // //rowIndex2 = -1; + // } + //} + break; + default: + break; + } + } + + private void DeleteProduct(string dbId, bool isUpdate = true) + { + var url = BaseClass.BuildPDDObjString("product/del_db_product"); + var data = UserLogin.GetSignaturex() + + "&db_id=" + dbId; + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + BaseMsgForm.ShowError("删除商品失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + return; + } + else + { + if (isUpdate) + SearchDbProd(this.ucSplitPage1.CurrentPage); + } + } + + private void btnDel_Click(object sender, EventArgs e) + { + var lstProdId = dgvDbProduct.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList(); + var prodList = this.lstTemuDbProduct.Where(p => lstProdId.Contains(p.spu_id)).ToArray(); + + if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) + return; + this.pbLoading.Visible = true; + this.statusBar.pgbTaskProgress.Maximum = lstProdId.Count; + this.statusBar.UpdateProgressBar(0); + Task.Run(() => + { + foreach (var prod in prodList) + { + DeleteProduct(prod.id.ToString(), false); + + Invoke(new Action(() => + { + this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); + this.statusBar.lblTaskStatus.Text = "正在删除 " + this.statusBar.pgbTaskProgress.Value + "/" + lstProdId.Count; + })); + } + SearchDbProd(this.ucSplitPage1.CurrentPage); + Invoke(new Action(() => + { + pbLoading.Visible = false; + BaseMsgForm.ShowInfo("删除完成！"); + })); + }); + } + + void SelectProduct(KJDDBProduct[] prodList) + { + } + + private void dgvDbProduct_Scroll(object sender, ScrollEventArgs e) + { + ShowDgvImg(); + } + + private void btnDelSelect_Click(object sender, EventArgs e) + { + var lstProdId = dgvDbProduct.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["col_spu_id"]?.Value.ToString()).ToList(); + var prodList = this.lstTemuDbProduct.Where(p => lstProdId.Contains(p.spu_id)).ToArray(); + + if (BaseMsgForm.ShowConfirm("确定删除商品吗？删除后不可恢复！").DialogResult == DialogResult.Cancel) + return; + this.pbLoading.Visible = true; + this.statusBar.pgbTaskProgress.Maximum = lstProdId.Count; + this.statusBar.UpdateProgressBar(0); + Task.Run(() => + { + foreach (var prod in prodList) + { + DeleteProduct(prod.id.ToString(), false); + + Invoke(new Action(() => + { + this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); + this.statusBar.lblTaskStatus.Text = "正在删除 " + this.statusBar.pgbTaskProgress.Value + "/" + lstProdId.Count; + })); + } + SearchDbProd(this.ucSplitPage1.CurrentPage); + Invoke(new Action(() => + { + pbLoading.Visible = false; + BaseMsgForm.ShowInfo("删除完成！"); + })); + }); + } + + private void btnStopStop_Click(object sender, EventArgs e) + { + if (cancellationTokenSource != null) + cancellationTokenSource.Cancel(); + Task.Run(() => + { + Thread.Sleep(3000); + Invoke(new Action(() => + { + if (cancellationTokenSource == null || cancellationTokenSource.IsCancellationRequested) + pbLoading.Visible = false; + })); + }); + } + + private void PDDDBProdListForm_KeyDown(object sender, KeyEventArgs e) + { + //switch (e.KeyCode) + //{ + // case Keys.Shift: + // case Keys.ShiftKey: + // case Keys.LShiftKey: + // case Keys.RShiftKey: + // IsShiftDown = true; + // break; + //} + } + + private void PDDDBProdListForm_KeyUp(object sender, KeyEventArgs e) + { + } + + private void cmbSourceType_SelectedIndexChanged(object sender, EventArgs e) + { + fillCate(); + + if (!string.IsNullOrWhiteSpace(cmbSourceType.Text) && cmbSourceType.Text != "厂商直采") + { + cmbExportToOutServer.Text = ""; + cmbWxCat.Text = ""; + } + else + { + cmbExportToOutServer.Text = "是"; + cmbWxCat.Text = "是"; + } + + } + + /// + /// 获取商品所有类目 + /// + void GetPddProductCate() + { + var url = BaseClass.BuildObjString("product/get_pdd_product_cates"); + var data = UserLogin.GetSignaturex(); + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + BaseMsgForm.ShowError("商品类目获取失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + } + else + { + pdd_product_cates = BaseRegex.GetStringJson(ref html, "data"); + } + + Invoke(new Action(() => + { + fillCate(); + })); + } + + public void fillCate() + { + if (!string.IsNullOrWhiteSpace(cmbSourceType.Text) && + cmbSourceType.Text != "厂商直采" && cmbSourceType.Text != "1688厂家" && cmbSourceType.Text != "微信店采" && cmbSourceType.Text != "微信小店") + { + fillPddCate(); + } + else + { + fillWxCate(); + } + } + + public string pdd_product_cates = ""; + void fillPddCate() + { + cmbCat1.Items.Clear(); + cmbCat2.Items.Clear(); + cmbCat3.Items.Clear(); + cmbCat1.Text = "全部"; + cmbCat2.Text = "全部"; + cmbCat3.Text = "全部"; + foreach (var item in pdd_product_cates.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) + { + cmbCat1.Items.Add(item); + } + cmbCat1.Items.Add(""); + } + + void fillWxCate() + { + cmbCat1.Items.Clear(); + cmbCat2.Items.Clear(); + cmbCat3.Items.Clear(); + cmbCat1.Text = "全部"; + cmbCat2.Text = "全部"; + cmbCat3.Text = "全部"; + foreach (var cate in GlobalConfig.WxCatList.Where(c => c.level == 1).ToList()) + { + cmbCat1.Items.Add(cate.name); + } + } + + private void chkCatBoundMoreThan_CheckedChanged(object sender, EventArgs e) + { + txtCatBoundMoreThan.Visible = chkCatBoundMoreThan.Checked; + } + + private void chkCatBoundLessThan_CheckedChanged(object sender, EventArgs e) + { + txtCatBoundLessThan.Visible = chkCatBoundLessThan.Checked; + } + + private void WXUserProdListForm_FormClosing(object sender, FormClosingEventArgs e) + { + this.Hide(); + e.Cancel = true; + } + + private void chkNotRelation_CheckedChanged(object sender, EventArgs e) + { + + } + } +} diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx new file mode 100644 index 0000000..0aa8297 --- /dev/null +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.resx @@ -0,0 +1,403 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + AAABAAEAgIAQAAAAAABoKAAAFgAAACgAAACAAAAAAAEAAAEABAAAAAAAACgAAAAAAAAAAAAAAAAAAAAA + AAAAAAAAAACAAACAAAAAgIAAgAAAAIAAgACAgAAAgICAAMDAwAAAAP8AAP8AAAD//wD/AAAA/wD/AP// + AAD///8AAAAAAAAAAAAAAAAzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMQ + AAAAAAAAAAAAAAAAAAAAAAAAABM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZkzEAAAAAAAAAAAAAAAAAAAAAADOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZMwAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZkzAAAAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmTEAAAAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAAAA5mZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAADmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAJmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZAAAAAA + OZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmT + AAAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmRAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZkwAAAZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZkwAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZMAAJmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZEAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwCZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkRmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZOZmZOZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmP+JmZmZmZmZj/////// + ///4OZmZj/eZmZmZmZmZmPg5OZmZmZuI//iIuZmZmZmZmZmZmZM5mZmZmZmZmZmZmb//+JmZmZmZmP// + //////////OZmP//uZmZmZmZmY//+ZmZOZf///////h5k5mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ/////////////4mZ///4mZmZmZmZP///uZmZmP////////+JmZmZmZmZmZkzmZmZmZmZmZmZmZj//4 + mZmZmZmf////////////+Jmf//+JmZmZmZmb///4mZmY//////////+JmZmZmZmZmZM5mZmZmZmZmZmZ + mY//+JmZmZmZn/////////////mZmP//iZmZmZmZk///+5mZj/////iP////+JmZmZmZmZmTOZmZmZmZ + mZmZmZmP//iZmZmZmZ////iIiIiIiIiZOZj//4mZmZmZmZP///uZmf////eZmT////+ZmZmZmZmZkzmZ + mZmZmZmZmZmZj//4mZmZmZmf//+JmZmZmZmZk5mY//+JmZmZmZmT///7mZj///+ZmZmZj///uZmZmZmZ + mZM5mZmZmZmZmZmZmY//+JmZmZmZn///iZmZmZmZmZmZmP//iZmZN5k5k///+5mY///zk5mZOT///4mZ + mZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///4mZmZmZmZmZmZj//4mZmP/5k5P///uZmP//+ZmZmZmY + //+JmZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf///4iIiIiIg5mZmY//+JOb//+JmT///7mZj//4mZ + mZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////85mZmP//iZn///+Jk///+5mf + //+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ////////////+ZmZj//4mY////85v/ + //uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf////////////mZmY//+Jv/// + //+Z///7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn///////////+JmZmP// + if//////if//+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZmZ///////////4mZ + mZj//4j///////j///uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZmZmZj//4mZmZmZmf//+JMzMz + MzOZOZmY//////+D///////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmZmZmY//+JmZmZmZn/// + iZmZmZmZmZmZmP//////mY//////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZmZmZmZmP//iZmZmZ + mZ///4mZmZmZmZmZmZj/////+5mf//////uZmP//iZmZmZmY///5mZmZmZmZkzmZmZmZmZmZMzM5j//4 + kzMzmZmf//+JMzMzMzM5mZmY/////4mTk//////7mZj//4mZmZmZmP//+ZmZmZmZmZM5mZmZmZmZmP// + /////////4mZn////////////4mZmP////+ZmZmP////+5mY//+JmZmZmZj///mZmZmZmZmTOZmZmZmZ + mY/////////////4mZ/////////////7mZj////7mZmZn/////uZmP//iZmZmZmY///5mZmZmZmZkzmZ + mZmZmZn//////////////5mf////////////+Jmf////iZmZk5P////4mZ///4mZmZmZmP//+ZmZmZmZ + mZM5mZmZmZmZj/////////////iZn/////////////iZmP///5mZmZmZj///+5mY//+JmZmZmZj//4mZ + mZmZmZmTOZmZmZmZmZ/////////////zmZP///////////+JmZP///uTmZmZmZj//4mZm///mZmZmZmZ + //85mZmZmZmZkzmZmZmZmZOZiIiIiIiIiIiImTmZOIiIiIiIiIiImTmZOIi5mZmZmZOZiIuZmZk4iZOZ + mZmZOZiDmZmZmZmZmZM5mZmZmZmZOZmZmZmZmZmZmZOZmZmZmZmZmZmZmZOZmZmZmZmZmZmZOZmZmZmZ + mZk5mZmZmZOZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmTuIiIiIs5mZmZmZmZ + mTu4i7mZmZmZmZmZmTMzmZOZmZkzOZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmTmbj///////+HmT + mZmZk4j/////iJmZmZk4iP////iZOZmZj/mZOZOIiIiIiIiIiDmZmZmZmZmZkzmZmZmZmZmZj/////// + ///4mZk5k4///4iI///4OZOY////////iZOZmb/5mZmP///////////4mZmZmZmZmZM5mZmZmZmZn/// + //////////mZmY///5mZmZP///iZmP////////+ZOZk/iZmY/////////////4mZmZmZmZmTOZmZmZmZ + mZ/////////////5mZ////+JmZmY////iZl/////////+ZmZP4mZP//////////////7mZmZmZmZkzmZ + mZmZmZmb////////////uZP/j///+HM3j/////+ZmYj///////iZmT+JmY//////////////+JmZmZmZ + mZM5mZmZmZmZmY//////////+JmT+Jv///////////iPmTmZOI/4mP//uTk/iZmP//////////////iZ + mZmZmZmTOZmZmZmZmZmf//////////mZmZmZ///////////5mZmZmZmTOZk///mZP4mZj/////////// + ///4mZmZmZmZkzmZmZmZmZmTmP////////+JOZmZOY//////////iZmZmZmZmZk5mf/4mT+JmY////// + ////////+JmZmZmZmZM5mZmZmZmZmZn/////////mZmZmZk//////////zmZmZmZmZmZmTmP/zm/iZmP + //////////////iZmZmZmZmTOZmZmZmZmZk5v///////85OZmZkzmP////////iZmZmZmZmZmZmZn//4 + /4mZj/////hzN4/////4mZmZmZmZkzmZmZmZmZmZmZj//////4mZmTmY/4j////////4mZmZmZmZmZmZ + mZj///+JmY////+JmZmY////+JmZmZmZmZM5mZmZmZmZmZmZ//////+ZmZmZj////////////4mZmZmZ + mZmZmZmb////+ZmP///4mZu5mY////iZmZmZmZmTOZmZmZmZmZmZOb/////4k5mZmP/////////////7 + mZmZmZmZmZmZk/////OZv///+ZmP+Jmf///4mZmZmZmZkzmZmZmZmZmZmZmf////+ZmZmZj////////4 + eI//+JmZmZmZmZmZmZP////4mb///4mY//+JmP//+5mZmZmZmZM5mZmZmZmZmZk5v/////uTmZmb//// + ///4mZmX//iZmZmZmZmZmZmZ////+Jmf//95n///+Zj///OZmZmZmZmTOZmZmZmZmZmZmf//////mZmZ + mY//////+ZOZmZiJmZmZmZmZmZmZmY////+ZmP//+I////iP//+JmZmZmZmZkzmZmZmZmZmZmZj///// + /4mZmZmf/////5k5mZOZmTmZmZmZmZmZmZmP///4mZP/////////////OZmZmZmZmZM5mZmZmZmZmZk/ + ///////zmZmZm/////iZmZmZmZmZmZmZmZmZmZmZj///85mZj///////////+JmZmZmZmZmTOZmZmZmZ + mZmZv///////+5mZmZmP///5mZmZmZmZmZmZmZmZmZmZmZ///3mZmZj//////////4mZmZmZmZmZkzmZ + mZmZmZmZmb///4j///uZmZmZmP//mTmZmZmZmZmZmZmZmZmZmZmY/4OZmZmZeP///////4eZmZmZmZmZ + mZM5mZmZmZmZmZmY/4OZOP+JmZmZmZmIiZOZmZmZmZmZmZmZmZmZmZmZmYiZmZmZmZk4iIiIiIOZmZmZ + mZmZmZmTOZmZmZmZmZmZmTOZmZkzmZmZmZmZmZk5mZmZmZmZmZmZmZmZmZmZmZmZk5mZmZmZmZmZmZmZ + mZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZM5mZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTOZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkzmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZM5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmTGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZkwmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZkwA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMACZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAABmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAAADmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAJmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmRAAAAA5mZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAACZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmQAAAAAAGZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZMAAAAAAAOZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZkwAAAAAA + AAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTAA + AAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZMAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZkwAAAAAAAAAAAAOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmTAAAAAAAAAAAAAAGZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZEAAAAAAAAAAAAAAAA5mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZMAAAAAAAAAAAAAAAAAATmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAABOZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZMQAAAAAAAAAAAAAAAAAAAAAAAzmZmZmZmZmZmZmZmZmZmZmZmZmZ + mZmZmZmZmZmZmZmZmZmZmZmZmZmZmZmTMAAAAAAAAAAAAAAAAAAAAAAAAAAAEzMzMzMzMzMzMzMzMzMz + MzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMzMxAAAAAAAAAAAAAAD////////////////////////4AAAA + AAAAAAAAAB//////wAAAAAAAAAAAAAAD/////wAAAAAAAAAAAAAAAP////wAAAAAAAAAAAAAAAA////w + AAAAAAAAAAAAAAAAD///4AAAAAAAAAAAAAAAAAf//8AAAAAAAAAAAAAAAAAD//+AAAAAAAAAAAAAAAAA + Af//AAAAAAAAAAAAAAAAAAD//gAAAAAAAAAAAAAAAAAAf/wAAAAAAAAAAAAAAAAAAD/4AAAAAAAAAAAA + AAAAAAAf+AAAAAAAAAAAAAAAAAAAH/AAAAAAAAAAAAAAAAAAAA/wAAAAAAAAAAAAAAAAAAAP4AAAAAAA + AAAAAAAAAAAAB+AAAAAAAAAAAAAAAAAAAAfAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAAAAAAAA8AA + AAAAAAAAAAAAAAAAAAOAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAA + AAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAA + AAGAAAAAAAAAAAAAAAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAA + AAAAAAABgAAAAAAAAAAAAAAAAAAAAYAAAAAAAAAAAAAAAAAAAAGAAAAAAAAAAAAAAAAAAAABgAAAAAAA + AAAAAAAAAAAAAcAAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAD4AAAAAAAAAAAAAAAAAAAA+AA + AAAAAAAAAAAAAAAAAAfgAAAAAAAAAAAAAAAAAAAH8AAAAAAAAAAAAAAAAAAAD/AAAAAAAAAAAAAAAAAA + AA/4AAAAAAAAAAAAAAAAAAAf/AAAAAAAAAAAAAAAAAAAH/wAAAAAAAAAAAAAAAAAAD/+AAAAAAAAAAAA + AAAAAAB//wAAAAAAAAAAAAAAAAAA//+AAAAAAAAAAAAAAAAAAf//wAAAAAAAAAAAAAAAAAP//+AAAAAA + AAAAAAAAAAAH///4AAAAAAAAAAAAAAAAD////AAAAAAAAAAAAAAAAD////8AAAAAAAAAAAAAAAD///// + wAAAAAAAAAAAAAAD//////wAAAAAAAAAAAAAH////////////////////////w== + + + \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs index 127ef7b..a4fd143 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.cs @@ -69,7 +69,7 @@ namespace TemuKJD.WXForms.ProductForms Task.Run(() => { - PDDDBProdListForm.GetPDDProductGroup(new List { cmbGroupFilter, }); + PDDDBProdListForm.GetPDDProductGroup(new List { cmbGroupFilter, }, "", "", BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); GetPddProductCate(); }); if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态 @@ -341,6 +341,7 @@ namespace TemuKJD.WXForms.ProductForms "&search_group=" + cmbGroupFilter.Text.Trim() + "&search_prod_name=" + txtProdName.Text.Trim() + "&wx_safe_status=" + cmbWxSafe.Text.Trim().Replace("安全+未校验", "安全商品,未校验").Replace("违规商品", ""); + data += "&add_user_name=" + (BaseClass.UserAuthority.Contains("机会商品采集") ? ("admin," + BaseClass.UserName) : "admin"); if (BaseClass.MainPath == "weixin") data += "&ban_wx=0"; if (BaseClass.MainPath == "binxixi") diff --git a/Work/UserLogin.cs b/Work/UserLogin.cs index b88c087..4b6210d 100644 --- a/Work/UserLogin.cs +++ b/Work/UserLogin.cs @@ -85,7 +85,7 @@ namespace Work BaseClass.NickName = BaseRegex.GetStringJson(ref html, "nick_name"); BaseClass.UserName = BaseRegex.GetStringJson(ref html, "user_name"); BaseClass.SaLevel = BaseRegex.GetIntJson(ref html, "sa_level").ParseToInt(); - BaseClass.UserAuthority = BaseRegex.GetStringJson(ref html, "authority"); + BaseClass.UserAuthority = BaseRegex.GetStringJson(ref html, "authority").ParseToString(); BaseClass.Mobile = BaseRegex.GetStringJson(ref html, "mobile"); BaseClass.UserVersion = BaseRegex.GetStringJson(ref html, "version").ParseToInt(); BaseClass.UserVersionString = BaseRegex.GetStringJson(ref html, "version_s");