diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 6ee4745..7cfc74c 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,8 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 612; - //public static int VersionCount = 599; + public static int VersionCount = 613; + //public static int VersionCount = 613; /// /// 版本号 diff --git a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs index 7e3985f..b5e26ff 100644 --- a/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs +++ b/KJDService/KJD_WebService/BLL/BXX/BXXProductManage.cs @@ -49,6 +49,7 @@ namespace KJD_Web.BLL.BXX MysqlUtils mySql = new MysqlUtils(conn); string sql = ""; + //UPDATE `bxx`.`product` set sku_img_replace_id=18 where prod_type = '拖鞋' and sku_img_replace_id<12 order by rand() limit 50; sql = "insert into bxx.product (from_shop_id,spu_id,skc_id,main_cat_id,main_cat_name,cat_id,cat_name,price_text," + "product_name,ext_code,main_img,product_json,size_json,notes,add_time,mdy_time) " + "values ('" + from_shop_id + "','" + spu_id + "','" + skc_id + "','" + main_cat_id + "','" + main_cat_name + "','" + @@ -449,6 +450,7 @@ namespace KJD_Web.BLL.BXX var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); var password = RegexUtils.GetStringQuery(ref inputData, "password")?.Replace("'", "\\'"); var in_ext_codes = RegexUtils.GetStringQuery(ref inputData, "in_ext_codes")?.Replace("'", "\\'"); + var in_skc_ids = RegexUtils.GetStringQuery(ref inputData, "in_skc_ids")?.Replace("'", "\\'"); var in_groups = RegexUtils.GetStringQuery(ref inputData, "in_groups")?.Replace("'", "\\'"); int page = RegexUtils.GetStringQuery(ref inputData, "page").ParseToInt(); @@ -465,6 +467,11 @@ namespace KJD_Web.BLL.BXX in_ext_codes = "'" + string.Join("','", in_ext_codes.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; where += " and p.ext_code in (" + in_ext_codes + ")"; } + if (!string.IsNullOrEmpty(in_skc_ids)) + { + in_skc_ids = "'" + string.Join("','", in_skc_ids.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; + where += " and p.skc_id in (" + in_skc_ids + ")"; + } if (!string.IsNullOrEmpty(in_groups)) { in_groups = "'" + string.Join("','", in_groups.Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries)) + "'"; @@ -555,12 +562,20 @@ namespace KJD_Web.BLL.BXX return "{\"code\":50000,\"msg\":\"校验失败\"}"; var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(user_name)) + { + return "{\"code\":500,\"msg\":\"没有用户名\"}"; + } + var id = RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(id)) + { + return "{\"code\":500,\"msg\":\"删除失败：请指定要删除的数据！\"}"; + } string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "delete from bxx.product where id='" - + id + "'"; + string sql = "delete from bxx.product where id='" + id + "'"; var rst = mySql.ExecuteNonQuery(sql); mySql.Close(); @@ -1102,17 +1117,20 @@ namespace KJD_Web.BLL.BXX return "{\"code\":50000,\"msg\":\"校验失败\"}"; var user_name = RegexUtils.GetStringQuery(ref inputData, "user_name")?.Replace("'", "\\'"); - var id = RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'"); - if (string.IsNullOrEmpty(user_name)) { return "{\"code\":500,\"msg\":\"没有用户名\"}"; } + var id = RegexUtils.GetStringQuery(ref inputData, "db_id")?.Replace("'", "\\'"); + if (string.IsNullOrEmpty(id)) + { + return "{\"code\":500,\"msg\":\"删除失败：请指定要删除的数据！\"}"; + } + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; MysqlUtils mySql = new MysqlUtils(conn); - string sql = "delete from bxx.product_select where id='" - + id + "'"; + string sql = "delete from bxx.product_select where id='" + id + "'"; var rst = mySql.ExecuteNonQuery(sql); mySql.Close(); diff --git a/KJDService/KJD_WebService/KJD_WebService.csproj.user b/KJDService/KJD_WebService/KJD_WebService.csproj.user index 1b87364..4bcdc04 100644 --- a/KJDService/KJD_WebService/KJD_WebService.csproj.user +++ b/KJDService/KJD_WebService/KJD_WebService.csproj.user @@ -8,7 +8,7 @@ - Debug|Any CPU + Release|Any CPU ShowAllFiles diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs index c938d71..65772bd 100644 --- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs +++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs @@ -62,7 +62,6 @@ namespace TemuKJD.KJDForms.AdminForms this.btnSearchPrice2 = new DevComponents.DotNetBar.PanelEx(); this.label15 = new System.Windows.Forms.Label(); this.btnRestoreProdName = new DevComponents.DotNetBar.PanelEx(); - this.txtSkcId = new System.Windows.Forms.TextBox(); this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnEmpty = new DevComponents.DotNetBar.PanelEx(); this.btnSearchPrice = new DevComponents.DotNetBar.PanelEx(); @@ -135,6 +134,7 @@ namespace TemuKJD.KJDForms.AdminForms this.splitContainer4 = new System.Windows.Forms.SplitContainer(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.txtSkcId = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -619,13 +619,6 @@ namespace TemuKJD.KJDForms.AdminForms this.btnRestoreProdName.Text = "批量还原标题"; this.btnRestoreProdName.Click += new System.EventHandler(this.btnRestoreProdName_Click); // - // txtSkcId - // - this.txtSkcId.Location = new System.Drawing.Point(446, 14); - this.txtSkcId.Name = "txtSkcId"; - this.txtSkcId.Size = new System.Drawing.Size(251, 23); - this.txtSkcId.TabIndex = 733; - // // chkSearchAllShop // this.chkSearchAllShop.AutoSize = true; @@ -1532,6 +1525,13 @@ namespace TemuKJD.KJDForms.AdminForms this.statusBar.Size = new System.Drawing.Size(1064, 26); this.statusBar.TabIndex = 2; // + // txtSkcId + // + this.txtSkcId.Location = new System.Drawing.Point(446, 14); + this.txtSkcId.Name = "txtSkcId"; + this.txtSkcId.Size = new System.Drawing.Size(251, 23); + this.txtSkcId.TabIndex = 733; + // // AdminProductPriceCheckForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -1617,7 +1617,6 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.PictureBox pbShopLoading; private UserComponent.UcCheckBox chkSearchAllShop; private System.Windows.Forms.Label label6; - private System.Windows.Forms.TextBox txtSkcId; private System.Windows.Forms.Label label7; private DevComponents.DotNetBar.PanelEx btnRestoreProdName; private DevComponents.DotNetBar.PanelEx btnMutliCancel; @@ -1686,5 +1685,6 @@ namespace TemuKJD.KJDForms.AdminForms private System.Windows.Forms.TextBox txtExtCode; private System.Windows.Forms.Label label12; private DevComponents.DotNetBar.PanelEx btnResetExtCode; + private System.Windows.Forms.TextBox txtSkcId; } } \ No newline at end of file diff --git a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs index 22111c2..dbe50bd 100644 --- a/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs +++ b/TEMUKJD/KJDForms/ShopForms/ShopListForm.cs @@ -949,6 +949,7 @@ namespace TemuKJD.KJDForms.ShopForms this.pbLoading.Visible = false; this.splitContainer1.Panel1.Enabled = true; })); + break; } } }); @@ -1088,6 +1089,7 @@ namespace TemuKJD.KJDForms.ShopForms this.pbLoading.Visible = false; this.splitContainer1.Panel1.Enabled = true; })); + break; } } }); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index 9f61a77..01958f4 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -38,17 +38,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDDBProdListForm)); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); + this.btnSearch = new DevComponents.DotNetBar.PanelEx(); this.cmbGroup = new System.Windows.Forms.ComboBox(); this.btnSetGroup = new DevComponents.DotNetBar.PanelEx(); - this.btnDelSelect = new TemuKJD.UserControls.ButtonEx(); this.cmbSort = new System.Windows.Forms.ComboBox(); - this.btnSelect = new TemuKJD.UserControls.ButtonEx(); this.txtNotes = new System.Windows.Forms.TextBox(); this.lblNotes = new System.Windows.Forms.Label(); this.txtSPU = new System.Windows.Forms.TextBox(); this.label5 = new System.Windows.Forms.Label(); this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); - this.btnSearch = new TemuKJD.UserControls.ButtonEx(); this.txtExtCode = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); this.txtProdName = new System.Windows.Forms.TextBox(); @@ -87,8 +85,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); - this.txtGroup = new System.Windows.Forms.TextBox(); - this.label7 = new System.Windows.Forms.Label(); + this.btnDelSelect = new DevComponents.DotNetBar.PanelEx(); + this.btnSelect = new DevComponents.DotNetBar.PanelEx(); + this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -112,39 +111,62 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // splitContainer1.Panel1 // - this.splitContainer1.Panel1.Controls.Add(this.txtGroup); - this.splitContainer1.Panel1.Controls.Add(this.label7); - this.splitContainer1.Panel1.Controls.Add(this.cmbGroup); - this.splitContainer1.Panel1.Controls.Add(this.btnSetGroup); + this.splitContainer1.Panel1.Controls.Add(this.cmbGroupFilter); + this.splitContainer1.Panel1.Controls.Add(this.btnSelect); this.splitContainer1.Panel1.Controls.Add(this.btnDelSelect); this.splitContainer1.Panel1.Controls.Add(this.cmbSort); - this.splitContainer1.Panel1.Controls.Add(this.btnSelect); + this.splitContainer1.Panel1.Controls.Add(this.label6); + this.splitContainer1.Panel1.Controls.Add(this.btnSearch); + this.splitContainer1.Panel1.Controls.Add(this.cmbGroup); + this.splitContainer1.Panel1.Controls.Add(this.btnSetGroup); this.splitContainer1.Panel1.Controls.Add(this.txtNotes); this.splitContainer1.Panel1.Controls.Add(this.lblNotes); this.splitContainer1.Panel1.Controls.Add(this.txtSPU); this.splitContainer1.Panel1.Controls.Add(this.label5); this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty); - this.splitContainer1.Panel1.Controls.Add(this.btnSearch); this.splitContainer1.Panel1.Controls.Add(this.txtExtCode); this.splitContainer1.Panel1.Controls.Add(this.label4); this.splitContainer1.Panel1.Controls.Add(this.txtProdName); this.splitContainer1.Panel1.Controls.Add(this.label3); this.splitContainer1.Panel1.Controls.Add(this.txtCat); this.splitContainer1.Panel1.Controls.Add(this.label2); - this.splitContainer1.Panel1.Controls.Add(this.label6); this.splitContainer1.Panel1.Controls.Add(this.lblGroup); // // splitContainer1.Panel2 // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); - this.splitContainer1.Size = new System.Drawing.Size(1358, 686); + this.splitContainer1.Size = new System.Drawing.Size(1364, 686); this.splitContainer1.SplitterDistance = 53; this.splitContainer1.TabIndex = 1; // + // btnSearch + // + 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(695, 15); + this.btnSearch.Name = "btnSearch"; + this.btnSearch.Size = new System.Drawing.Size(56, 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); + // // cmbGroup // this.cmbGroup.FormattingEnabled = true; - this.cmbGroup.Location = new System.Drawing.Point(981, 16); + this.cmbGroup.Location = new System.Drawing.Point(994, 15); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(85, 25); this.cmbGroup.TabIndex = 640; @@ -155,9 +177,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetGroup.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetGroup.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetGroup.Location = new System.Drawing.Point(1068, 17); + this.btnSetGroup.Location = new System.Drawing.Point(1081, 15); this.btnSetGroup.Name = "btnSetGroup"; - this.btnSetGroup.Size = new System.Drawing.Size(84, 23); + this.btnSetGroup.Size = new System.Drawing.Size(84, 25); this.btnSetGroup.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnSetGroup.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnSetGroup.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -173,57 +195,21 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetGroup.Text = "批量设置分组"; this.btnSetGroup.Click += new System.EventHandler(this.btnSetGroup_Click); // - // btnDelSelect - // - this.btnDelSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDelSelect.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnDelSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDelSelect.ForeColor = System.Drawing.Color.White; - this.btnDelSelect.Location = new System.Drawing.Point(1161, 15); - this.btnDelSelect.Margin = new System.Windows.Forms.Padding(2); - this.btnDelSelect.Name = "btnDelSelect"; - this.btnDelSelect.Size = new System.Drawing.Size(91, 26); - this.btnDelSelect.TabIndex = 452; - this.btnDelSelect.Text = "删除选中商品"; - this.btnDelSelect.UseVisualStyleBackColor = false; - this.btnDelSelect.Visible = false; - this.btnDelSelect.Click += new System.EventHandler(this.btnDelSelect_Click); - // // cmbSort // this.cmbSort.FormattingEnabled = true; this.cmbSort.Items.AddRange(new object[] { "入库时间", "认领总数"}); - this.cmbSort.Location = new System.Drawing.Point(857, 16); + this.cmbSort.Location = new System.Drawing.Point(891, 15); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(79, 25); this.cmbSort.TabIndex = 448; this.cmbSort.Text = "入库时间"; // - // btnSelect - // - this.btnSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnSelect.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSelect.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelect.ForeColor = System.Drawing.Color.White; - this.btnSelect.Location = new System.Drawing.Point(1256, 15); - this.btnSelect.Margin = new System.Windows.Forms.Padding(2); - this.btnSelect.Name = "btnSelect"; - this.btnSelect.Size = new System.Drawing.Size(91, 26); - this.btnSelect.TabIndex = 444; - this.btnSelect.Text = "认领选中商品"; - this.btnSelect.UseVisualStyleBackColor = false; - this.btnSelect.Visible = false; - this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); - // // txtNotes // - this.txtNotes.Location = new System.Drawing.Point(498, 17); + this.txtNotes.Location = new System.Drawing.Point(498, 16); this.txtNotes.Name = "txtNotes"; this.txtNotes.Size = new System.Drawing.Size(77, 23); this.txtNotes.TabIndex = 439; @@ -231,7 +217,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // lblNotes // this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(464, 20); + this.lblNotes.Location = new System.Drawing.Point(464, 19); this.lblNotes.Name = "lblNotes"; this.lblNotes.Size = new System.Drawing.Size(44, 17); this.lblNotes.TabIndex = 440; @@ -258,9 +244,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.pnlEmpty.Location = new System.Drawing.Point(739, 15); + this.pnlEmpty.Location = new System.Drawing.Point(753, 15); this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 26); + this.pnlEmpty.Size = new System.Drawing.Size(56, 25); this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -277,25 +263,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.pnlEmpty.Text = "清空条件"; this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); // - // btnSearch - // - this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.ForeColor = System.Drawing.Color.White; - this.btnSearch.Location = new System.Drawing.Point(690, 15); - this.btnSearch.Margin = new System.Windows.Forms.Padding(2); - this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(46, 26); - this.btnSearch.TabIndex = 424; - this.btnSearch.Text = "搜索"; - this.btnSearch.UseVisualStyleBackColor = false; - this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // // txtExtCode // - this.txtExtCode.Location = new System.Drawing.Point(387, 17); + this.txtExtCode.Location = new System.Drawing.Point(387, 16); this.txtExtCode.Name = "txtExtCode"; this.txtExtCode.Size = new System.Drawing.Size(77, 23); this.txtExtCode.TabIndex = 429; @@ -303,7 +273,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(353, 20); + this.label4.Location = new System.Drawing.Point(353, 19); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(44, 17); this.label4.TabIndex = 430; @@ -311,7 +281,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // txtProdName // - this.txtProdName.Location = new System.Drawing.Point(276, 17); + this.txtProdName.Location = new System.Drawing.Point(276, 16); this.txtProdName.Name = "txtProdName"; this.txtProdName.Size = new System.Drawing.Size(77, 23); this.txtProdName.TabIndex = 427; @@ -319,7 +289,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(242, 20); + this.label3.Location = new System.Drawing.Point(242, 19); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(44, 17); this.label3.TabIndex = 428; @@ -327,7 +297,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // txtCat // - this.txtCat.Location = new System.Drawing.Point(165, 17); + this.txtCat.Location = new System.Drawing.Point(165, 16); this.txtCat.Name = "txtCat"; this.txtCat.Size = new System.Drawing.Size(77, 23); this.txtCat.TabIndex = 425; @@ -335,7 +305,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(131, 20); + this.label2.Location = new System.Drawing.Point(131, 19); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(44, 17); this.label2.TabIndex = 426; @@ -344,7 +314,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // label6 // this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(800, 20); + this.label6.Location = new System.Drawing.Point(834, 19); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(68, 17); this.label6.TabIndex = 449; @@ -353,7 +323,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // lblGroup // this.lblGroup.AutoSize = true; - this.lblGroup.Location = new System.Drawing.Point(948, 20); + this.lblGroup.Location = new System.Drawing.Point(575, 19); this.lblGroup.Name = "lblGroup"; this.lblGroup.Size = new System.Drawing.Size(44, 17); this.lblGroup.TabIndex = 641; @@ -379,7 +349,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.splitContainer2.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer2.Panel2.Controls.Add(this.statusBar); - this.splitContainer2.Size = new System.Drawing.Size(1358, 629); + this.splitContainer2.Size = new System.Drawing.Size(1364, 629); this.splitContainer2.SplitterDistance = 600; this.splitContainer2.TabIndex = 0; // @@ -387,7 +357,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(654, 275); + this.pbLoading.Location = new System.Drawing.Point(657, 275); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -459,7 +429,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvDbProduct.Name = "dgvDbProduct"; this.dgvDbProduct.ReadOnly = true; this.dgvDbProduct.RowTemplate.Height = 23; - this.dgvDbProduct.Size = new System.Drawing.Size(1350, 600); + this.dgvDbProduct.Size = new System.Drawing.Size(1356, 600); 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); @@ -645,7 +615,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucSplitPage1.CurrentPage = 1; this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(996, 0); + this.ucSplitPage1.Location = new System.Drawing.Point(1002, 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); @@ -662,29 +632,69 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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(1358, 25); + this.statusBar.Size = new System.Drawing.Size(1364, 25); this.statusBar.TabIndex = 5; // - // txtGroup + // btnDelSelect // - this.txtGroup.Location = new System.Drawing.Point(610, 17); - this.txtGroup.Name = "txtGroup"; - this.txtGroup.Size = new System.Drawing.Size(77, 23); - this.txtGroup.TabIndex = 647; + this.btnDelSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnDelSelect.Location = new System.Drawing.Point(1187, 15); + this.btnDelSelect.Name = "btnDelSelect"; + this.btnDelSelect.Size = new System.Drawing.Size(84, 25); + this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnDelSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDelSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnDelSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnDelSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnDelSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnDelSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnDelSelect.Style.GradientAngle = 90; + this.btnDelSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnDelSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDelSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnDelSelect.TabIndex = 643; + this.btnDelSelect.Text = "删除选中商品"; + this.btnDelSelect.Click += new System.EventHandler(this.btnDelSelect_Click); // - // label7 + // btnSelect // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(576, 20); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(44, 17); - this.label7.TabIndex = 648; - this.label7.Text = "分组："; + this.btnSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnSelect.DisabledBackColor = System.Drawing.Color.Empty; + this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSelect.Location = new System.Drawing.Point(1274, 15); + this.btnSelect.Name = "btnSelect"; + this.btnSelect.Size = new System.Drawing.Size(84, 25); + this.btnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnSelect.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnSelect.Style.GradientAngle = 90; + this.btnSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnSelect.TabIndex = 647; + this.btnSelect.Text = "认领选中商品"; + this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); + // + // cmbGroupFilter + // + this.cmbGroupFilter.FormattingEnabled = true; + this.cmbGroupFilter.Location = new System.Drawing.Point(608, 15); + this.cmbGroupFilter.Name = "cmbGroupFilter"; + this.cmbGroupFilter.Size = new System.Drawing.Size(85, 25); + this.cmbGroupFilter.TabIndex = 653; // // PDDDBProdListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.ClientSize = new System.Drawing.Size(1360, 720); + this.ClientSize = new System.Drawing.Size(1366, 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"))); @@ -721,7 +731,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.TextBox txtSKC; private System.Windows.Forms.Label label1; private DevComponents.DotNetBar.PanelEx pnlEmpty; - private UserControls.ButtonEx btnSearch; private System.Windows.Forms.TextBox txtExtCode; private System.Windows.Forms.Label label4; private System.Windows.Forms.TextBox txtProdName; @@ -732,10 +741,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.PictureBox pbLoading; private System.Windows.Forms.TextBox txtNotes; private System.Windows.Forms.Label lblNotes; - private UserControls.ButtonEx btnSelect; private System.Windows.Forms.ComboBox cmbSort; private System.Windows.Forms.Label label6; - private UserControls.ButtonEx btnDelSelect; private System.Windows.Forms.ComboBox cmbGroup; private DevComponents.DotNetBar.PanelEx btnSetGroup; private System.Windows.Forms.Label lblGroup; @@ -762,7 +769,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms 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 txtGroup; - private System.Windows.Forms.Label label7; + private DevComponents.DotNetBar.PanelEx btnSearch; + private DevComponents.DotNetBar.PanelEx btnSelect; + private DevComponents.DotNetBar.PanelEx btnDelSelect; + private System.Windows.Forms.ComboBox cmbGroupFilter; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index ad1749c..d422a88 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -58,7 +58,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms lblGroup.Visible = cmbGroup.Visible = btnSetGroup.Visible = true; - GetGroup(); + GetPDDProductGroup(new List { cmbGroup, cmbGroupFilter, }); } else { @@ -208,16 +208,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms //BaseMsgForm.ShowError("图片加载失败 " + getImgError); image = TemuKJD.Properties.Resources.errpic; - try + Invoke(new Action(() => { - Invoke(new Action(() => + try { row.Cells["colMainImg"].Value = image; - })); - } - catch - { - } + } + catch + { + } + })); } }); } @@ -242,7 +242,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "&search_notes=" + txtNotes.Text.Trim() + "&search_cat=" + txtCat.Text.Trim() + "&search_ext_code=" + txtExtCode.Text.Trim() + - "&search_group=" + txtGroup.Text.Trim() + + "&search_group=" + cmbGroupFilter.Text.Trim() + "&search_prod_name=" + txtProdName.Text.Trim(); if (shop != null && !string.IsNullOrEmpty(shop.ShopId)) { @@ -311,7 +311,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtSKC.Text = ""; this.txtSPU.Text = ""; this.txtNotes.Text = ""; - this.txtGroup.Text = ""; + this.cmbGroupFilter.Text = ""; } private void dgvDbProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -621,10 +621,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } - GetGroup(); + GetPDDProductGroup(new List { cmbGroup, cmbGroupFilter, }); } - void GetGroup() + public static void GetPDDProductGroup(ComboBox box) + { + GetPDDProductGroup(new List { box }); + } + public static void GetPDDProductGroup(List boxs) { var url = BaseClass.BuildObjString("product/get_product_groups"); var data = UserLogin.GetSignaturex(); @@ -635,25 +639,20 @@ namespace TemuKJD.PDDForms.ProductSelectForms html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) { - //BaseMsgForm.ShowError("商品分组编辑失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); + //BaseMsgForm.ShowError("商品分组获取失败，请重试！" + BaseRegex.GetStringJson(ref html, "msg")); } else { - //foreach (var prod in prodList) - //{ - // prod.group = cmbGroup.Text.Trim(); - //} - //foreach (var row in rows) - //{ - // row.Cells["colGroup"].Value = cmbGroup.Text.Trim(); - //} - this.cmbGroup.Items.Clear(); - var groups = BaseRegex.GetStringJson(ref html, "data"); - foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) + foreach (var box in boxs) { - this.cmbGroup.Items.Add(item); + box.Items.Clear(); + var groups = BaseRegex.GetStringJson(ref html, "data"); + foreach (var item in groups.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries)) + { + box.Items.Add(item); + } + box.Items.Add(""); } - this.cmbGroup.Items.Add(""); } } } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs index cbb4ab4..8be3933 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs @@ -30,11 +30,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle 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(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.chkKeepChanceGoodsImg = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -72,6 +72,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkLowPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components); this.lblLowPriceSkuImg = new System.Windows.Forms.Label(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.cmbGroupFilter = new System.Windows.Forms.ComboBox(); + this.label20 = new System.Windows.Forms.Label(); this.panelEx3 = new DevComponents.DotNetBar.PanelEx(); this.txtExtCodeFilter = new System.Windows.Forms.TextBox(); this.btnClearUpload = new DevComponents.DotNetBar.PanelEx(); @@ -95,28 +97,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.panel2 = new System.Windows.Forms.Panel(); - this.pnlEmpty = new DevComponents.DotNetBar.PanelEx(); - this.txtShopId = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); - this.txtSKC = new System.Windows.Forms.TextBox(); - this.btnSearch = new DevComponents.DotNetBar.PanelEx(); - this.label8 = new System.Windows.Forms.Label(); - this.txtSPU = new System.Windows.Forms.TextBox(); - this.cmbStatus = new System.Windows.Forms.ComboBox(); - this.label1 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.cmbUserNotes = new System.Windows.Forms.ComboBox(); - this.txtExtCode = new System.Windows.Forms.TextBox(); - this.txtProdName = new System.Windows.Forms.TextBox(); - this.label13 = new System.Windows.Forms.Label(); - this.label3 = new System.Windows.Forms.Label(); - this.label6 = new System.Windows.Forms.Label(); - this.txtShopName = new System.Windows.Forms.TextBox(); - this.cmbNotes = new System.Windows.Forms.ComboBox(); - this.btnDelSelect = new DevComponents.DotNetBar.PanelEx(); - this.label7 = new System.Windows.Forms.Label(); this.pbLoading = new System.Windows.Forms.PictureBox(); this.panel1 = new System.Windows.Forms.Panel(); this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx(); @@ -146,9 +126,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.txtGroupFilter = new System.Windows.Forms.TextBox(); - this.label20 = new System.Windows.Forms.Label(); + this.label1 = new System.Windows.Forms.Label(); + this.txtIdFilter = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -169,7 +148,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer2.Panel2.SuspendLayout(); this.splitContainer2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit(); - this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit(); @@ -731,7 +709,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms | System.Windows.Forms.AnchorStyles.Left))); this.ucGroupBoxEx4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucGroupBoxEx4.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND; - this.ucGroupBoxEx4.Controls.Add(this.txtGroupFilter); + this.ucGroupBoxEx4.Controls.Add(this.txtIdFilter); + this.ucGroupBoxEx4.Controls.Add(this.label1); + this.ucGroupBoxEx4.Controls.Add(this.cmbGroupFilter); this.ucGroupBoxEx4.Controls.Add(this.label20); this.ucGroupBoxEx4.Controls.Add(this.panelEx3); this.ucGroupBoxEx4.Controls.Add(this.txtExtCodeFilter); @@ -748,13 +728,31 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "待传商品"; // + // cmbGroupFilter + // + this.cmbGroupFilter.FormattingEnabled = true; + this.cmbGroupFilter.Location = new System.Drawing.Point(70, 19); + this.cmbGroupFilter.Name = "cmbGroupFilter"; + this.cmbGroupFilter.Size = new System.Drawing.Size(96, 25); + this.cmbGroupFilter.TabIndex = 641; + // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(16, 22); + this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(56, 17); + this.label20.TabIndex = 570; + this.label20.Text = "筛选分组"; + // // panelEx3 // this.panelEx3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.panelEx3.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx3.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx3.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx3.Location = new System.Drawing.Point(247, 48); + this.panelEx3.Location = new System.Drawing.Point(249, 48); this.panelEx3.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.panelEx3.Name = "panelEx3"; this.panelEx3.Size = new System.Drawing.Size(60, 23); @@ -781,7 +779,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtExtCodeFilter.Location = new System.Drawing.Point(70, 48); this.txtExtCodeFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtExtCodeFilter.Name = "txtExtCodeFilter"; - this.txtExtCodeFilter.Size = new System.Drawing.Size(173, 23); + this.txtExtCodeFilter.Size = new System.Drawing.Size(176, 23); this.txtExtCodeFilter.TabIndex = 555; // // btnClearUpload @@ -790,7 +788,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnClearUpload.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearUpload.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearUpload.Location = new System.Drawing.Point(231, 103); + this.btnClearUpload.Location = new System.Drawing.Point(233, 103); this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearUpload.Name = "btnClearUpload"; this.btnClearUpload.Size = new System.Drawing.Size(76, 23); @@ -827,7 +825,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // lblGoodsCount // this.lblGoodsCount.AutoSize = true; - this.lblGoodsCount.Location = new System.Drawing.Point(164, 78); + this.lblGoodsCount.Location = new System.Drawing.Point(170, 78); this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblGoodsCount.Name = "lblGoodsCount"; this.lblGoodsCount.Size = new System.Drawing.Size(131, 17); @@ -852,7 +850,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panelEx2.Location = new System.Drawing.Point(70, 75); this.panelEx2.Name = "panelEx2"; - this.panelEx2.Size = new System.Drawing.Size(90, 23); + this.panelEx2.Size = new System.Drawing.Size(96, 23); this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center; this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -950,7 +948,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // splitContainer2.Panel2 // - this.splitContainer2.Panel2.Controls.Add(this.panel2); this.splitContainer2.Panel2.Controls.Add(this.pbLoading); this.splitContainer2.Panel2.Controls.Add(this.panel1); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); @@ -963,18 +960,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6; 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; + dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -1079,292 +1076,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colMessage.Name = "colMessage"; this.colMessage.ReadOnly = true; // - // panel2 - // - this.panel2.Controls.Add(this.pnlEmpty); - this.panel2.Controls.Add(this.txtShopId); - this.panel2.Controls.Add(this.label5); - this.panel2.Controls.Add(this.txtSKC); - this.panel2.Controls.Add(this.btnSearch); - this.panel2.Controls.Add(this.label8); - this.panel2.Controls.Add(this.txtSPU); - this.panel2.Controls.Add(this.cmbStatus); - this.panel2.Controls.Add(this.label1); - this.panel2.Controls.Add(this.label12); - this.panel2.Controls.Add(this.label2); - this.panel2.Controls.Add(this.cmbUserNotes); - this.panel2.Controls.Add(this.txtExtCode); - this.panel2.Controls.Add(this.txtProdName); - this.panel2.Controls.Add(this.label13); - this.panel2.Controls.Add(this.label3); - this.panel2.Controls.Add(this.label6); - this.panel2.Controls.Add(this.txtShopName); - this.panel2.Controls.Add(this.cmbNotes); - this.panel2.Controls.Add(this.btnDelSelect); - this.panel2.Controls.Add(this.label7); - this.panel2.Location = new System.Drawing.Point(18, 37); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(851, 100); - this.panel2.TabIndex = 190; - this.panel2.Visible = false; - // - // pnlEmpty - // - 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(653, 16); - this.pnlEmpty.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); - this.pnlEmpty.Name = "pnlEmpty"; - this.pnlEmpty.Size = new System.Drawing.Size(56, 23); - 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 = 504; - this.pnlEmpty.Text = "清空条件"; - this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click); - // - // txtShopId - // - this.txtShopId.Location = new System.Drawing.Point(72, 16); - this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtShopId.Name = "txtShopId"; - this.txtShopId.Size = new System.Drawing.Size(85, 23); - this.txtShopId.TabIndex = 481; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(308, 19); - this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(31, 17); - this.label5.TabIndex = 500; - this.label5.Text = "SPU"; - // - // txtSKC - // - this.txtSKC.Location = new System.Drawing.Point(462, 16); - this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtSKC.Name = "txtSKC"; - this.txtSKC.Size = new System.Drawing.Size(86, 23); - this.txtSKC.TabIndex = 497; - // - // btnSearch - // - 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(560, 16); - this.btnSearch.Name = "btnSearch"; - this.btnSearch.Size = new System.Drawing.Size(90, 23); - 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 = 427; - this.btnSearch.Text = "待传商品查询"; - this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click); - // - // label8 - // - this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(15, 60); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(56, 17); - this.label8.TabIndex = 460; - this.label8.Text = "认领状态"; - // - // txtSPU - // - this.txtSPU.Location = new System.Drawing.Point(340, 16); - this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtSPU.Name = "txtSPU"; - this.txtSPU.Size = new System.Drawing.Size(86, 23); - this.txtSPU.TabIndex = 499; - // - // cmbStatus - // - this.cmbStatus.FormattingEnabled = true; - this.cmbStatus.Items.AddRange(new object[] { - "待上传", - "已上传", - "草稿箱", - "全部"}); - this.cmbStatus.Location = new System.Drawing.Point(72, 56); - this.cmbStatus.Name = "cmbStatus"; - this.cmbStatus.Size = new System.Drawing.Size(85, 25); - this.cmbStatus.TabIndex = 461; - this.cmbStatus.Text = "待上传"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(431, 19); - this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(31, 17); - this.label1.TabIndex = 498; - this.label1.Text = "SKC"; - // - // label12 - // - this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(307, 60); - this.label12.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(32, 17); - this.label12.TabIndex = 485; - this.label12.Text = "备注"; - // - // label2 - // - this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(552, 60); - this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(32, 17); - this.label2.TabIndex = 490; - this.label2.Text = "货号"; - this.label2.Visible = false; - // - // cmbUserNotes - // - this.cmbUserNotes.FormattingEnabled = true; - this.cmbUserNotes.Items.AddRange(new object[] { - "全部", - "重上", - "已买"}); - this.cmbUserNotes.Location = new System.Drawing.Point(340, 56); - this.cmbUserNotes.Margin = new System.Windows.Forms.Padding(0); - this.cmbUserNotes.Name = "cmbUserNotes"; - this.cmbUserNotes.Size = new System.Drawing.Size(85, 25); - this.cmbUserNotes.TabIndex = 486; - this.cmbUserNotes.Text = "全部"; - // - // txtExtCode - // - this.txtExtCode.Location = new System.Drawing.Point(584, 57); - this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtExtCode.Name = "txtExtCode"; - this.txtExtCode.Size = new System.Drawing.Size(86, 23); - this.txtExtCode.TabIndex = 489; - this.txtExtCode.Visible = false; - // - // txtProdName - // - this.txtProdName.Location = new System.Drawing.Point(462, 57); - this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(86, 23); - this.txtProdName.TabIndex = 475; - // - // label13 - // - this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(161, 60); - this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(56, 17); - this.label13.TabIndex = 487; - this.label13.Text = "上传备注"; - // - // label3 - // - this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(430, 60); - this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(32, 17); - this.label3.TabIndex = 476; - this.label3.Text = "标题"; - // - // label6 - // - this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(28, 19); - 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 = 482; - this.label6.Text = "店铺Id"; - // - // txtShopName - // - this.txtShopName.Location = new System.Drawing.Point(217, 16); - this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtShopName.Name = "txtShopName"; - this.txtShopName.Size = new System.Drawing.Size(86, 23); - this.txtShopName.TabIndex = 483; - // - // cmbNotes - // - this.cmbNotes.FormattingEnabled = true; - this.cmbNotes.Items.AddRange(new object[] { - "全部", - "无备注", - "核价成功", - "核价成功（重复）", - "重复"}); - this.cmbNotes.Location = new System.Drawing.Point(218, 56); - this.cmbNotes.Margin = new System.Windows.Forms.Padding(0); - this.cmbNotes.Name = "cmbNotes"; - this.cmbNotes.Size = new System.Drawing.Size(85, 25); - this.cmbNotes.TabIndex = 488; - this.cmbNotes.Text = "全部"; - // - // btnDelSelect - // - this.btnDelSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnDelSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty; - this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDelSelect.Location = new System.Drawing.Point(687, 58); - this.btnDelSelect.Name = "btnDelSelect"; - this.btnDelSelect.Size = new System.Drawing.Size(147, 23); - this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnDelSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnDelSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnDelSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnDelSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnDelSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnDelSelect.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnDelSelect.Style.GradientAngle = 90; - this.btnDelSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnDelSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnDelSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnDelSelect.TabIndex = 468; - this.btnDelSelect.Text = "删除选中记录"; - this.btnDelSelect.Click += new System.EventHandler(this.btnDelSelect_Click); - // - // label7 - // - this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(161, 19); - this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(56, 17); - this.label7.TabIndex = 484; - this.label7.Text = "店铺名称"; - // // pbLoading // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; @@ -1392,18 +1103,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; + dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; + 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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -1543,8 +1254,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colProductName // - dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle5; + dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle10; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -1631,7 +1342,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.splitContainer4.Panel2.Controls.Add(this.btnClear); this.splitContainer4.Panel2.Controls.Add(this.panelEx1); - this.splitContainer4.Panel2.Controls.Add(this.ucSplitPage1); this.splitContainer4.Size = new System.Drawing.Size(1350, 26); this.splitContainer4.SplitterDistance = 659; this.splitContainer4.TabIndex = 3; @@ -1654,7 +1364,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand; this.btnClear.DisabledBackColor = System.Drawing.Color.Empty; this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnClear.Location = new System.Drawing.Point(4, 2); + this.btnClear.Location = new System.Drawing.Point(475, 2); this.btnClear.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(90, 21); this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1678,7 +1388,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; - this.panelEx1.Location = new System.Drawing.Point(97, 2); + this.panelEx1.Location = new System.Drawing.Point(568, 2); this.panelEx1.Name = "panelEx1"; this.panelEx1.Size = new System.Drawing.Size(115, 21); this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1697,39 +1407,25 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Visible = false; // - // ucSplitPage1 + // label1 // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = false; - this.ucSplitPage1.Location = new System.Drawing.Point(114, 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(573, 26); - this.ucSplitPage1.TabIndex = 675; - this.ucSplitPage1.TotalPage = 1; + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(170, 23); + this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(45, 17); + this.label1.TabIndex = 651; + this.label1.Text = "筛选ID"; // - // txtGroup + // txtIdFilter // - this.txtGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + this.txtIdFilter.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtGroupFilter.Location = new System.Drawing.Point(70, 22); - this.txtGroupFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtGroupFilter.Name = "txtGroup"; - this.txtGroupFilter.Size = new System.Drawing.Size(237, 23); - this.txtGroupFilter.TabIndex = 569; - // - // label20 - // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(16, 25); - this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(56, 17); - this.label20.TabIndex = 570; - this.label20.Text = "筛选分组"; + this.txtIdFilter.Location = new System.Drawing.Point(213, 20); + this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtIdFilter.Name = "txtIdFilter"; + this.txtIdFilter.Size = new System.Drawing.Size(96, 23); + this.txtIdFilter.TabIndex = 652; // // PDDDBProdUserSelectForm // @@ -1766,8 +1462,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit(); this.splitContainer2.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit(); - this.panel2.ResumeLayout(false); - this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvSelectProduct)).EndInit(); this.splitContainer4.Panel1.ResumeLayout(false); @@ -1782,7 +1476,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.SplitContainer splitContainer1; private UserComponent.UcGroupBoxEx ucGroupBoxEx4; - private DevComponents.DotNetBar.PanelEx btnSearch; private UserComponent.UcGroupBoxEx ucGroupBoxEx1; private DevComponents.DotNetBar.PanelEx btnRefreshShop; private System.Windows.Forms.SplitContainer splitContainer3; @@ -1791,30 +1484,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private UserComponent.DataGridViewEx dgvSelectProduct; private System.Windows.Forms.SplitContainer splitContainer4; private UserControls.StatusBarUserControl statusBar; - private DevComponents.DotNetBar.PanelEx panelEx1; - private DevComponents.DotNetBar.PanelEx btnClear; private System.Windows.Forms.PictureBox pbLoading; - private UserControls.UcSplitPage ucSplitPage1; - private System.Windows.Forms.ComboBox cmbStatus; - private System.Windows.Forms.Label label8; - private DevComponents.DotNetBar.PanelEx btnDelSelect; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.ComboBox cmbNotes; - private System.Windows.Forms.TextBox txtShopId; - private System.Windows.Forms.Label label7; - private System.Windows.Forms.TextBox txtShopName; - private System.Windows.Forms.Label label3; - private System.Windows.Forms.TextBox txtProdName; - private System.Windows.Forms.ComboBox cmbUserNotes; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox txtExtCode; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.TextBox txtSKC; - private System.Windows.Forms.TextBox txtSPU; - private System.Windows.Forms.Label label1; - private DevComponents.DotNetBar.PanelEx pnlEmpty; private DevComponents.DotNetBar.PanelEx btnUpload; private System.Windows.Forms.Panel panel1; private UserComponent.UcGroupBoxEx ucGroupBoxEx2; @@ -1826,7 +1496,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private DevComponents.DotNetBar.PanelEx btnStop; private UserComponent.UcCheckBox chkChance; private DevComponents.DotNetBar.PanelEx panelEx2; - private System.Windows.Forms.Panel panel2; private System.Windows.Forms.TextBox txtAddCount; private System.Windows.Forms.Label lblGoodsCount; private System.Windows.Forms.Label lblWaitToUp; @@ -1892,7 +1561,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn ColDelete; private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult; - private System.Windows.Forms.TextBox txtGroupFilter; private System.Windows.Forms.Label label20; + private System.Windows.Forms.ComboBox cmbGroupFilter; + private DevComponents.DotNetBar.PanelEx btnClear; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.TextBox txtIdFilter; + private System.Windows.Forms.Label label1; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs index caa40b5..2af9838 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs @@ -109,7 +109,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms chkSelectAll.Checked = true; this.dgvSelectProduct.AddSelectorColumn("colCheck"); - this.ucSplitPage1.PageChange += UcSplitPage1_PageChange; dgvSelectProduct.AddImgColumn("colProductSkcPic", "colImgUrl"); dgvSelectProduct.AddImgColumn("colSkuFakeImg", "colSkuFakeImgUrl"); @@ -128,11 +127,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms #endif } - private void UcSplitPage1_PageChange(object obj) - { - SearchDbProdSelect(this.ucSplitPage1.CurrentPage); - } - private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { if (!chkSelectAll.Checked) @@ -156,6 +150,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private void btnRefreshShop_Click(object sender, EventArgs e) { RefreshShop(); + RefreshDbProd(); } private void UserSelectDbProductForm_VisibleChanged(object sender, EventArgs e) @@ -163,13 +158,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (Visible == true) { RefreshShop(); + RefreshDbProd(); - if (dgvSelectProduct.Rows.Count == 0) - SearchDbProdSelect(1); isInit = true; } } + private void RefreshDbProd() + { + PDDDBProdListForm.GetPDDProductGroup(cmbGroupFilter); // 同时刷新下商品分组 + } + private void RefreshShop() { // 店铺Id @@ -294,139 +293,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms BaseMsgForm.ShowInfo("请选择店铺！"); return; } - - if (this.ucSplitPage1.CurrentPage != 1) - this.ucSplitPage1.CurrentPage = 1; - else - SearchDbProdSelect(1); - } - - public void SearchDbProdSelect(int page) - { - return; - if (InvokeRequired) - { - Invoke(new Action(() => - { - this.pbLoading.Visible = true; - this.dgvSelectProduct.Rows.Clear(); - lstTemuDBProductSelect.Clear(); - })); - } - else - { - this.pbLoading.Visible = true; - this.dgvSelectProduct.Rows.Clear(); - lstTemuDBProductSelect.Clear(); - } - Task.Run(() => - { - int pageCount; - var list = GetSelectProductList(out pageCount, page, 1000); - lstTemuDBProductSelect.AddRange(list); - this.ucSplitPage1.TotalPage = pageCount; - - foreach (var prodSelect in lstTemuDBProductSelect) - { - Invoke(new Action(() => - { - int rowIndex = this.dgvSelectProduct.Rows.Add( - false, - prodSelect.id, - prodSelect.shop_id, - prodSelect.shop_account, - "登录", - "进店", - prodSelect.spu_id, - prodSelect.skc_id, - prodSelect.main_img, - null, - "", - null, - prodSelect.product_name, // 用户端显示商品原名 - prodSelect.cat_name, - prodSelect.ext_code, - prodSelect.status, - prodSelect.draft_id, - prodSelect.notes, - (prodSelect.user_notes + " 编辑").Trim(), - "删除", - "", - ""); - - dgvSelectProduct.Rows[rowIndex].Height = 60; - })); - } - - Invoke(new Action(() => - { - //ShowDgvImg(); - this.pbLoading.Visible = false; - })); - }); - } - - public List GetSelectProductList(out int pageCount, int page = 1, int pageSize = 50) - { - var lstShopId = dgvShop.Rows.Cast().Where(row - => row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList(); - - List list = new List(); - pageCount = 1; - - var url = BaseClass.BuildObjString("product/get_user_select_product_list"); - var data = ""; - Invoke(new Action(() => - { - data = UserLogin.GetSignaturex() + - "&page=" + page + - "&page_size=" + pageSize + - //"&out_product_id=" + dbId + - //"&main_user_name=" + shop.UserName + - //"&sub_user_name=" + shop.SubUserName + - "&search_spu=" + txtSPU.Text + - "&search_skc=" + txtSKC.Text + - "&search_ext_code=" + txtExtCode.Text + - "&search_prod_name=" + txtProdName.Text + - "&search_shop_id=" + txtShopId.Text + - "&search_shop_account=" + txtShopName.Text + - "&search_notes=" + (cmbNotes.Text == "全部" ? "" : cmbNotes.Text) + - "&search_user_notes=" + (cmbUserNotes.Text == "全部" ? "" : cmbUserNotes.Text) + - "&status=" + (cmbStatus.Text == "全部" ? "" : cmbStatus.Text) + - "&shop_ids=\"" + string.Join("\",\"", lstShopId) + "\""; - })); - 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 new List(); - } - - 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(); - } } private void dgvSelectProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -567,27 +433,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.statusBar.lblTaskStatus.Text = "删除完成"; this.pbLoading.Visible = false; BaseMsgForm.ShowInfo("删除完成！"); - - SearchDbProdSelect(this.ucSplitPage1.CurrentPage); })); }); } - private void pnlEmpty_Click(object sender, EventArgs e) - { - //this.txtCat.Text = ""; - this.txtExtCode.Text = ""; - this.txtProdName.Text = ""; - this.txtShopId.Text = ""; - this.txtShopName.Text = ""; - this.txtSKC.Text = ""; - this.txtSPU.Text = ""; - this.cmbStatus.Text = "待上传"; - this.cmbNotes.Text = "全部"; - this.cmbUserNotes.Text = "全部"; - } - //Bitmap defaultBitmap = new Bitmap(80, 80); void ShowDgvImg() { @@ -4067,7 +3917,8 @@ Content-Disposition: form-data; name=""pic_operations"" "&page=" + 1 + "&page_size=" + pageSize; data += "&in_ext_codes=" + txtExtCodeFilter.Text; - data += "&in_groups=" + txtGroupFilter.Text; + data += "&in_skc_ids=" + txtIdFilter.Text; + data += "&in_groups=" + cmbGroupFilter.Text; })); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -4209,8 +4060,9 @@ Content-Disposition: form-data; name=""pic_operations"" private void btnClearFilter_Click(object sender, EventArgs e) { + txtIdFilter.Text = ""; txtExtCodeFilter.Text = ""; - txtGroupFilter.Text = ""; + cmbGroupFilter.Text = ""; } private void lblLowPriceSkuImg_Click(object sender, EventArgs e) diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs index ebf6c09..67a0c32 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopBrowserObject.cs @@ -311,13 +311,20 @@ namespace TemuKJD.PDDForms.ShopForms html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) { - string msg = "选品商品保存失败!请检查网络连接：" + - BaseRegex.GetStringJson(ref html, "msg"); - OnInfoReceived(msg); + string msg = "选品商品保存失败!请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg"); + //OnInfoReceived(msg); + MainForm.instance.Invoke(new Action(() => + { + BaseMsgForm.ShowError(msg); + })); } else { - OnInfoReceived("选品商品保存成功!" + success_err_msg); + //OnInfoReceived("选品商品保存成功!" + success_err_msg); + MainForm.instance.Invoke(new Action(() => + { + BaseMsgForm.ShowError("选品商品保存成功!" + success_err_msg); + })); } //// 创建 SaveFileDialog 的实例 diff --git a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs index 5626f85..31505e3 100644 --- a/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs +++ b/TEMUKJD/PDDForms/ShopForms/PDDShopListForm.cs @@ -576,7 +576,7 @@ namespace TemuKJD.PDDForms.ShopForms if (shop != null) { var loginResult = CheckShopLogin(shop); - if (!loginResult.Contains("\"success\":true")) + if (!loginResult.Contains("\"success\":true") || !loginResult.Contains("\"login\":true")) { shop.Cookies = "empty=true;"; foreach (var sc in campanys) @@ -909,6 +909,7 @@ namespace TemuKJD.PDDForms.ShopForms this.pbLoading.Visible = false; this.splitContainer1.Panel1.Enabled = true; })); + break; } } }); @@ -1048,6 +1049,7 @@ namespace TemuKJD.PDDForms.ShopForms this.pbLoading.Visible = false; this.splitContainer1.Panel1.Enabled = true; })); + break; } } });