diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index dc02f36..6e7d29c 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -31,7 +31,7 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1300; + public static int VersionCount = 1306; public static string MainPath = "29wx"; //public static string MainPath = "29wx"; //public static string MainPath = "29pdd"; @@ -166,6 +166,7 @@ namespace AllBase /// //public static string LoginApiUrl = "http://new.qixiaoke.com/"; public static string LoginApiUrl = ServerUrl; + public static string ImgApiUrl = "http://119.45.29.75:9000"; // ServerUrl; public static string BigDataApiUrl = "http://bigdata.qixiaoke.com/"; public static string GateApi = ""; public static string QqGroupNum = ""; @@ -777,6 +778,10 @@ namespace AllBase { return LoginApiUrl + "/wxxd_" + file + "?obj=" + BaseClass.MainPath + "/wxxd_" + file; } + public static string BuildWXImgObjString(string file, bool IsLoginDef = false) + { + return ImgApiUrl + "/wxxd_" + file + "?obj=" + BaseClass.MainPath + "/wxxd_" + file; + } private static char[] constant = { diff --git a/AllBase/Model/DBModel/user_payment_record.cs b/AllBase/Model/DBModel/user_payment_record.cs index 0dd19da..a0385c0 100644 --- a/AllBase/Model/DBModel/user_payment_record.cs +++ b/AllBase/Model/DBModel/user_payment_record.cs @@ -85,5 +85,6 @@ namespace AllBase.Model.DBModel 退货包裹扣费支出 = 26, 支付宝在线充值 = 30, 云仓退货支出 = 31, + 礼物单退费 = 34, } } diff --git a/AllBase/Model/Result/KJDDBProduct.cs b/AllBase/Model/Result/KJDDBProduct.cs index 1f12e6e..80c411c 100644 --- a/AllBase/Model/Result/KJDDBProduct.cs +++ b/AllBase/Model/Result/KJDDBProduct.cs @@ -101,6 +101,7 @@ namespace AllBase.Model.Result public int? view_uv { get; set; } public int? sale_count { get; set; } + public int? sale_count_num { get; set; } public string sale_count_text { get; set; } public string wx_safe_status { get; set; } public string special_prod_type { get; set; } @@ -115,5 +116,6 @@ namespace AllBase.Model.Result /// public string has_wx_format { get; set; } public string add_user_name { get; set; } + public int? is_del { get; set; } } } diff --git a/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs index c9aba00..98c833c 100644 --- a/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs +++ b/AllBase/Model/Result/PDDResult/PDDFrontProductInfo3.cs @@ -230,7 +230,7 @@ namespace AllBase.Model.Result.PDDResult { public string url { get; set; } // "https://img.pddpic.com/goods/images/2019-12-14/3d66ace6-62cd-4d82-bfff-65c84b268361.jpg", public long? id { get; set; } // 20969775049, - public int? aspectRatio { get; set; } // 1 + public decimal? aspectRatio { get; set; } // 0.75 } } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index 9ccc9bb..402f872 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -51,6 +51,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.tabPage1 = new System.Windows.Forms.TabPage(); + this.plRealDel = new DevComponents.DotNetBar.PanelEx(); + this.btnUpdateSaleCountNum = new DevComponents.DotNetBar.PanelEx(); + this.chkGetSaleCountLess0 = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnEditGroup = new DevComponents.DotNetBar.PanelEx(); this.btnAddUserProd = new DevComponents.DotNetBar.PanelEx(); this.btnTitleFission = new DevComponents.DotNetBar.PanelEx(); @@ -59,6 +62,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbGroup = new System.Windows.Forms.ComboBox(); this.cmbSetWxSafe = new System.Windows.Forms.ComboBox(); this.btnSetWxSafe = new DevComponents.DotNetBar.PanelEx(); + this.chkShowDelProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.tabPage4 = new System.Windows.Forms.TabPage(); this.btnOutProdSaveDb = new DevComponents.DotNetBar.PanelEx(); this.btnImport = new DevComponents.DotNetBar.PanelEx(); @@ -83,10 +87,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnPushToOutServer = new DevComponents.DotNetBar.PanelEx(); this.btnGetProdWxCate = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.numFilterViewUv = new System.Windows.Forms.NumericUpDown(); + this.chkFilterSaleCountNum = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.numFilterSaleCountNum = new System.Windows.Forms.NumericUpDown(); this.cmbTime = new System.Windows.Forms.ComboBox(); this.cmbHasFission = new System.Windows.Forms.ComboBox(); this.label20 = new System.Windows.Forms.Label(); - this.txtViewUvMin = new System.Windows.Forms.TextBox(); this.chkViewUvMin = new TemuKJD.UserComponent.UcCheckBox(this.components); this.cmbPddRelation = new System.Windows.Forms.ComboBox(); this.label19 = new System.Windows.Forms.Label(); @@ -167,6 +173,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colSelectTotalCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colViewUv = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSaleCount = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colSaleCountNum = 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(); @@ -176,6 +183,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colWxSafe = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMdyTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDelStatus = 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(); @@ -192,6 +200,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage2.SuspendLayout(); this.flowLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numFilterViewUv)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.numFilterSaleCountNum)).BeginInit(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit(); this.splitContainer2.Panel1.SuspendLayout(); @@ -226,7 +236,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.splitContainer1.Panel2.Controls.Add(this.splitContainer2); this.splitContainer1.Size = new System.Drawing.Size(1438, 686); - this.splitContainer1.SplitterDistance = 110; + this.splitContainer1.SplitterDistance = 158; this.splitContainer1.TabIndex = 1; // // ucTabControlMetro1 @@ -243,7 +253,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(415, 110); + this.ucTabControlMetro1.Size = new System.Drawing.Size(415, 158); this.ucTabControlMetro1.TabIndex = 1007; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -251,6 +261,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // tabPage1 // + this.tabPage1.Controls.Add(this.plRealDel); + this.tabPage1.Controls.Add(this.btnUpdateSaleCountNum); + this.tabPage1.Controls.Add(this.chkGetSaleCountLess0); this.tabPage1.Controls.Add(this.btnEditGroup); this.tabPage1.Controls.Add(this.btnAddUserProd); this.tabPage1.Controls.Add(this.btnTitleFission); @@ -259,14 +272,76 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage1.Controls.Add(this.cmbGroup); this.tabPage1.Controls.Add(this.cmbSetWxSafe); this.tabPage1.Controls.Add(this.btnSetWxSafe); + this.tabPage1.Controls.Add(this.chkShowDelProd); this.tabPage1.Location = new System.Drawing.Point(4, 26); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(407, 80); + this.tabPage1.Size = new System.Drawing.Size(407, 128); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "数据操作"; this.tabPage1.UseVisualStyleBackColor = true; // + // plRealDel + // + this.plRealDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.plRealDel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.plRealDel.Cursor = System.Windows.Forms.Cursors.Hand; + this.plRealDel.DisabledBackColor = System.Drawing.Color.Empty; + this.plRealDel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.plRealDel.Location = new System.Drawing.Point(271, 97); + this.plRealDel.Name = "plRealDel"; + this.plRealDel.Size = new System.Drawing.Size(130, 25); + this.plRealDel.Style.Alignment = System.Drawing.StringAlignment.Center; + this.plRealDel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.plRealDel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.plRealDel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.plRealDel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.plRealDel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.plRealDel.Style.ForeColor.Color = System.Drawing.Color.White; + this.plRealDel.Style.GradientAngle = 90; + this.plRealDel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.plRealDel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.plRealDel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.plRealDel.TabIndex = 1024; + this.plRealDel.Text = "彻底删除已删除商品"; + this.plRealDel.Visible = false; + this.plRealDel.Click += new System.EventHandler(this.pnlRealDel_Click); + // + // btnUpdateSaleCountNum + // + this.btnUpdateSaleCountNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnUpdateSaleCountNum.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnUpdateSaleCountNum.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnUpdateSaleCountNum.DisabledBackColor = System.Drawing.Color.Empty; + this.btnUpdateSaleCountNum.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnUpdateSaleCountNum.Location = new System.Drawing.Point(6, 97); + this.btnUpdateSaleCountNum.Name = "btnUpdateSaleCountNum"; + this.btnUpdateSaleCountNum.Size = new System.Drawing.Size(87, 25); + this.btnUpdateSaleCountNum.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnUpdateSaleCountNum.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnUpdateSaleCountNum.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnUpdateSaleCountNum.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnUpdateSaleCountNum.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnUpdateSaleCountNum.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnUpdateSaleCountNum.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnUpdateSaleCountNum.Style.GradientAngle = 90; + this.btnUpdateSaleCountNum.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnUpdateSaleCountNum.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnUpdateSaleCountNum.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnUpdateSaleCountNum.TabIndex = 999; + this.btnUpdateSaleCountNum.Text = "更新爆款销量"; + this.btnUpdateSaleCountNum.Click += new System.EventHandler(this.btnUpdateSaleCountNum_Click); + // + // chkGetSaleCountLess0 + // + this.chkGetSaleCountLess0.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkGetSaleCountLess0.Location = new System.Drawing.Point(6, 75); + this.chkGetSaleCountLess0.Name = "chkGetSaleCountLess0"; + this.chkGetSaleCountLess0.Size = new System.Drawing.Size(87, 21); + this.chkGetSaleCountLess0.TabIndex = 981; + this.chkGetSaleCountLess0.Text = "查询销量<0"; + this.chkGetSaleCountLess0.UseVisualStyleBackColor = true; + // // btnEditGroup // this.btnEditGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -442,6 +517,19 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetWxSafe.Text = "设置微信安检"; this.btnSetWxSafe.Click += new System.EventHandler(this.btnSetWxSafe_Click); // + // chkShowDelProd + // + this.chkShowDelProd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkShowDelProd.AutoSize = true; + this.chkShowDelProd.Location = new System.Drawing.Point(189, 99); + this.chkShowDelProd.Name = "chkShowDelProd"; + this.chkShowDelProd.Size = new System.Drawing.Size(87, 21); + this.chkShowDelProd.TabIndex = 1020; + this.chkShowDelProd.Text = "已删除数据"; + this.chkShowDelProd.UseVisualStyleBackColor = true; + this.chkShowDelProd.Visible = false; + this.chkShowDelProd.CheckedChanged += new System.EventHandler(this.chkShowDelProd_CheckedChanged); + // // tabPage4 // this.tabPage4.Controls.Add(this.btnOutProdSaveDb); @@ -449,7 +537,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage4.Location = new System.Drawing.Point(4, 26); this.tabPage4.Name = "tabPage4"; this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(407, 80); + this.tabPage4.Size = new System.Drawing.Size(407, 128); this.tabPage4.TabIndex = 3; this.tabPage4.Text = "商品导入"; this.tabPage4.UseVisualStyleBackColor = true; @@ -518,7 +606,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage3.Controls.Add(this.btnExportTxt); this.tabPage3.Location = new System.Drawing.Point(4, 26); this.tabPage3.Name = "tabPage3"; - this.tabPage3.Size = new System.Drawing.Size(407, 80); + this.tabPage3.Size = new System.Drawing.Size(407, 128); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "商品导出"; // @@ -551,7 +639,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnExportIdImg.Cursor = System.Windows.Forms.Cursors.Hand; this.btnExportIdImg.DisabledBackColor = System.Drawing.Color.Empty; this.btnExportIdImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportIdImg.Location = new System.Drawing.Point(270, 54); + this.btnExportIdImg.Location = new System.Drawing.Point(270, 102); this.btnExportIdImg.Name = "btnExportIdImg"; this.btnExportIdImg.Size = new System.Drawing.Size(134, 23); this.btnExportIdImg.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -659,7 +747,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage2.Location = new System.Drawing.Point(4, 26); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(407, 80); + this.tabPage2.Size = new System.Drawing.Size(407, 128); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "数据修复 3.15前"; // @@ -872,10 +960,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.50328F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle()); + this.tableLayoutPanel1.Controls.Add(this.numFilterViewUv, 13, 1); + this.tableLayoutPanel1.Controls.Add(this.chkFilterSaleCountNum, 0, 3); + this.tableLayoutPanel1.Controls.Add(this.numFilterSaleCountNum, 1, 3); this.tableLayoutPanel1.Controls.Add(this.cmbTime, 8, 2); this.tableLayoutPanel1.Controls.Add(this.cmbHasFission, 15, 1); this.tableLayoutPanel1.Controls.Add(this.label20, 14, 1); - this.tableLayoutPanel1.Controls.Add(this.txtViewUvMin, 13, 1); this.tableLayoutPanel1.Controls.Add(this.chkViewUvMin, 12, 1); this.tableLayoutPanel1.Controls.Add(this.cmbPddRelation, 13, 0); this.tableLayoutPanel1.Controls.Add(this.label19, 12, 0); @@ -920,14 +1010,75 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.Controls.Add(this.panel1, 13, 2); 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.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(908, 105); + this.tableLayoutPanel1.RowCount = 4; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00145F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25.00146F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 24.99896F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 24.99813F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(908, 151); this.tableLayoutPanel1.TabIndex = 679; // + // numFilterViewUv + // + this.numFilterViewUv.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.numFilterViewUv.Font = new System.Drawing.Font("微软雅黑", 10F); + this.numFilterViewUv.Location = new System.Drawing.Point(687, 43); + this.numFilterViewUv.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.numFilterViewUv.Maximum = new decimal(new int[] { + 99999999, + 0, + 0, + 0}); + this.numFilterViewUv.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numFilterViewUv.Name = "numFilterViewUv"; + this.numFilterViewUv.Size = new System.Drawing.Size(51, 25); + this.numFilterViewUv.TabIndex = 932; + this.numFilterViewUv.Value = new decimal(new int[] { + 200, + 0, + 0, + 0}); + // + // chkFilterSaleCountNum + // + this.chkFilterSaleCountNum.Anchor = System.Windows.Forms.AnchorStyles.Right; + this.chkFilterSaleCountNum.Location = new System.Drawing.Point(16, 122); + this.chkFilterSaleCountNum.Margin = new System.Windows.Forms.Padding(0); + this.chkFilterSaleCountNum.Name = "chkFilterSaleCountNum"; + this.chkFilterSaleCountNum.Size = new System.Drawing.Size(44, 17); + this.chkFilterSaleCountNum.TabIndex = 991; + this.chkFilterSaleCountNum.Text = "销量"; + this.chkFilterSaleCountNum.UseVisualStyleBackColor = true; + // + // numFilterSaleCountNum + // + this.numFilterSaleCountNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); + this.numFilterSaleCountNum.Font = new System.Drawing.Font("微软雅黑", 10F); + this.numFilterSaleCountNum.Location = new System.Drawing.Point(60, 118); + this.numFilterSaleCountNum.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0); + this.numFilterSaleCountNum.Maximum = new decimal(new int[] { + 99999999, + 0, + 0, + 0}); + this.numFilterSaleCountNum.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numFilterSaleCountNum.Name = "numFilterSaleCountNum"; + this.numFilterSaleCountNum.Size = new System.Drawing.Size(51, 25); + this.numFilterSaleCountNum.TabIndex = 932; + this.numFilterSaleCountNum.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // // cmbTime // this.cmbTime.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); @@ -936,7 +1087,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "修改时间", "入库时间"}); - this.cmbTime.Location = new System.Drawing.Point(402, 77); + this.cmbTime.Location = new System.Drawing.Point(402, 80); this.cmbTime.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbTime.Name = "cmbTime"; this.cmbTime.Size = new System.Drawing.Size(56, 25); @@ -950,7 +1101,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbHasFission.Location = new System.Drawing.Point(800, 42); + this.cmbHasFission.Location = new System.Drawing.Point(800, 43); this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHasFission.Name = "cmbHasFission"; this.cmbHasFission.Size = new System.Drawing.Size(51, 25); @@ -960,26 +1111,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label20.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(744, 44); + this.label20.Location = new System.Drawing.Point(744, 47); this.label20.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(56, 17); this.label20.TabIndex = 805; this.label20.Text = "裂变标题"; // - // txtViewUvMin - // - this.txtViewUvMin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtViewUvMin.Location = new System.Drawing.Point(687, 41); - this.txtViewUvMin.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.txtViewUvMin.Name = "txtViewUvMin"; - this.txtViewUvMin.Size = new System.Drawing.Size(51, 23); - this.txtViewUvMin.TabIndex = 980; - // // chkViewUvMin // this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Right; - this.chkViewUvMin.Location = new System.Drawing.Point(634, 42); + this.chkViewUvMin.Location = new System.Drawing.Point(634, 45); this.chkViewUvMin.Name = "chkViewUvMin"; this.chkViewUvMin.Size = new System.Drawing.Size(50, 21); this.chkViewUvMin.TabIndex = 978; @@ -994,7 +1136,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(687, 7); + this.cmbPddRelation.Location = new System.Drawing.Point(687, 6); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Size = new System.Drawing.Size(51, 25); @@ -1004,7 +1146,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label19.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(631, 9); + this.label19.Location = new System.Drawing.Point(631, 10); this.label19.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(56, 17); @@ -1017,7 +1159,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.SetColumnSpan(this.dtpEnd, 2); this.dtpEnd.CustomFormat = "yyyy-MM-dd HH:mm"; this.dtpEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpEnd.Location = new System.Drawing.Point(574, 76); + this.dtpEnd.Location = new System.Drawing.Point(574, 81); this.dtpEnd.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.dtpEnd.Name = "dtpEnd"; this.dtpEnd.Size = new System.Drawing.Size(110, 23); @@ -1029,7 +1171,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.SetColumnSpan(this.dtpStart, 2); this.dtpStart.CustomFormat = "yyyy-MM-dd HH:mm"; this.dtpStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom; - this.dtpStart.Location = new System.Drawing.Point(461, 76); + this.dtpStart.Location = new System.Drawing.Point(461, 81); this.dtpStart.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.dtpStart.Name = "dtpStart"; this.dtpStart.Size = new System.Drawing.Size(110, 23); @@ -1039,7 +1181,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(252, 77); + this.cmbCat2.Location = new System.Drawing.Point(252, 80); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(51, 25); @@ -1050,7 +1192,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label16.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(3, 44); + this.label16.Location = new System.Drawing.Point(3, 47); this.label16.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(57, 17); @@ -1061,7 +1203,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label1.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 79); + this.label1.Location = new System.Drawing.Point(3, 84); this.label1.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(57, 17); @@ -1071,7 +1213,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // 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(252, 6); + this.txtSecretStyleCode.Location = new System.Drawing.Point(252, 7); this.txtSecretStyleCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSecretStyleCode.Name = "txtSecretStyleCode"; this.txtSecretStyleCode.Size = new System.Drawing.Size(51, 23); @@ -1081,7 +1223,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(213, 79); + this.label14.Location = new System.Drawing.Point(213, 84); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(39, 17); @@ -1092,7 +1234,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label15.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(220, 9); + this.label15.Location = new System.Drawing.Point(220, 10); this.label15.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(32, 17); @@ -1103,7 +1245,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label13.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(518, 44); + this.label13.Location = new System.Drawing.Point(518, 47); this.label13.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(56, 17); @@ -1125,7 +1267,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "多多外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(252, 42); + this.cmbSourceType.Location = new System.Drawing.Point(252, 43); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(51, 25); @@ -1136,7 +1278,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label10.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(220, 44); + this.label10.Location = new System.Drawing.Point(220, 47); this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(32, 17); @@ -1147,7 +1289,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label5.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(15, 9); + this.label5.Location = new System.Drawing.Point(15, 10); this.label5.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(45, 17); @@ -1157,7 +1299,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // 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(60, 6); + this.txtSPU.Location = new System.Drawing.Point(60, 7); this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSPU.Name = "txtSPU"; this.txtSPU.Size = new System.Drawing.Size(51, 23); @@ -1171,7 +1313,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(574, 7); + this.cmbWxCat.Location = new System.Drawing.Point(574, 6); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(51, 25); @@ -1180,7 +1322,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // 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(60, 41); + this.txtSKC.Location = new System.Drawing.Point(60, 44); this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtSKC.Name = "txtSKC"; this.txtSKC.Size = new System.Drawing.Size(51, 23); @@ -1193,7 +1335,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "曝光量"}); - this.cmbSort.Location = new System.Drawing.Point(348, 42); + this.cmbSort.Location = new System.Drawing.Point(348, 43); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(51, 25); @@ -1204,7 +1346,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label6.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label6.AutoSize = true; - this.label6.Location = new System.Drawing.Point(316, 44); + this.label6.Location = new System.Drawing.Point(316, 47); this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label6.Name = "label6"; this.label6.Size = new System.Drawing.Size(32, 17); @@ -1215,7 +1357,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label4.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(316, 9); + this.label4.Location = new System.Drawing.Point(316, 10); this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); @@ -1226,7 +1368,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label12.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(518, 9); + this.label12.Location = new System.Drawing.Point(518, 10); this.label12.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(56, 17); @@ -1236,7 +1378,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtExtCode // this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtExtCode.Location = new System.Drawing.Point(348, 6); + this.txtExtCode.Location = new System.Drawing.Point(348, 7); this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtExtCode.Name = "txtExtCode"; this.txtExtCode.Size = new System.Drawing.Size(51, 23); @@ -1246,7 +1388,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblGroup.AutoSize = true; - this.lblGroup.Location = new System.Drawing.Point(124, 44); + this.lblGroup.Location = new System.Drawing.Point(124, 47); this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblGroup.Name = "lblGroup"; this.lblGroup.Size = new System.Drawing.Size(32, 17); @@ -1257,7 +1399,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(156, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(156, 43); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(51, 25); @@ -1272,7 +1414,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(574, 42); + this.cmbExportToOutServer.Location = new System.Drawing.Point(574, 43); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Size = new System.Drawing.Size(51, 25); @@ -1282,7 +1424,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left; this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(405, 9); + this.label3.Location = new System.Drawing.Point(405, 10); this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(56, 17); @@ -1292,7 +1434,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtProdName // this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtProdName.Location = new System.Drawing.Point(461, 6); + this.txtProdName.Location = new System.Drawing.Point(461, 7); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; this.txtProdName.Size = new System.Drawing.Size(51, 23); @@ -1308,7 +1450,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(461, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(461, 43); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(51, 25); @@ -1319,7 +1461,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblWxSafe.Anchor = System.Windows.Forms.AnchorStyles.Left; this.lblWxSafe.AutoSize = true; - this.lblWxSafe.Location = new System.Drawing.Point(405, 44); + this.lblWxSafe.Location = new System.Drawing.Point(405, 47); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; this.lblWxSafe.Size = new System.Drawing.Size(56, 17); @@ -1330,7 +1472,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(124, 9); + this.lblNotes.Location = new System.Drawing.Point(124, 10); this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblNotes.Name = "lblNotes"; this.lblNotes.Size = new System.Drawing.Size(32, 17); @@ -1340,7 +1482,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // 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(156, 6); + this.txtNotes.Location = new System.Drawing.Point(156, 7); this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtNotes.Name = "txtNotes"; this.txtNotes.Size = new System.Drawing.Size(51, 23); @@ -1350,7 +1492,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(156, 77); + this.cmbCat1.Location = new System.Drawing.Point(156, 80); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(51, 25); @@ -1361,7 +1503,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(117, 79); + this.label2.Location = new System.Drawing.Point(117, 84); this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(39, 17); @@ -1372,7 +1514,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(348, 77); + this.cmbCat3.Location = new System.Drawing.Point(348, 80); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(51, 25); @@ -1383,7 +1525,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(309, 79); + this.label17.Location = new System.Drawing.Point(309, 84); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(39, 17); @@ -1393,7 +1535,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // 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(60, 76); + this.txtRealCoid.Location = new System.Drawing.Point(60, 81); this.txtRealCoid.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtRealCoid.Name = "txtRealCoid"; this.txtRealCoid.Size = new System.Drawing.Size(51, 23); @@ -1405,7 +1547,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmpty.Location = new System.Drawing.Point(857, 40); + this.btnEmpty.Location = new System.Drawing.Point(857, 43); this.btnEmpty.Name = "btnEmpty"; this.btnEmpty.Size = new System.Drawing.Size(46, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1431,7 +1573,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty; this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSearch.Location = new System.Drawing.Point(857, 5); + this.btnSearch.Location = new System.Drawing.Point(857, 6); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(46, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1453,7 +1595,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label11.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(744, 9); + this.label11.Location = new System.Drawing.Point(744, 10); this.label11.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(56, 17); @@ -1468,7 +1610,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "普通商品", "爆款数据"}); - this.cmbSpProdType.Location = new System.Drawing.Point(800, 7); + this.cmbSpProdType.Location = new System.Drawing.Point(800, 6); this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSpProdType.Name = "cmbSpProdType"; this.cmbSpProdType.Size = new System.Drawing.Size(51, 25); @@ -1482,15 +1624,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tableLayoutPanel1.SetColumnSpan(this.panel1, 4); this.panel1.Controls.Add(this.chkWXComplateProd); this.panel1.Controls.Add(this.chkNoUserProduct); - this.panel1.Location = new System.Drawing.Point(690, 73); + this.panel1.Location = new System.Drawing.Point(690, 77); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(215, 29); + this.panel1.Size = new System.Drawing.Size(215, 31); this.panel1.TabIndex = 982; // // chkWXComplateProd // this.chkWXComplateProd.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkWXComplateProd.Location = new System.Drawing.Point(1, 4); + this.chkWXComplateProd.Location = new System.Drawing.Point(1, 5); 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); @@ -1504,7 +1646,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkNoUserProduct.AutoSize = true; this.chkNoUserProduct.Checked = true; this.chkNoUserProduct.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkNoUserProduct.Location = new System.Drawing.Point(98, 4); + this.chkNoUserProduct.Location = new System.Drawing.Point(98, 5); this.chkNoUserProduct.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkNoUserProduct.Name = "chkNoUserProduct"; this.chkNoUserProduct.Size = new System.Drawing.Size(111, 21); @@ -1546,8 +1688,8 @@ 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(1438, 572); - this.splitContainer2.SplitterDistance = 543; + this.splitContainer2.Size = new System.Drawing.Size(1438, 524); + this.splitContainer2.SplitterDistance = 495; this.splitContainer2.TabIndex = 0; // // panelEx1 @@ -1607,7 +1749,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.pnlEditExtCodePrice.Controls.Add(this.lblExtCode); this.pnlEditExtCodePrice.Controls.Add(this.panel2); this.pnlEditExtCodePrice.Controls.Add(this.lblExtCodePrice); - this.pnlEditExtCodePrice.Location = new System.Drawing.Point(482, 73); + this.pnlEditExtCodePrice.Location = new System.Drawing.Point(482, 49); this.pnlEditExtCodePrice.Name = "pnlEditExtCodePrice"; this.pnlEditExtCodePrice.Size = new System.Drawing.Size(474, 146); this.pnlEditExtCodePrice.TabIndex = 434; @@ -1702,7 +1844,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(694, 246); + this.pbLoading.Location = new System.Drawing.Point(694, 222); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -1752,6 +1894,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colSelectTotalCount, this.colViewUv, this.colSaleCount, + this.colSaleCountNum, this.col_notes, this.colHeadWords, this.colEndWords, @@ -1761,6 +1904,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colWxSafe, this.colAddTime, this.colMdyTime, + this.colDelStatus, this.col_edit, this.col_delete, this.col_select_product}); @@ -1770,7 +1914,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(1430, 543); + this.dgvDbProduct.Size = new System.Drawing.Size(1430, 495); this.dgvDbProduct.TabIndex = 6; this.dgvDbProduct.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellClick); this.dgvDbProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellContentClick); @@ -1957,11 +2101,18 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // colSaleCount // - this.colSaleCount.FillWeight = 60F; + this.colSaleCount.FillWeight = 50F; this.colSaleCount.HeaderText = "销量"; this.colSaleCount.Name = "colSaleCount"; this.colSaleCount.ReadOnly = true; // + // colSaleCountNum + // + this.colSaleCountNum.FillWeight = 50F; + this.colSaleCountNum.HeaderText = "销量数"; + this.colSaleCountNum.Name = "colSaleCountNum"; + this.colSaleCountNum.ReadOnly = true; + // // col_notes // dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True; @@ -2038,6 +2189,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.colMdyTime.Name = "colMdyTime"; this.colMdyTime.ReadOnly = true; // + // colDelStatus + // + this.colDelStatus.FillWeight = 50F; + this.colDelStatus.HeaderText = "已删除"; + this.colDelStatus.Name = "colDelStatus"; + this.colDelStatus.ReadOnly = true; + this.colDelStatus.Visible = false; + // // col_edit // this.col_edit.FillWeight = 40F; @@ -2111,6 +2270,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer1.ResumeLayout(false); this.ucTabControlMetro1.ResumeLayout(false); this.tabPage1.ResumeLayout(false); + this.tabPage1.PerformLayout(); this.tabPage4.ResumeLayout(false); this.tabPage3.ResumeLayout(false); this.tabPage3.PerformLayout(); @@ -2119,6 +2279,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.flowLayoutPanel1.PerformLayout(); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numFilterViewUv)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.numFilterSaleCountNum)).EndInit(); this.panel1.ResumeLayout(false); this.panel1.PerformLayout(); this.splitContainer2.Panel1.ResumeLayout(false); @@ -2222,11 +2384,24 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.ComboBox cmbPddRelation; private System.Windows.Forms.Label label19; private DevComponents.DotNetBar.PanelEx btnExportIdImg; - private System.Windows.Forms.TextBox txtViewUvMin; private UserComponent.UcCheckBox chkViewUvMin; private DevComponents.DotNetBar.PanelEx btnTitleFission; private System.Windows.Forms.ComboBox cmbHasFission; private System.Windows.Forms.Label label20; + private DevComponents.DotNetBar.PanelEx btnOutProdSaveDb; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.Label label8; + private UserComponent.UcCheckBox chkNoUserProduct; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.PanelEx btnAddUserProd; + private DevComponents.DotNetBar.PanelEx btnEditGroup; + private System.Windows.Forms.ComboBox cmbTime; + private DevComponents.DotNetBar.PanelEx btnUpdateSaleCountNum; + private UserComponent.UcCheckBox chkGetSaleCountLess0; + private System.Windows.Forms.NumericUpDown numFilterSaleCountNum; + private UserComponent.UcCheckBox chkFilterSaleCountNum; + private System.Windows.Forms.NumericUpDown numFilterViewUv; + private UserComponent.UcCheckBox chkShowDelProd; private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId; @@ -2250,6 +2425,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount; private System.Windows.Forms.DataGridViewTextBoxColumn colViewUv; private System.Windows.Forms.DataGridViewTextBoxColumn colSaleCount; + private System.Windows.Forms.DataGridViewTextBoxColumn colSaleCountNum; private System.Windows.Forms.DataGridViewTextBoxColumn col_notes; private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords; private System.Windows.Forms.DataGridViewTextBoxColumn colEndWords; @@ -2259,16 +2435,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewTextBoxColumn colWxSafe; private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; private System.Windows.Forms.DataGridViewTextBoxColumn colMdyTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colDelStatus; private System.Windows.Forms.DataGridViewLinkColumn col_edit; private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; - private DevComponents.DotNetBar.PanelEx btnOutProdSaveDb; - private System.Windows.Forms.TabPage tabPage4; - private System.Windows.Forms.Label label8; - private UserComponent.UcCheckBox chkNoUserProduct; - private System.Windows.Forms.Panel panel1; - private DevComponents.DotNetBar.PanelEx btnAddUserProd; - private DevComponents.DotNetBar.PanelEx btnEditGroup; - private System.Windows.Forms.ComboBox cmbTime; + private DevComponents.DotNetBar.PanelEx plRealDel; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index d3369eb..000c18b 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -137,6 +137,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms WXDBProdUploadForm.lstWXShopTokenInfo = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("wx_shop_token_list"); if (WXDBProdUploadForm.lstWXShopTokenInfo == null) WXDBProdUploadForm.lstWXShopTokenInfo = new ConcurrentList(); + + if (BaseClass.UserName == "15288888888") + { + chkShowDelProd.Visible = true; + plRealDel.Visible = true; + } } private void btnSearch_Click(object sender, EventArgs e) @@ -252,6 +258,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms prod.select_total_count, prod.view_uv, prod.sale_count_text, // 销售数量 + prod.sale_count_num, prod.notes, prod.head_words, prod.end_words, @@ -261,6 +268,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms prod.wx_safe_status, prod.add_time.ToString("yy-MM-dd HH:mm"), prod.mdy_time.ToString("yy-MM-dd HH:mm"), + prod.is_del == 1 ? "是" : "否", "编辑", "删除", "认领"); @@ -369,7 +377,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms if (chkViewUvMin.Checked) { - data += "&min_view_uv=" + txtViewUvMin.Text.ParseToInt(); + data += "&min_view_uv=" + numFilterViewUv.Value.ParseToInt(); + } + if (chkFilterSaleCountNum.Checked) + { + data += "&sale_count_num_more=" + numFilterSaleCountNum.Value.ParseToInt(); } if (cmbTime.Text == "修改时间") @@ -480,6 +492,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms data += "&is_relation=0"; else if (cmbPddRelation.Text == "是") data += "&is_relation=1"; + + if (chkGetSaleCountLess0.Checked) + data += "&sale_count_num_less=-1"; + if (chkShowDelProd.Checked) + data += "&is_del=1"; })); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -552,7 +569,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkWXComplateProd.Checked = false; this.cmbHasFission.Text = ""; this.cmbPddRelation.Text = ""; - this.txtViewUvMin.Text = ""; + this.chkViewUvMin.Checked = false; + this.numFilterViewUv.Value = 1; + this.chkFilterSaleCountNum.Checked = false; + this.numFilterSaleCountNum.Value = 1; } private void cmbCateFilter1_SelectedIndexChanged(object sender, EventArgs e) @@ -715,11 +735,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } - private void DeleteProduct(string dbId, bool isUpdate = true) + private void DeleteProduct(string dbId, bool isRealDel = false, bool isUpdate = true) { var url = BaseClass.BuildPDDObjString("product/del_db_product"); var data = UserLogin.GetSignaturex() + - "&db_id=" + dbId; + "&db_id=" + dbId + "&is_real_del=" + isRealDel; var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) html = GetHtml.PostUtf8(url, data); @@ -757,7 +777,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms { foreach (var prod in prodList) { - DeleteProduct(prod.id.ToString(), false); + DeleteProduct(prod.id.ToString(), false, false); Invoke(new Action(() => { @@ -1284,7 +1304,7 @@ 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 { @@ -1549,7 +1569,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms foreach (var img in mainImgLst3) { // 盗链识别 - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); var upDateRst = ""; @@ -1589,7 +1609,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms //break; } - urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -2777,5 +2797,94 @@ namespace TemuKJD.PDDForms.ProductSelectForms GetPDDProductGroup(new List { cmbGroup }, "", "无分组"); GetPDDProductGroup(new List { cmbGroupFilter }, "", "无分组"); } + + private async void btnUpdateSaleCountNum_Click(object sender, EventArgs e) + { + var rows = dgvDbProduct.Rows.Cast().Where(row + => row.Cells["colSelect"]?.Value.ParseToBool() == true); + var lstProdDbId = rows.Select(r => r.Cells["col_db_id"]?.Value.ToString()).ToList(); + var prodList = this.lstTemuDbProduct.Where(p => lstProdDbId.Contains(p.id.ParseToString())).ToList(); + if (prodList.Count <= 0) + { + BaseMsgForm.ShowError("请选择商品!"); + return; + } + + int cnt = 0; + int successCnt = 0; + int failedCnt = 0; + foreach (var prod in prodList) + { + cnt++; + var url = BaseClass.BuildPDDObjString("product/mdy_product"); + var data = UserLogin.GetSignaturex() + + "&spu_id=" + prod.spu_id + "&sale_count=" + prod.sale_count + "&mdy_time=" + prod.mdy_time.ToString("yyyy-MM-dd HH:mm:ss"); + await Task.Run(() => + { + 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")); + failedCnt++; + } + else + { + successCnt++; + } + }); + this.statusBar.UpdateProgressBar(cnt); + this.statusBar.pgbTaskProgress.Maximum = prodList.Count; + this.statusBar.lblTaskStatus.Text = "正在编辑商品销量,共:" + prodList.Count + " 成功:" + successCnt + "/失败:" + failedCnt; + } + + //foreach (var row in rows) + //{ + // row.Cells["colWxSafe"].Value = cmbSetWxSafe.Text.Trim(); + //} + + SearchDbProd(this.ucSplitPage1.CurrentPage); + } + + private void pnlRealDel_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) + { + if (prod.is_del > 0) + { + DeleteProduct(prod.id.ToString(), prod.is_del > 0, 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 chkShowDelProd_CheckedChanged(object sender, EventArgs e) + { + dgvDbProduct.Columns["colDelStatus"].Visible = chkShowDelProd.Checked; + } } } diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.resx b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.resx index 8119b27..5bbf642 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.resx +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.resx @@ -186,6 +186,9 @@ True + + True + True @@ -213,6 +216,9 @@ True + + True + True diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index 7c136f6..fc63834 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -161,7 +161,9 @@ namespace TemuKJD.UserForm private void loginPanel_Click(object sender, EventArgs e) { if (rbtDev.Checked) + { BaseClass.LoginApiUrl = "http://localhost:9000"; + } else BaseClass.LoginApiUrl = BaseClass.ServerUrl; //"http://localhost:8000/user/user_login" diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs index 52d6110..f19a954 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.Designer.cs @@ -455,7 +455,7 @@ namespace TemuKJD.WXForms.AdminForms "充值", "管理员充值", "支付宝充值", - "礼物单支出", + "礼物单支出/礼物单退费", "拍单扣除/作废返还", "超重扣费支出", "退货包裹扣费支出", diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs index d58b11c..893fb67 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminAccountBalanceForm.cs @@ -98,8 +98,8 @@ namespace TemuKJD.WXForms.AdminForms data3 += "&type_in=1"; else if (cmbType.Text == "支付宝充值") data3 += "&type_in=30"; - else if (cmbType.Text == "礼物单支出") - data3 += "&type_in=16"; + else if (cmbType.Text == "礼物单支出/礼物单退费") + data3 += "&type_in=16,34"; else if (cmbType.Text == "拍单扣除/作废返还") data3 += "&type_in=20,23"; else if (cmbType.Text == "超重扣费支出") diff --git a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs index 9d83716..e030915 100644 --- a/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs +++ b/TEMUKJD/WXForms/AiTalkForms/WxAiTalkForm.cs @@ -187,7 +187,7 @@ namespace TemuKJD.WXForms.AiTalkForms currentShop = GlobalConfig.ValidShopLoginList.FirstOrDefault(); Invoke(new Action(() => { - lblCurrentShop.Text = "当前店铺:" + currentShop.ShopAccount; + lblCurrentShop.Text = "当前店铺:" + currentShop?.ShopAccount; })); SetMainBrowserUrl(currentShop); LoadShop(); @@ -424,7 +424,8 @@ namespace TemuKJD.WXForms.AiTalkForms { if (aiTalkWebBrowser == null) { - aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", true); + //aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", true); + aiTalkWebBrowser = CEFBrowser.CreateChromiumWebBrowser("about:blank", false); CustomResourceRequestHandler resourceRequestHandler = new CustomResourceRequestHandler(); var handler = resourceRequestHandler; handler.ResourceLoadCompleteEvent += AiRequestHandler_ResourceLoadComplete; diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs index 96c795a..ab8e926 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.Designer.cs @@ -32,14 +32,14 @@ namespace TemuKJD.WXForms.ProductForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - 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 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(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.txtWaitSeconds = new System.Windows.Forms.TextBox(); @@ -71,6 +71,8 @@ namespace TemuKJD.WXForms.ProductForms this.chkStepAddPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.ucTabControlMetro1 = new TemuKJD.UserControls.UcTabControlMetro(); this.上传参数1 = new System.Windows.Forms.TabPage(); + this.numJumpCnt = new System.Windows.Forms.NumericUpDown(); + this.label40 = new System.Windows.Forms.Label(); this.chkFreightInsurance = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSameSpecPriceDown = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkLowestPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components); @@ -144,16 +146,23 @@ namespace TemuKJD.WXForms.ProductForms this.label37 = new System.Windows.Forms.Label(); this.label15 = new System.Windows.Forms.Label(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.pnlFilterSaleCountNum = new System.Windows.Forms.Panel(); + this.label42 = new System.Windows.Forms.Label(); + this.numFilterSaleCountNum = new System.Windows.Forms.NumericUpDown(); + this.chkFilterSaleCountNum = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.pnlFilterViewUv = new System.Windows.Forms.Panel(); + this.label41 = new System.Windows.Forms.Label(); this.numFilterViewUv = new System.Windows.Forms.NumericUpDown(); + this.txtUpdateInDays = new System.Windows.Forms.TextBox(); + this.cmbUpdateInDays = new System.Windows.Forms.ComboBox(); this.cmbNotes = new System.Windows.Forms.ComboBox(); this.cmbJstInitSet = new System.Windows.Forms.ComboBox(); - this.pbSelectProd = new System.Windows.Forms.PictureBox(); - this.chkSevenDays = new TemuKJD.UserComponent.UcCheckBox(this.components); this.chkSkipQualification = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.lblGoodsCount = new System.Windows.Forms.Label(); this.txtRandomFissionProductCount = new System.Windows.Forms.TextBox(); this.lblJstInitSet = new System.Windows.Forms.Label(); this.btnSwitchCatType = new DevComponents.DotNetBar.PanelEx(); + this.lblUpdateInDays = new System.Windows.Forms.Label(); + this.chkRandomFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); this.cmbHot = new System.Windows.Forms.ComboBox(); this.btnProdDb = new DevComponents.DotNetBar.PanelEx(); this.txtAddCount = new System.Windows.Forms.TextBox(); @@ -177,11 +186,13 @@ namespace TemuKJD.WXForms.ProductForms this.lblIdFilter = new System.Windows.Forms.Label(); this.lblHot = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label(); - this.chkRandomFissionProduct = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.lblWaitToUp = new System.Windows.Forms.Label(); - this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); this.lblNotes = new System.Windows.Forms.Label(); this.chkFilterViewUv = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.pbSelectProd = new System.Windows.Forms.PictureBox(); + this.lblGoodsCount = new System.Windows.Forms.Label(); + this.lblWaitToUp = new System.Windows.Forms.Label(); + this.chkWXComplateProd = new TemuKJD.UserComponent.UcCheckBox(this.components); + this.chkUpdateInDays = new TemuKJD.UserComponent.UcCheckBox(this.components); this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.cmbFilterShopGroup = new TemuKJD.UserComponent.UcComboBoxMutiSelect(); this.label24 = new System.Windows.Forms.Label(); @@ -204,6 +215,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtExtCodeFilter = new System.Windows.Forms.TextBox(); this.pbLoadingShop = new System.Windows.Forms.PictureBox(); this.lblExtCodeFilter = new System.Windows.Forms.Label(); + this.chkSevenDays = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -252,8 +264,6 @@ namespace TemuKJD.WXForms.ProductForms this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.btnClear = new DevComponents.DotNetBar.PanelEx(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); - this.chkUpdateInDays = new TemuKJD.UserComponent.UcCheckBox(this.components); - this.txtUpdateInDays = new System.Windows.Forms.TextBox(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -264,10 +274,14 @@ namespace TemuKJD.WXForms.ProductForms this.fPnlPriceRule.SuspendLayout(); this.ucTabControlMetro1.SuspendLayout(); this.上传参数1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numJumpCnt)).BeginInit(); this.特殊参数.SuspendLayout(); this.佣金上货.SuspendLayout(); this.裂变调试.SuspendLayout(); this.ucGroupBoxEx4.SuspendLayout(); + this.pnlFilterSaleCountNum.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numFilterSaleCountNum)).BeginInit(); + this.pnlFilterViewUv.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.numFilterViewUv)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbSelectProd)).BeginInit(); this.ucGroupBoxEx1.SuspendLayout(); @@ -307,7 +321,7 @@ namespace TemuKJD.WXForms.ProductForms // this.splitContainer1.Panel2.Controls.Add(this.splitContainer3); this.splitContainer1.Size = new System.Drawing.Size(1710, 641); - this.splitContainer1.SplitterDistance = 165; + this.splitContainer1.SplitterDistance = 190; this.splitContainer1.TabIndex = 11; // // ucGroupBoxEx2 @@ -345,7 +359,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx2.Controls.Add(this.label15); this.ucGroupBoxEx2.Location = new System.Drawing.Point(608, 2); this.ucGroupBoxEx2.Name = "ucGroupBoxEx2"; - this.ucGroupBoxEx2.Size = new System.Drawing.Size(1100, 165); + this.ucGroupBoxEx2.Size = new System.Drawing.Size(1100, 189); this.ucGroupBoxEx2.TabIndex = 667; this.ucGroupBoxEx2.TabStop = false; this.ucGroupBoxEx2.Text = "商品上传"; @@ -424,7 +438,7 @@ namespace TemuKJD.WXForms.ProductForms // txtStockNum // this.txtStockNum.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtStockNum.Location = new System.Drawing.Point(378, 135); + this.txtStockNum.Location = new System.Drawing.Point(378, 160); this.txtStockNum.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtStockNum.Name = "txtStockNum"; this.txtStockNum.Size = new System.Drawing.Size(30, 23); @@ -435,7 +449,7 @@ namespace TemuKJD.WXForms.ProductForms // txtShippingPriceTimes // this.txtShippingPriceTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtShippingPriceTimes.Location = new System.Drawing.Point(319, 135); + this.txtShippingPriceTimes.Location = new System.Drawing.Point(319, 160); this.txtShippingPriceTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtShippingPriceTimes.Name = "txtShippingPriceTimes"; this.txtShippingPriceTimes.Size = new System.Drawing.Size(28, 23); @@ -445,7 +459,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAddTimes // this.txtAddTimes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddTimes.Location = new System.Drawing.Point(76, 135); + this.txtAddTimes.Location = new System.Drawing.Point(76, 160); this.txtAddTimes.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddTimes.Name = "txtAddTimes"; this.txtAddTimes.Size = new System.Drawing.Size(28, 23); @@ -456,7 +470,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAddMorePrice // this.txtAddMorePrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtAddMorePrice.Location = new System.Drawing.Point(144, 135); + this.txtAddMorePrice.Location = new System.Drawing.Point(144, 160); this.txtAddMorePrice.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddMorePrice.Name = "txtAddMorePrice"; this.txtAddMorePrice.Size = new System.Drawing.Size(28, 23); @@ -468,7 +482,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label13.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label13.AutoSize = true; - this.label13.Location = new System.Drawing.Point(282, 138); + this.label13.Location = new System.Drawing.Point(282, 163); this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label13.Name = "label13"; this.label13.Size = new System.Drawing.Size(41, 17); @@ -519,7 +533,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkAddMorePriceFirst.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkAddMorePriceFirst.AutoSize = true; - this.chkAddMorePriceFirst.Location = new System.Drawing.Point(190, 136); + this.chkAddMorePriceFirst.Location = new System.Drawing.Point(190, 161); this.chkAddMorePriceFirst.Name = "chkAddMorePriceFirst"; this.chkAddMorePriceFirst.Size = new System.Drawing.Size(99, 21); this.chkAddMorePriceFirst.TabIndex = 625; @@ -558,7 +572,7 @@ namespace TemuKJD.WXForms.ProductForms this.label14.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label14.AutoSize = true; this.label14.ForeColor = System.Drawing.SystemColors.GrayText; - this.label14.Location = new System.Drawing.Point(8, 81); + this.label14.Location = new System.Drawing.Point(8, 106); this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(68, 51); @@ -573,7 +587,7 @@ namespace TemuKJD.WXForms.ProductForms this.pnlStep.Controls.Add(this.panel3); this.pnlStep.Location = new System.Drawing.Point(76, 17); this.pnlStep.Name = "pnlStep"; - this.pnlStep.Size = new System.Drawing.Size(332, 114); + this.pnlStep.Size = new System.Drawing.Size(332, 139); this.pnlStep.TabIndex = 577; // // panel3 @@ -586,7 +600,7 @@ namespace TemuKJD.WXForms.ProductForms this.panel3.Controls.Add(this.fPnlPriceRule); this.panel3.Location = new System.Drawing.Point(1, 1); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(330, 112); + this.panel3.Size = new System.Drawing.Size(330, 137); this.panel3.TabIndex = 541; // // fPnlPriceRule @@ -692,7 +706,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(103, 138); + this.label10.Location = new System.Drawing.Point(103, 163); this.label10.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label10.Name = "label10"; this.label10.Size = new System.Drawing.Size(44, 17); @@ -728,7 +742,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(348, 138); + this.label4.Location = new System.Drawing.Point(348, 163); this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(32, 17); @@ -739,7 +753,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(8, 138); + this.label9.Location = new System.Drawing.Point(8, 163); this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label9.Name = "label9"; this.label9.Size = new System.Drawing.Size(68, 17); @@ -769,11 +783,11 @@ namespace TemuKJD.WXForms.ProductForms this.ucTabControlMetro1.Controls.Add(this.佣金上货); this.ucTabControlMetro1.Controls.Add(this.裂变调试); this.ucTabControlMetro1.ItemSize = new System.Drawing.Size(72, 24); - this.ucTabControlMetro1.Location = new System.Drawing.Point(411, 11); + this.ucTabControlMetro1.Location = new System.Drawing.Point(410, 10); this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(619, 150); + this.ucTabControlMetro1.Size = new System.Drawing.Size(620, 176); this.ucTabControlMetro1.TabIndex = 822; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray; @@ -781,6 +795,8 @@ namespace TemuKJD.WXForms.ProductForms // // 上传参数1 // + this.上传参数1.Controls.Add(this.numJumpCnt); + this.上传参数1.Controls.Add(this.label40); this.上传参数1.Controls.Add(this.chkFreightInsurance); this.上传参数1.Controls.Add(this.chkSameSpecPriceDown); this.上传参数1.Controls.Add(this.chkLowestPriceSku); @@ -817,11 +833,40 @@ namespace TemuKJD.WXForms.ProductForms this.上传参数1.Location = new System.Drawing.Point(4, 28); this.上传参数1.Name = "上传参数1"; this.上传参数1.Padding = new System.Windows.Forms.Padding(3); - this.上传参数1.Size = new System.Drawing.Size(611, 118); + this.上传参数1.Size = new System.Drawing.Size(612, 144); this.上传参数1.TabIndex = 1; this.上传参数1.Text = "上传参数"; this.上传参数1.UseVisualStyleBackColor = true; // + // numJumpCnt + // + this.numJumpCnt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.numJumpCnt.Location = new System.Drawing.Point(152, 118); + this.numJumpCnt.Minimum = new decimal(new int[] { + 3, + 0, + 0, + 0}); + this.numJumpCnt.Name = "numJumpCnt"; + this.numJumpCnt.Size = new System.Drawing.Size(41, 21); + this.numJumpCnt.TabIndex = 932; + this.numJumpCnt.Value = new decimal(new int[] { + 5, + 0, + 0, + 0}); + this.numJumpCnt.ValueChanged += new System.EventHandler(this.numJumpCnt_ValueChanged); + // + // label40 + // + this.label40.AutoSize = true; + this.label40.Location = new System.Drawing.Point(1, 120); + this.label40.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label40.Name = "label40"; + this.label40.Size = new System.Drawing.Size(152, 17); + this.label40.TabIndex = 926; + this.label40.Text = "店铺上传提审受限跳出次数"; + // // chkFreightInsurance // this.chkFreightInsurance.AutoSize = true; @@ -880,7 +925,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkUseRecommand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkUseRecommand.AutoSize = true; - this.chkUseRecommand.Location = new System.Drawing.Point(492, 51); + this.chkUseRecommand.Location = new System.Drawing.Point(493, 51); this.chkUseRecommand.Name = "chkUseRecommand"; this.chkUseRecommand.Size = new System.Drawing.Size(123, 21); this.chkUseRecommand.TabIndex = 907; @@ -967,7 +1012,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkUpDraft.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkUpDraft.AutoSize = true; - this.chkUpDraft.Location = new System.Drawing.Point(492, 72); + this.chkUpDraft.Location = new System.Drawing.Point(493, 72); this.chkUpDraft.Name = "chkUpDraft"; this.chkUpDraft.Size = new System.Drawing.Size(87, 21); this.chkUpDraft.TabIndex = 769; @@ -1030,7 +1075,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtReplaceText.MaxLength = 1000000; this.txtReplaceText.Multiline = true; this.txtReplaceText.Name = "txtReplaceText"; - this.txtReplaceText.Size = new System.Drawing.Size(422, 40); + this.txtReplaceText.Size = new System.Drawing.Size(423, 40); this.txtReplaceText.TabIndex = 740; this.txtReplaceText.Text = "真丝,蚕丝,香云纱,羊绒,羊毛,羊羔绒,羊羔毛,羽绒,皮草"; this.txtReplaceText.TextChanged += new System.EventHandler(this.txtReplaceText_TextChanged); @@ -1203,7 +1248,7 @@ namespace TemuKJD.WXForms.ProductForms this.特殊参数.Location = new System.Drawing.Point(4, 28); this.特殊参数.Name = "特殊参数"; this.特殊参数.Padding = new System.Windows.Forms.Padding(3); - this.特殊参数.Size = new System.Drawing.Size(611, 118); + this.特殊参数.Size = new System.Drawing.Size(612, 144); this.特殊参数.TabIndex = 4; this.特殊参数.Text = "特殊参数"; this.特殊参数.UseVisualStyleBackColor = true; @@ -1212,7 +1257,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSpBrand.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.lblSpBrand.AutoSize = true; - this.lblSpBrand.Location = new System.Drawing.Point(7, 15); + this.lblSpBrand.Location = new System.Drawing.Point(7, 41); this.lblSpBrand.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblSpBrand.Name = "lblSpBrand"; this.lblSpBrand.Size = new System.Drawing.Size(56, 17); @@ -1244,7 +1289,7 @@ namespace TemuKJD.WXForms.ProductForms this.佣金上货.Location = new System.Drawing.Point(4, 28); this.佣金上货.Name = "佣金上货"; this.佣金上货.Padding = new System.Windows.Forms.Padding(3); - this.佣金上货.Size = new System.Drawing.Size(611, 118); + this.佣金上货.Size = new System.Drawing.Size(612, 144); this.佣金上货.TabIndex = 2; this.佣金上货.Text = "佣金上货"; this.佣金上货.UseVisualStyleBackColor = true; @@ -1412,7 +1457,7 @@ namespace TemuKJD.WXForms.ProductForms this.裂变调试.Location = new System.Drawing.Point(4, 28); this.裂变调试.Name = "裂变调试"; this.裂变调试.Padding = new System.Windows.Forms.Padding(3); - this.裂变调试.Size = new System.Drawing.Size(611, 118); + this.裂变调试.Size = new System.Drawing.Size(612, 144); this.裂变调试.TabIndex = 3; this.裂变调试.Text = "裂变调试"; this.裂变调试.UseVisualStyleBackColor = true; @@ -1426,7 +1471,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtFissionTitle.Multiline = true; this.txtFissionTitle.Name = "txtFissionTitle"; this.txtFissionTitle.ScrollBars = System.Windows.Forms.ScrollBars.Both; - this.txtFissionTitle.Size = new System.Drawing.Size(524, 79); + this.txtFissionTitle.Size = new System.Drawing.Size(525, 105); this.txtFissionTitle.TabIndex = 0; this.txtFissionTitle.TextChanged += new System.EventHandler(this.txtFissionTitle_TextChanged); // @@ -1444,7 +1489,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label38.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label38.AutoSize = true; - this.label38.Location = new System.Drawing.Point(259, 93); + this.label38.Location = new System.Drawing.Point(259, 119); this.label38.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label38.Name = "label38"; this.label38.Size = new System.Drawing.Size(80, 17); @@ -1454,7 +1499,7 @@ namespace TemuKJD.WXForms.ProductForms // txtFissionRandomPriceChange // this.txtFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtFissionRandomPriceChange.Location = new System.Drawing.Point(513, 90); + this.txtFissionRandomPriceChange.Location = new System.Drawing.Point(513, 116); this.txtFissionRandomPriceChange.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtFissionRandomPriceChange.Name = "txtFissionRandomPriceChange"; this.txtFissionRandomPriceChange.Size = new System.Drawing.Size(24, 23); @@ -1466,7 +1511,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkFissionRandomPriceChange.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkFissionRandomPriceChange.Checked = true; this.chkFissionRandomPriceChange.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 91); + this.chkFissionRandomPriceChange.Location = new System.Drawing.Point(446, 117); this.chkFissionRandomPriceChange.Name = "chkFissionRandomPriceChange"; this.chkFissionRandomPriceChange.Size = new System.Drawing.Size(75, 21); this.chkFissionRandomPriceChange.TabIndex = 905; @@ -1476,7 +1521,7 @@ namespace TemuKJD.WXForms.ProductForms // txtDetailBorderImgCount // this.txtDetailBorderImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtDetailBorderImgCount.Location = new System.Drawing.Point(212, 90); + this.txtDetailBorderImgCount.Location = new System.Drawing.Point(212, 116); this.txtDetailBorderImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtDetailBorderImgCount.Name = "txtDetailBorderImgCount"; this.txtDetailBorderImgCount.Size = new System.Drawing.Size(24, 23); @@ -1487,7 +1532,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label35.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label35.AutoSize = true; - this.label35.Location = new System.Drawing.Point(171, 93); + this.label35.Location = new System.Drawing.Point(171, 119); this.label35.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label35.Name = "label35"; this.label35.Size = new System.Drawing.Size(44, 17); @@ -1498,7 +1543,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label36.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label36.AutoSize = true; - this.label36.Location = new System.Drawing.Point(235, 93); + this.label36.Location = new System.Drawing.Point(235, 119); this.label36.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label36.Name = "label36"; this.label36.Size = new System.Drawing.Size(20, 17); @@ -1508,7 +1553,7 @@ namespace TemuKJD.WXForms.ProductForms // txtMainBorderImgCount // this.txtMainBorderImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtMainBorderImgCount.Location = new System.Drawing.Point(130, 90); + this.txtMainBorderImgCount.Location = new System.Drawing.Point(130, 116); this.txtMainBorderImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtMainBorderImgCount.Name = "txtMainBorderImgCount"; this.txtMainBorderImgCount.Size = new System.Drawing.Size(24, 23); @@ -1519,7 +1564,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label34.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label34.AutoSize = true; - this.label34.Location = new System.Drawing.Point(101, 93); + this.label34.Location = new System.Drawing.Point(101, 119); this.label34.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label34.Name = "label34"; this.label34.Size = new System.Drawing.Size(32, 17); @@ -1530,7 +1575,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label33.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label33.AutoSize = true; - this.label33.Location = new System.Drawing.Point(153, 93); + this.label33.Location = new System.Drawing.Point(153, 119); this.label33.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label33.Name = "label33"; this.label33.Size = new System.Drawing.Size(20, 17); @@ -1541,7 +1586,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label32.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.label32.AutoSize = true; - this.label32.Location = new System.Drawing.Point(577, 57); + this.label32.Location = new System.Drawing.Point(578, 83); this.label32.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label32.Name = "label32"; this.label32.Size = new System.Drawing.Size(20, 17); @@ -1552,7 +1597,7 @@ namespace TemuKJD.WXForms.ProductForms // txtAiImgCount // this.txtAiImgCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); - this.txtAiImgCount.Location = new System.Drawing.Point(552, 54); + this.txtAiImgCount.Location = new System.Drawing.Point(553, 80); this.txtAiImgCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAiImgCount.Name = "txtAiImgCount"; this.txtAiImgCount.Size = new System.Drawing.Size(24, 23); @@ -1564,7 +1609,7 @@ namespace TemuKJD.WXForms.ProductForms // this.chkAiImage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkAiImage.AutoSize = true; - this.chkAiImage.Location = new System.Drawing.Point(483, 55); + this.chkAiImage.Location = new System.Drawing.Point(484, 81); this.chkAiImage.Name = "chkAiImage"; this.chkAiImage.Size = new System.Drawing.Size(74, 21); this.chkAiImage.TabIndex = 892; @@ -1575,7 +1620,7 @@ namespace TemuKJD.WXForms.ProductForms // chkRandomDetailImgOrder // this.chkRandomDetailImgOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.chkRandomDetailImgOrder.Location = new System.Drawing.Point(383, 91); + this.chkRandomDetailImgOrder.Location = new System.Drawing.Point(383, 117); this.chkRandomDetailImgOrder.Name = "chkRandomDetailImgOrder"; this.chkRandomDetailImgOrder.Size = new System.Drawing.Size(54, 21); this.chkRandomDetailImgOrder.TabIndex = 896; @@ -1585,7 +1630,7 @@ namespace TemuKJD.WXForms.ProductForms // chkRandomMainImgOrder // this.chkRandomMainImgOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.chkRandomMainImgOrder.Location = new System.Drawing.Point(339, 91); + this.chkRandomMainImgOrder.Location = new System.Drawing.Point(339, 117); this.chkRandomMainImgOrder.Name = "chkRandomMainImgOrder"; this.chkRandomMainImgOrder.Size = new System.Drawing.Size(42, 21); this.chkRandomMainImgOrder.TabIndex = 895; @@ -1617,7 +1662,7 @@ namespace TemuKJD.WXForms.ProductForms this.chkRandomImgBorder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.chkRandomImgBorder.Checked = true; this.chkRandomImgBorder.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkRandomImgBorder.Location = new System.Drawing.Point(10, 91); + this.chkRandomImgBorder.Location = new System.Drawing.Point(10, 117); this.chkRandomImgBorder.Name = "chkRandomImgBorder"; this.chkRandomImgBorder.Size = new System.Drawing.Size(94, 21); this.chkRandomImgBorder.TabIndex = 890; @@ -1638,7 +1683,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label37.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label37.AutoSize = true; - this.label37.Location = new System.Drawing.Point(536, 93); + this.label37.Location = new System.Drawing.Point(536, 119); this.label37.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label37.Name = "label37"; this.label37.Size = new System.Drawing.Size(20, 17); @@ -1649,7 +1694,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label15.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label15.AutoSize = true; - this.label15.Location = new System.Drawing.Point(171, 138); + this.label15.Location = new System.Drawing.Point(171, 163); this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label15.Name = "label15"; this.label15.Size = new System.Drawing.Size(20, 17); @@ -1662,17 +1707,18 @@ namespace TemuKJD.WXForms.ProductForms | 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.pnlFilterSaleCountNum); + this.ucGroupBoxEx4.Controls.Add(this.pnlFilterViewUv); this.ucGroupBoxEx4.Controls.Add(this.txtUpdateInDays); - this.ucGroupBoxEx4.Controls.Add(this.chkUpdateInDays); - this.ucGroupBoxEx4.Controls.Add(this.numFilterViewUv); + this.ucGroupBoxEx4.Controls.Add(this.cmbUpdateInDays); this.ucGroupBoxEx4.Controls.Add(this.cmbNotes); this.ucGroupBoxEx4.Controls.Add(this.cmbJstInitSet); - this.ucGroupBoxEx4.Controls.Add(this.pbSelectProd); this.ucGroupBoxEx4.Controls.Add(this.chkSkipQualification); - this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); this.ucGroupBoxEx4.Controls.Add(this.txtRandomFissionProductCount); this.ucGroupBoxEx4.Controls.Add(this.lblJstInitSet); this.ucGroupBoxEx4.Controls.Add(this.btnSwitchCatType); + this.ucGroupBoxEx4.Controls.Add(this.lblUpdateInDays); + this.ucGroupBoxEx4.Controls.Add(this.chkRandomFissionProduct); this.ucGroupBoxEx4.Controls.Add(this.cmbHot); this.ucGroupBoxEx4.Controls.Add(this.btnProdDb); this.ucGroupBoxEx4.Controls.Add(this.txtAddCount); @@ -1696,46 +1742,146 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx4.Controls.Add(this.lblIdFilter); this.ucGroupBoxEx4.Controls.Add(this.lblHot); this.ucGroupBoxEx4.Controls.Add(this.label19); - this.ucGroupBoxEx4.Controls.Add(this.chkRandomFissionProduct); + this.ucGroupBoxEx4.Controls.Add(this.lblNotes); + this.ucGroupBoxEx4.Controls.Add(this.pbSelectProd); + this.ucGroupBoxEx4.Controls.Add(this.lblGoodsCount); this.ucGroupBoxEx4.Controls.Add(this.lblWaitToUp); this.ucGroupBoxEx4.Controls.Add(this.chkWXComplateProd); - this.ucGroupBoxEx4.Controls.Add(this.lblNotes); + this.ucGroupBoxEx4.Controls.Add(this.chkUpdateInDays); + this.ucGroupBoxEx4.Controls.Add(this.chkFilterSaleCountNum); this.ucGroupBoxEx4.Controls.Add(this.chkFilterViewUv); this.ucGroupBoxEx4.Location = new System.Drawing.Point(186, 2); this.ucGroupBoxEx4.Name = "ucGroupBoxEx4"; - this.ucGroupBoxEx4.Size = new System.Drawing.Size(423, 165); + this.ucGroupBoxEx4.Size = new System.Drawing.Size(423, 189); this.ucGroupBoxEx4.TabIndex = 666; this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "待传商品"; // + // pnlFilterSaleCountNum + // + this.pnlFilterSaleCountNum.Controls.Add(this.label42); + this.pnlFilterSaleCountNum.Controls.Add(this.numFilterSaleCountNum); + this.pnlFilterSaleCountNum.Location = new System.Drawing.Point(326, 98); + this.pnlFilterSaleCountNum.Name = "pnlFilterSaleCountNum"; + this.pnlFilterSaleCountNum.Size = new System.Drawing.Size(92, 25); + this.pnlFilterSaleCountNum.TabIndex = 991; + this.pnlFilterSaleCountNum.Visible = false; + // + // label42 + // + this.label42.AutoSize = true; + this.label42.Location = new System.Drawing.Point(63, 4); + this.label42.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label42.Name = "label42"; + this.label42.Size = new System.Drawing.Size(32, 17); + this.label42.TabIndex = 932; + this.label42.Text = "以上"; + // + // numFilterSaleCountNum + // + this.numFilterSaleCountNum.Font = new System.Drawing.Font("微软雅黑", 10F); + this.numFilterSaleCountNum.Location = new System.Drawing.Point(0, 0); + this.numFilterSaleCountNum.Maximum = new decimal(new int[] { + 99999999, + 0, + 0, + 0}); + this.numFilterSaleCountNum.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.numFilterSaleCountNum.Name = "numFilterSaleCountNum"; + this.numFilterSaleCountNum.Size = new System.Drawing.Size(63, 25); + this.numFilterSaleCountNum.TabIndex = 931; + this.numFilterSaleCountNum.Value = new decimal(new int[] { + 1, + 0, + 0, + 0}); + // + // chkFilterSaleCountNum + // + this.chkFilterSaleCountNum.Location = new System.Drawing.Point(284, 102); + this.chkFilterSaleCountNum.Name = "chkFilterSaleCountNum"; + this.chkFilterSaleCountNum.Size = new System.Drawing.Size(44, 17); + this.chkFilterSaleCountNum.TabIndex = 990; + this.chkFilterSaleCountNum.Text = "销量"; + this.chkFilterSaleCountNum.UseVisualStyleBackColor = true; + this.chkFilterSaleCountNum.Visible = false; + // + // pnlFilterViewUv + // + this.pnlFilterViewUv.Controls.Add(this.label41); + this.pnlFilterViewUv.Controls.Add(this.numFilterViewUv); + this.pnlFilterViewUv.Location = new System.Drawing.Point(191, 98); + this.pnlFilterViewUv.Name = "pnlFilterViewUv"; + this.pnlFilterViewUv.Size = new System.Drawing.Size(92, 25); + this.pnlFilterViewUv.TabIndex = 989; + this.pnlFilterViewUv.Visible = false; + // + // label41 + // + this.label41.AutoSize = true; + this.label41.Location = new System.Drawing.Point(63, 4); + this.label41.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.label41.Name = "label41"; + this.label41.Size = new System.Drawing.Size(32, 17); + this.label41.TabIndex = 932; + this.label41.Text = "以上"; + // // numFilterViewUv // this.numFilterViewUv.Font = new System.Drawing.Font("微软雅黑", 10F); - this.numFilterViewUv.Location = new System.Drawing.Point(191, 100); + this.numFilterViewUv.Location = new System.Drawing.Point(0, 0); this.numFilterViewUv.Maximum = new decimal(new int[] { 99999999, 0, 0, 0}); this.numFilterViewUv.Minimum = new decimal(new int[] { - 200, + 1, 0, 0, 0}); this.numFilterViewUv.Name = "numFilterViewUv"; - this.numFilterViewUv.Size = new System.Drawing.Size(46, 25); + this.numFilterViewUv.Size = new System.Drawing.Size(63, 25); this.numFilterViewUv.TabIndex = 931; this.numFilterViewUv.Value = new decimal(new int[] { 200, 0, 0, 0}); - this.numFilterViewUv.Visible = false; + // + // txtUpdateInDays + // + this.txtUpdateInDays.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txtUpdateInDays.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txtUpdateInDays.Location = new System.Drawing.Point(55, 125); + this.txtUpdateInDays.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); + this.txtUpdateInDays.Name = "txtUpdateInDays"; + this.txtUpdateInDays.Size = new System.Drawing.Size(30, 25); + this.txtUpdateInDays.TabIndex = 912; + this.txtUpdateInDays.Text = "30"; + this.txtUpdateInDays.Visible = false; + // + // cmbUpdateInDays + // + this.cmbUpdateInDays.FormattingEnabled = true; + this.cmbUpdateInDays.Items.AddRange(new object[] { + "新增", + "更新"}); + this.cmbUpdateInDays.Location = new System.Drawing.Point(99, 125); + this.cmbUpdateInDays.Name = "cmbUpdateInDays"; + this.cmbUpdateInDays.Size = new System.Drawing.Size(48, 25); + this.cmbUpdateInDays.TabIndex = 970; + this.cmbUpdateInDays.Text = "新增"; + this.cmbUpdateInDays.Visible = false; // // cmbNotes // this.cmbNotes.FormattingEnabled = true; - this.cmbNotes.Location = new System.Drawing.Point(326, 46); + this.cmbNotes.Location = new System.Drawing.Point(326, 44); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(92, 25); this.cmbNotes.TabIndex = 823; @@ -1748,63 +1894,27 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbJstInitSet.Location = new System.Drawing.Point(242, 132); + this.cmbJstInitSet.Location = new System.Drawing.Point(242, 157); this.cmbJstInitSet.Name = "cmbJstInitSet"; this.cmbJstInitSet.Size = new System.Drawing.Size(33, 25); this.cmbJstInitSet.TabIndex = 697; this.cmbJstInitSet.Text = "是"; this.cmbJstInitSet.Visible = false; // - // pbSelectProd - // - this.pbSelectProd.BackColor = System.Drawing.Color.Transparent; - this.pbSelectProd.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbSelectProd.Location = new System.Drawing.Point(89, 134); - this.pbSelectProd.Name = "pbSelectProd"; - this.pbSelectProd.Size = new System.Drawing.Size(21, 21); - this.pbSelectProd.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; - this.pbSelectProd.TabIndex = 781; - this.pbSelectProd.TabStop = false; - this.pbSelectProd.Visible = false; - this.pbSelectProd.Click += new System.EventHandler(this.pbSelectProd_Click); - // - // chkSevenDays - // - this.chkSevenDays.Location = new System.Drawing.Point(291, 84); - this.chkSevenDays.Name = "chkSevenDays"; - this.chkSevenDays.Size = new System.Drawing.Size(80, 17); - this.chkSevenDays.TabIndex = 805; - this.chkSevenDays.Text = "近七日爆款"; - this.chkSevenDays.UseVisualStyleBackColor = true; - this.chkSevenDays.Visible = false; - // // chkSkipQualification // - this.chkSkipQualification.Location = new System.Drawing.Point(5, 144); + this.chkSkipQualification.Location = new System.Drawing.Point(5, 160); this.chkSkipQualification.Name = "chkSkipQualification"; this.chkSkipQualification.Size = new System.Drawing.Size(80, 17); this.chkSkipQualification.TabIndex = 806; this.chkSkipQualification.Text = "跳过资质品"; this.chkSkipQualification.UseVisualStyleBackColor = true; // - // lblGoodsCount - // - this.lblGoodsCount.AutoSize = true; - this.lblGoodsCount.BackColor = System.Drawing.Color.Transparent; - this.lblGoodsCount.Location = new System.Drawing.Point(106, 127); - this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblGoodsCount.Name = "lblGoodsCount"; - this.lblGoodsCount.Size = new System.Drawing.Size(71, 17); - this.lblGoodsCount.TabIndex = 537; - this.lblGoodsCount.Text = "产品库 0 件"; - this.lblGoodsCount.Click += new System.EventHandler(this.lblGoodsCount_Click); - // // txtRandomFissionProductCount // - this.txtRandomFissionProductCount.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.txtRandomFissionProductCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtRandomFissionProductCount.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtRandomFissionProductCount.Location = new System.Drawing.Point(297, 103); + this.txtRandomFissionProductCount.Location = new System.Drawing.Point(347, 125); this.txtRandomFissionProductCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtRandomFissionProductCount.Name = "txtRandomFissionProductCount"; this.txtRandomFissionProductCount.Size = new System.Drawing.Size(30, 25); @@ -1816,7 +1926,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblJstInitSet.AutoSize = true; this.lblJstInitSet.BackColor = System.Drawing.Color.Transparent; - this.lblJstInitSet.Location = new System.Drawing.Point(214, 136); + this.lblJstInitSet.Location = new System.Drawing.Point(214, 162); this.lblJstInitSet.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblJstInitSet.Name = "lblJstInitSet"; this.lblJstInitSet.Size = new System.Drawing.Size(32, 17); @@ -1830,7 +1940,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnSwitchCatType.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSwitchCatType.DisabledBackColor = System.Drawing.Color.Empty; this.btnSwitchCatType.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSwitchCatType.Location = new System.Drawing.Point(5, 21); + this.btnSwitchCatType.Location = new System.Drawing.Point(5, 19); this.btnSwitchCatType.Name = "btnSwitchCatType"; this.btnSwitchCatType.Size = new System.Drawing.Size(17, 21); this.btnSwitchCatType.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1848,6 +1958,28 @@ namespace TemuKJD.WXForms.ProductForms this.btnSwitchCatType.Text = "W"; this.btnSwitchCatType.Click += new System.EventHandler(this.btnSwitchCatType_Click); // + // lblUpdateInDays + // + this.lblUpdateInDays.AutoSize = true; + this.lblUpdateInDays.Location = new System.Drawing.Point(83, 129); + this.lblUpdateInDays.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblUpdateInDays.Name = "lblUpdateInDays"; + this.lblUpdateInDays.Size = new System.Drawing.Size(20, 17); + this.lblUpdateInDays.TabIndex = 969; + this.lblUpdateInDays.Text = "日"; + this.lblUpdateInDays.Visible = false; + // + // chkRandomFissionProduct + // + this.chkRandomFissionProduct.AutoSize = true; + this.chkRandomFissionProduct.Location = new System.Drawing.Point(257, 127); + this.chkRandomFissionProduct.Name = "chkRandomFissionProduct"; + this.chkRandomFissionProduct.Size = new System.Drawing.Size(99, 21); + this.chkRandomFissionProduct.TabIndex = 910; + this.chkRandomFissionProduct.Text = "裂变标题数量"; + this.chkRandomFissionProduct.UseVisualStyleBackColor = true; + this.chkRandomFissionProduct.Visible = false; + // // cmbHot // this.cmbHot.FormattingEnabled = true; @@ -1855,7 +1987,7 @@ namespace TemuKJD.WXForms.ProductForms "", "爆款数据", "普通商品"}); - this.cmbHot.Location = new System.Drawing.Point(326, 73); + this.cmbHot.Location = new System.Drawing.Point(326, 71); this.cmbHot.Name = "cmbHot"; this.cmbHot.Size = new System.Drawing.Size(92, 25); this.cmbHot.TabIndex = 837; @@ -1870,7 +2002,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnProdDb.Cursor = System.Windows.Forms.Cursors.Hand; this.btnProdDb.DisabledBackColor = System.Drawing.Color.Empty; this.btnProdDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnProdDb.Location = new System.Drawing.Point(387, 132); + this.btnProdDb.Location = new System.Drawing.Point(387, 157); this.btnProdDb.Name = "btnProdDb"; this.btnProdDb.Size = new System.Drawing.Size(31, 25); this.btnProdDb.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1892,7 +2024,7 @@ namespace TemuKJD.WXForms.ProductForms // this.txtAddCount.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtAddCount.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtAddCount.Location = new System.Drawing.Point(310, 132); + this.txtAddCount.Location = new System.Drawing.Point(310, 157); this.txtAddCount.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtAddCount.Name = "txtAddCount"; this.txtAddCount.Size = new System.Drawing.Size(29, 25); @@ -1903,7 +2035,7 @@ namespace TemuKJD.WXForms.ProductForms // this.txtSearchGoodsName.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtSearchGoodsName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtSearchGoodsName.Location = new System.Drawing.Point(191, 46); + this.txtSearchGoodsName.Location = new System.Drawing.Point(191, 44); this.txtSearchGoodsName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSearchGoodsName.Name = "txtSearchGoodsName"; this.txtSearchGoodsName.Size = new System.Drawing.Size(92, 25); @@ -1924,7 +2056,7 @@ namespace TemuKJD.WXForms.ProductForms "机会商品", "以图搜品", "多多外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(55, 73); + this.cmbSourceType.Location = new System.Drawing.Point(55, 71); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(92, 25); this.cmbSourceType.TabIndex = 673; @@ -1940,7 +2072,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter3.DropDownWidth = 1; this.cmbCateFilter3.FormattingEnabled = true; this.cmbCateFilter3.IntegralHeight = false; - this.cmbCateFilter3.Location = new System.Drawing.Point(326, 19); + this.cmbCateFilter3.Location = new System.Drawing.Point(326, 17); this.cmbCateFilter3.Name = "cmbCateFilter3"; this.cmbCateFilter3.Size = new System.Drawing.Size(92, 25); this.cmbCateFilter3.TabIndex = 710; @@ -1951,7 +2083,7 @@ namespace TemuKJD.WXForms.ProductForms // label21 // this.label21.AutoSize = true; - this.label21.Location = new System.Drawing.Point(291, 23); + this.label21.Location = new System.Drawing.Point(291, 21); this.label21.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label21.Name = "label21"; this.label21.Size = new System.Drawing.Size(39, 17); @@ -1961,7 +2093,7 @@ namespace TemuKJD.WXForms.ProductForms // cmbGroupFilter // this.cmbGroupFilter.FormattingEnabled = true; - this.cmbGroupFilter.Location = new System.Drawing.Point(191, 73); + this.cmbGroupFilter.Location = new System.Drawing.Point(191, 71); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(92, 25); this.cmbGroupFilter.TabIndex = 641; @@ -1972,7 +2104,7 @@ namespace TemuKJD.WXForms.ProductForms // this.txtIdFilter.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtIdFilter.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtIdFilter.Location = new System.Drawing.Point(55, 100); + this.txtIdFilter.Location = new System.Drawing.Point(55, 98); this.txtIdFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtIdFilter.Name = "txtIdFilter"; this.txtIdFilter.Size = new System.Drawing.Size(92, 25); @@ -1986,7 +2118,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter2.DropDownWidth = 1; this.cmbCateFilter2.FormattingEnabled = true; this.cmbCateFilter2.IntegralHeight = false; - this.cmbCateFilter2.Location = new System.Drawing.Point(191, 19); + this.cmbCateFilter2.Location = new System.Drawing.Point(191, 17); this.cmbCateFilter2.Name = "cmbCateFilter2"; this.cmbCateFilter2.Size = new System.Drawing.Size(92, 25); this.cmbCateFilter2.TabIndex = 708; @@ -2000,7 +2132,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearFilter.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearFilter.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearFilter.Location = new System.Drawing.Point(387, 103); + this.btnClearFilter.Location = new System.Drawing.Point(387, 125); this.btnClearFilter.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearFilter.Name = "btnClearFilter"; this.btnClearFilter.Size = new System.Drawing.Size(31, 25); @@ -2027,7 +2159,7 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(55, 46); + this.cmbWxSafe.Location = new System.Drawing.Point(55, 44); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(92, 25); this.cmbWxSafe.TabIndex = 675; @@ -2039,7 +2171,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnClearUpload.CanvasColor = System.Drawing.SystemColors.Control; this.btnClearUpload.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnClearUpload.DisabledBackColor = System.Drawing.Color.Empty; - this.btnClearUpload.Location = new System.Drawing.Point(277, 132); + this.btnClearUpload.Location = new System.Drawing.Point(277, 157); this.btnClearUpload.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnClearUpload.Name = "btnClearUpload"; this.btnClearUpload.Size = new System.Drawing.Size(31, 25); @@ -2066,7 +2198,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCateFilter1.DropDownWidth = 1; this.cmbCateFilter1.FormattingEnabled = true; this.cmbCateFilter1.IntegralHeight = false; - this.cmbCateFilter1.Location = new System.Drawing.Point(55, 19); + this.cmbCateFilter1.Location = new System.Drawing.Point(55, 17); this.cmbCateFilter1.Name = "cmbCateFilter1"; this.cmbCateFilter1.Size = new System.Drawing.Size(92, 25); this.cmbCateFilter1.TabIndex = 663; @@ -2077,7 +2209,7 @@ namespace TemuKJD.WXForms.ProductForms // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(20, 23); + this.label2.Location = new System.Drawing.Point(20, 21); this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(39, 17); @@ -2090,7 +2222,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRandomAdd.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRandomAdd.DisabledBackColor = System.Drawing.Color.Empty; this.btnRandomAdd.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRandomAdd.Location = new System.Drawing.Point(341, 132); + this.btnRandomAdd.Location = new System.Drawing.Point(341, 157); this.btnRandomAdd.Name = "btnRandomAdd"; this.btnRandomAdd.Size = new System.Drawing.Size(44, 25); this.btnRandomAdd.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2111,7 +2243,7 @@ namespace TemuKJD.WXForms.ProductForms // lblSourceType // this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(27, 77); + this.lblSourceType.Location = new System.Drawing.Point(27, 75); this.lblSourceType.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblSourceType.Name = "lblSourceType"; this.lblSourceType.Size = new System.Drawing.Size(32, 17); @@ -2122,7 +2254,7 @@ namespace TemuKJD.WXForms.ProductForms // lblGroupFilter // this.lblGroupFilter.AutoSize = true; - this.lblGroupFilter.Location = new System.Drawing.Point(162, 77); + this.lblGroupFilter.Location = new System.Drawing.Point(162, 75); this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblGroupFilter.Name = "lblGroupFilter"; this.lblGroupFilter.Size = new System.Drawing.Size(32, 17); @@ -2133,7 +2265,7 @@ namespace TemuKJD.WXForms.ProductForms // lblWxSafe // this.lblWxSafe.AutoSize = true; - this.lblWxSafe.Location = new System.Drawing.Point(3, 49); + this.lblWxSafe.Location = new System.Drawing.Point(3, 47); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; this.lblWxSafe.Size = new System.Drawing.Size(56, 17); @@ -2143,7 +2275,7 @@ namespace TemuKJD.WXForms.ProductForms // label20 // this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(162, 50); + this.label20.Location = new System.Drawing.Point(162, 48); this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label20.Name = "label20"; this.label20.Size = new System.Drawing.Size(32, 17); @@ -2152,7 +2284,7 @@ namespace TemuKJD.WXForms.ProductForms // // lblIdFilter // - this.lblIdFilter.Location = new System.Drawing.Point(27, 104); + this.lblIdFilter.Location = new System.Drawing.Point(27, 102); this.lblIdFilter.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblIdFilter.Name = "lblIdFilter"; this.lblIdFilter.Size = new System.Drawing.Size(32, 17); @@ -2164,7 +2296,7 @@ namespace TemuKJD.WXForms.ProductForms // lblHot // this.lblHot.AutoSize = true; - this.lblHot.Location = new System.Drawing.Point(298, 77); + this.lblHot.Location = new System.Drawing.Point(298, 75); this.lblHot.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblHot.Name = "lblHot"; this.lblHot.Size = new System.Drawing.Size(32, 17); @@ -2175,23 +2307,58 @@ namespace TemuKJD.WXForms.ProductForms // label19 // this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(155, 23); + this.label19.Location = new System.Drawing.Point(155, 21); this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label19.Name = "label19"; this.label19.Size = new System.Drawing.Size(39, 17); this.label19.TabIndex = 707; this.label19.Text = "类目2"; // - // chkRandomFissionProduct + // lblNotes // - this.chkRandomFissionProduct.AutoSize = true; - this.chkRandomFissionProduct.Location = new System.Drawing.Point(242, 96); - this.chkRandomFissionProduct.Name = "chkRandomFissionProduct"; - this.chkRandomFissionProduct.Size = new System.Drawing.Size(63, 38); - this.chkRandomFissionProduct.TabIndex = 910; - this.chkRandomFissionProduct.Text = "裂变标\r\n题数量"; - this.chkRandomFissionProduct.UseVisualStyleBackColor = true; - this.chkRandomFissionProduct.Visible = false; + this.lblNotes.AutoSize = true; + this.lblNotes.Location = new System.Drawing.Point(298, 48); + this.lblNotes.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblNotes.Name = "lblNotes"; + this.lblNotes.Size = new System.Drawing.Size(32, 17); + this.lblNotes.TabIndex = 822; + this.lblNotes.Text = "备注"; + this.lblNotes.Visible = false; + // + // chkFilterViewUv + // + this.chkFilterViewUv.Location = new System.Drawing.Point(149, 102); + this.chkFilterViewUv.Name = "chkFilterViewUv"; + this.chkFilterViewUv.Size = new System.Drawing.Size(44, 17); + this.chkFilterViewUv.TabIndex = 911; + this.chkFilterViewUv.Text = "曝光"; + this.chkFilterViewUv.UseVisualStyleBackColor = true; + this.chkFilterViewUv.Visible = false; + // + // pbSelectProd + // + this.pbSelectProd.BackColor = System.Drawing.Color.Transparent; + this.pbSelectProd.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbSelectProd.Location = new System.Drawing.Point(87, 158); + this.pbSelectProd.Name = "pbSelectProd"; + this.pbSelectProd.Size = new System.Drawing.Size(21, 21); + this.pbSelectProd.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbSelectProd.TabIndex = 781; + this.pbSelectProd.TabStop = false; + this.pbSelectProd.Visible = false; + this.pbSelectProd.Click += new System.EventHandler(this.pbSelectProd_Click); + // + // lblGoodsCount + // + this.lblGoodsCount.AutoSize = true; + this.lblGoodsCount.BackColor = System.Drawing.Color.Transparent; + this.lblGoodsCount.Location = new System.Drawing.Point(104, 152); + this.lblGoodsCount.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); + this.lblGoodsCount.Name = "lblGoodsCount"; + this.lblGoodsCount.Size = new System.Drawing.Size(71, 17); + this.lblGoodsCount.TabIndex = 537; + this.lblGoodsCount.Text = "产品库 0 件"; + this.lblGoodsCount.Click += new System.EventHandler(this.lblGoodsCount_Click); // // lblWaitToUp // @@ -2200,7 +2367,7 @@ namespace TemuKJD.WXForms.ProductForms this.lblWaitToUp.Cursor = System.Windows.Forms.Cursors.Hand; this.lblWaitToUp.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblWaitToUp.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.lblWaitToUp.Location = new System.Drawing.Point(106, 144); + this.lblWaitToUp.Location = new System.Drawing.Point(104, 168); this.lblWaitToUp.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.lblWaitToUp.Name = "lblWaitToUp"; this.lblWaitToUp.Size = new System.Drawing.Size(71, 17); @@ -2211,34 +2378,23 @@ namespace TemuKJD.WXForms.ProductForms // chkWXComplateProd // this.chkWXComplateProd.AutoSize = true; - this.chkWXComplateProd.Location = new System.Drawing.Point(331, 96); + this.chkWXComplateProd.Location = new System.Drawing.Point(159, 127); this.chkWXComplateProd.Name = "chkWXComplateProd"; - this.chkWXComplateProd.Size = new System.Drawing.Size(63, 38); + this.chkWXComplateProd.Size = new System.Drawing.Size(99, 21); this.chkWXComplateProd.TabIndex = 807; - this.chkWXComplateProd.Text = "微信回\r\n采商品"; + this.chkWXComplateProd.Text = "微信回采商品"; this.chkWXComplateProd.UseVisualStyleBackColor = true; this.chkWXComplateProd.Visible = false; // - // lblNotes + // chkUpdateInDays // - this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(298, 50); - this.lblNotes.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); - this.lblNotes.Name = "lblNotes"; - this.lblNotes.Size = new System.Drawing.Size(32, 17); - this.lblNotes.TabIndex = 822; - this.lblNotes.Text = "备注"; - this.lblNotes.Visible = false; - // - // chkFilterViewUv - // - this.chkFilterViewUv.Location = new System.Drawing.Point(149, 104); - this.chkFilterViewUv.Name = "chkFilterViewUv"; - this.chkFilterViewUv.Size = new System.Drawing.Size(44, 17); - this.chkFilterViewUv.TabIndex = 911; - this.chkFilterViewUv.Text = "曝光"; - this.chkFilterViewUv.UseVisualStyleBackColor = true; - this.chkFilterViewUv.Visible = false; + this.chkUpdateInDays.Location = new System.Drawing.Point(14, 129); + this.chkUpdateInDays.Name = "chkUpdateInDays"; + this.chkUpdateInDays.Size = new System.Drawing.Size(44, 17); + this.chkUpdateInDays.TabIndex = 950; + this.chkUpdateInDays.Text = "筛选"; + this.chkUpdateInDays.UseVisualStyleBackColor = true; + this.chkUpdateInDays.Visible = false; // // ucGroupBoxEx1 // @@ -2263,7 +2419,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucGroupBoxEx1.Controls.Add(this.label17); this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2); this.ucGroupBoxEx1.Name = "ucGroupBoxEx1"; - this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 165); + this.ucGroupBoxEx1.Size = new System.Drawing.Size(185, 189); this.ucGroupBoxEx1.TabIndex = 399; this.ucGroupBoxEx1.TabStop = false; this.ucGroupBoxEx1.Text = "店铺筛选"; @@ -2275,7 +2431,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbFilterShopGroup.DropDownWidth = 1; this.cmbFilterShopGroup.FormattingEnabled = true; this.cmbFilterShopGroup.IntegralHeight = false; - this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 92); + this.cmbFilterShopGroup.Location = new System.Drawing.Point(38, 102); this.cmbFilterShopGroup.Name = "cmbFilterShopGroup"; this.cmbFilterShopGroup.Size = new System.Drawing.Size(137, 25); this.cmbFilterShopGroup.TabIndex = 832; @@ -2284,7 +2440,7 @@ namespace TemuKJD.WXForms.ProductForms // label24 // this.label24.AutoSize = true; - this.label24.Location = new System.Drawing.Point(7, 96); + this.label24.Location = new System.Drawing.Point(7, 106); this.label24.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label24.Name = "label24"; this.label24.Size = new System.Drawing.Size(32, 17); @@ -2297,7 +2453,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshAuthor.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshAuthor.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshAuthor.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshAuthor.Location = new System.Drawing.Point(93, 18); + this.btnRefreshAuthor.Location = new System.Drawing.Point(93, 28); this.btnRefreshAuthor.Name = "btnRefreshAuthor"; this.btnRefreshAuthor.Size = new System.Drawing.Size(82, 18); this.btnRefreshAuthor.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2321,7 +2477,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOffline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOffline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOffline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOffline.Location = new System.Drawing.Point(59, 139); + this.btnSelectOffline.Location = new System.Drawing.Point(59, 149); this.btnSelectOffline.Name = "btnSelectOffline"; this.btnSelectOffline.Size = new System.Drawing.Size(48, 18); this.btnSelectOffline.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2345,7 +2501,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnSelectOnline.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSelectOnline.DisabledBackColor = System.Drawing.Color.Empty; this.btnSelectOnline.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelectOnline.Location = new System.Drawing.Point(9, 139); + this.btnSelectOnline.Location = new System.Drawing.Point(9, 149); this.btnSelectOnline.Name = "btnSelectOnline"; this.btnSelectOnline.Size = new System.Drawing.Size(48, 18); this.btnSelectOnline.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2369,7 +2525,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnAddUnSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddUnSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddUnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddUnSelect.Location = new System.Drawing.Point(76, 119); + this.btnAddUnSelect.Location = new System.Drawing.Point(76, 129); this.btnAddUnSelect.Name = "btnAddUnSelect"; this.btnAddUnSelect.Size = new System.Drawing.Size(65, 18); this.btnAddUnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2393,7 +2549,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnReverse.Cursor = System.Windows.Forms.Cursors.Hand; this.btnReverse.DisabledBackColor = System.Drawing.Color.Empty; this.btnReverse.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnReverse.Location = new System.Drawing.Point(109, 139); + this.btnReverse.Location = new System.Drawing.Point(109, 149); this.btnReverse.Name = "btnReverse"; this.btnReverse.Size = new System.Drawing.Size(32, 18); this.btnReverse.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2418,7 +2574,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbFilterShopNotes.DropDownWidth = 1; this.cmbFilterShopNotes.FormattingEnabled = true; this.cmbFilterShopNotes.IntegralHeight = false; - this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 65); + this.cmbFilterShopNotes.Location = new System.Drawing.Point(38, 75); this.cmbFilterShopNotes.Name = "cmbFilterShopNotes"; this.cmbFilterShopNotes.Size = new System.Drawing.Size(137, 25); this.cmbFilterShopNotes.TabIndex = 442; @@ -2430,7 +2586,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnAddSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnAddSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnAddSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnAddSelect.Location = new System.Drawing.Point(9, 119); + this.btnAddSelect.Location = new System.Drawing.Point(9, 129); this.btnAddSelect.Name = "btnAddSelect"; this.btnAddSelect.Size = new System.Drawing.Size(65, 18); this.btnAddSelect.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2453,7 +2609,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnEmptyShop.CanvasColor = System.Drawing.SystemColors.Control; this.btnEmptyShop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnEmptyShop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnEmptyShop.Location = new System.Drawing.Point(143, 139); + this.btnEmptyShop.Location = new System.Drawing.Point(143, 149); this.btnEmptyShop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2); this.btnEmptyShop.Name = "btnEmptyShop"; this.btnEmptyShop.Size = new System.Drawing.Size(32, 18); @@ -2479,7 +2635,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnFilterShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnFilterShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnFilterShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnFilterShop.Location = new System.Drawing.Point(143, 119); + this.btnFilterShop.Location = new System.Drawing.Point(143, 129); this.btnFilterShop.Name = "btnFilterShop"; this.btnFilterShop.Size = new System.Drawing.Size(32, 18); this.btnFilterShop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2500,7 +2656,7 @@ namespace TemuKJD.WXForms.ProductForms // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(7, 69); + this.label16.Location = new System.Drawing.Point(7, 79); this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(32, 17); @@ -2510,7 +2666,7 @@ namespace TemuKJD.WXForms.ProductForms // txtFilterShopName // this.txtFilterShopName.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtFilterShopName.Location = new System.Drawing.Point(38, 38); + this.txtFilterShopName.Location = new System.Drawing.Point(38, 48); this.txtFilterShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtFilterShopName.Name = "txtFilterShopName"; this.txtFilterShopName.Size = new System.Drawing.Size(137, 25); @@ -2522,7 +2678,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand; this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty; this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnRefreshShop.Location = new System.Drawing.Point(9, 18); + this.btnRefreshShop.Location = new System.Drawing.Point(9, 28); this.btnRefreshShop.Name = "btnRefreshShop"; this.btnRefreshShop.Size = new System.Drawing.Size(82, 18); this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -2543,7 +2699,7 @@ namespace TemuKJD.WXForms.ProductForms // label17 // this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(7, 42); + this.label17.Location = new System.Drawing.Point(7, 52); this.label17.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(32, 17); @@ -2565,8 +2721,8 @@ namespace TemuKJD.WXForms.ProductForms // splitContainer3.Panel2 // this.splitContainer3.Panel2.Controls.Add(this.splitContainer4); - this.splitContainer3.Size = new System.Drawing.Size(1710, 472); - this.splitContainer3.SplitterDistance = 442; + this.splitContainer3.Size = new System.Drawing.Size(1710, 447); + this.splitContainer3.SplitterDistance = 418; this.splitContainer3.TabIndex = 1; // // splitContainer2 @@ -2596,7 +2752,7 @@ namespace TemuKJD.WXForms.ProductForms this.splitContainer2.Panel2.Controls.Add(this.chkTestNoAuditUpload); this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct); this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0); - this.splitContainer2.Size = new System.Drawing.Size(1710, 442); + this.splitContainer2.Size = new System.Drawing.Size(1710, 418); this.splitContainer2.SplitterDistance = 410; this.splitContainer2.TabIndex = 0; // @@ -2640,7 +2796,7 @@ namespace TemuKJD.WXForms.ProductForms // this.pbLoadingShop.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoadingShop.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoadingShop.Location = new System.Drawing.Point(180, 196); + this.pbLoadingShop.Location = new System.Drawing.Point(180, 187); this.pbLoadingShop.Name = "pbLoadingShop"; this.pbLoadingShop.Size = new System.Drawing.Size(50, 50); this.pbLoadingShop.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -2659,23 +2815,33 @@ namespace TemuKJD.WXForms.ProductForms this.lblExtCodeFilter.Text = "货号"; this.lblExtCodeFilter.Visible = false; // + // chkSevenDays + // + this.chkSevenDays.Location = new System.Drawing.Point(291, 84); + this.chkSevenDays.Name = "chkSevenDays"; + this.chkSevenDays.Size = new System.Drawing.Size(80, 17); + this.chkSevenDays.TabIndex = 805; + this.chkSevenDays.Text = "近七日爆款"; + this.chkSevenDays.UseVisualStyleBackColor = true; + this.chkSevenDays.Visible = false; + // // dgvShop // this.dgvShop.AllowUserToAddRows = false; this.dgvShop.AllowUserToDeleteRows = false; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; 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))))); - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle10.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colSelect, @@ -2699,7 +2865,7 @@ namespace TemuKJD.WXForms.ProductForms this.dgvShop.ReadOnly = true; this.dgvShop.RowHeadersWidth = 25; this.dgvShop.RowTemplate.Height = 23; - this.dgvShop.Size = new System.Drawing.Size(406, 442); + this.dgvShop.Size = new System.Drawing.Size(406, 418); this.dgvShop.TabIndex = 6; this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick); // @@ -2823,7 +2989,7 @@ namespace TemuKJD.WXForms.ProductForms // this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None; this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; - this.pbLoading.Location = new System.Drawing.Point(623, 196); + this.pbLoading.Location = new System.Drawing.Point(623, 187); this.pbLoading.Name = "pbLoading"; this.pbLoading.Size = new System.Drawing.Size(50, 50); this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; @@ -2872,7 +3038,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); this.label11.AutoSize = true; - this.label11.Location = new System.Drawing.Point(8, 87); + this.label11.Location = new System.Drawing.Point(8, 81); this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0); this.label11.Name = "label11"; this.label11.Size = new System.Drawing.Size(68, 17); @@ -2883,7 +3049,7 @@ namespace TemuKJD.WXForms.ProductForms // txtSinglePriceAdd // this.txtSinglePriceAdd.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left))); - this.txtSinglePriceAdd.Location = new System.Drawing.Point(76, 84); + this.txtSinglePriceAdd.Location = new System.Drawing.Point(76, 78); this.txtSinglePriceAdd.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtSinglePriceAdd.Name = "txtSinglePriceAdd"; this.txtSinglePriceAdd.Size = new System.Drawing.Size(31, 23); @@ -2895,7 +3061,7 @@ namespace TemuKJD.WXForms.ProductForms // chkTestNoAuditUpload // this.chkTestNoAuditUpload.AutoSize = true; - this.chkTestNoAuditUpload.Location = new System.Drawing.Point(11, 59); + this.chkTestNoAuditUpload.Location = new System.Drawing.Point(11, 54); this.chkTestNoAuditUpload.Name = "chkTestNoAuditUpload"; this.chkTestNoAuditUpload.Size = new System.Drawing.Size(123, 21); this.chkTestNoAuditUpload.TabIndex = 779; @@ -2907,19 +3073,19 @@ namespace TemuKJD.WXForms.ProductForms // this.dgvSelectProduct.AllowUserToAddRows = false; this.dgvSelectProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3; this.dgvSelectProduct.AutoRowNumber = true; this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White; this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -2950,7 +3116,7 @@ namespace TemuKJD.WXForms.ProductForms this.dgvSelectProduct.Name = "dgvSelectProduct"; this.dgvSelectProduct.ReadOnly = true; this.dgvSelectProduct.RowTemplate.Height = 23; - this.dgvSelectProduct.Size = new System.Drawing.Size(1292, 442); + this.dgvSelectProduct.Size = new System.Drawing.Size(1292, 418); this.dgvSelectProduct.TabIndex = 187; this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick); // @@ -2981,8 +3147,8 @@ namespace TemuKJD.WXForms.ProductForms // // colSupplierName // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle5; this.colSupplierName.Frozen = true; this.colSupplierName.HeaderText = "店铺名称"; this.colSupplierName.Name = "colSupplierName"; @@ -3062,8 +3228,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductName // - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductName.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductName.DefaultCellStyle = dataGridViewCellStyle6; this.colProductName.HeaderText = "商品标题"; this.colProductName.Name = "colProductName"; this.colProductName.ReadOnly = true; @@ -3071,8 +3237,8 @@ namespace TemuKJD.WXForms.ProductForms // // colProductCat // - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colProductCat.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colProductCat.DefaultCellStyle = dataGridViewCellStyle7; this.colProductCat.HeaderText = "商品类目"; this.colProductCat.Name = "colProductCat"; this.colProductCat.ReadOnly = true; @@ -3127,8 +3293,8 @@ namespace TemuKJD.WXForms.ProductForms // // colAddTime // - dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colAddTime.DefaultCellStyle = dataGridViewCellStyle16; + dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colAddTime.DefaultCellStyle = dataGridViewCellStyle8; this.colAddTime.HeaderText = "上传时间"; this.colAddTime.Name = "colAddTime"; this.colAddTime.ReadOnly = true; @@ -3156,7 +3322,7 @@ namespace TemuKJD.WXForms.ProductForms // this.splitContainer4.Panel2.Controls.Add(this.btnClear); this.splitContainer4.Panel2.Controls.Add(this.panelEx1); - this.splitContainer4.Size = new System.Drawing.Size(1710, 26); + this.splitContainer4.Size = new System.Drawing.Size(1710, 25); this.splitContainer4.SplitterDistance = 1019; this.splitContainer4.TabIndex = 3; // @@ -3168,7 +3334,7 @@ namespace TemuKJD.WXForms.ProductForms 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(1019, 26); + this.statusBar.Size = new System.Drawing.Size(1019, 25); this.statusBar.TabIndex = 2; // // btnClear @@ -3178,7 +3344,7 @@ namespace TemuKJD.WXForms.ProductForms 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(475, 2); + this.btnClear.Location = new System.Drawing.Point(475, 1); this.btnClear.Name = "btnClear"; this.btnClear.Size = new System.Drawing.Size(90, 21); this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -3221,27 +3387,6 @@ namespace TemuKJD.WXForms.ProductForms this.panelEx1.Text = "停止当前操作"; this.panelEx1.Visible = false; // - // chkUpdateInDays - // - this.chkUpdateInDays.Location = new System.Drawing.Point(5, 126); - this.chkUpdateInDays.Name = "chkUpdateInDays"; - this.chkUpdateInDays.Size = new System.Drawing.Size(88, 17); - this.chkUpdateInDays.TabIndex = 950; - this.chkUpdateInDays.Text = "  日有更新"; - this.chkUpdateInDays.UseVisualStyleBackColor = true; - // - // txtUpdateInDays - // - this.txtUpdateInDays.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txtUpdateInDays.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtUpdateInDays.Location = new System.Drawing.Point(20, 121); - this.txtUpdateInDays.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); - this.txtUpdateInDays.Name = "txtUpdateInDays"; - this.txtUpdateInDays.Size = new System.Drawing.Size(26, 25); - this.txtUpdateInDays.TabIndex = 912; - this.txtUpdateInDays.Text = "30"; - this.txtUpdateInDays.Visible = false; - // // WXDBProdUploadForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -3268,6 +3413,7 @@ namespace TemuKJD.WXForms.ProductForms this.ucTabControlMetro1.ResumeLayout(false); this.上传参数1.ResumeLayout(false); this.上传参数1.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numJumpCnt)).EndInit(); this.特殊参数.ResumeLayout(false); this.特殊参数.PerformLayout(); this.佣金上货.ResumeLayout(false); @@ -3276,6 +3422,11 @@ namespace TemuKJD.WXForms.ProductForms this.裂变调试.PerformLayout(); this.ucGroupBoxEx4.ResumeLayout(false); this.ucGroupBoxEx4.PerformLayout(); + this.pnlFilterSaleCountNum.ResumeLayout(false); + this.pnlFilterSaleCountNum.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)(this.numFilterSaleCountNum)).EndInit(); + this.pnlFilterViewUv.ResumeLayout(false); + this.pnlFilterViewUv.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.numFilterViewUv)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbSelectProd)).EndInit(); this.ucGroupBoxEx1.ResumeLayout(false); @@ -3518,5 +3669,15 @@ namespace TemuKJD.WXForms.ProductForms private UserComponent.UcCheckBox chkFreightInsurance; private UserComponent.UcCheckBox chkUpdateInDays; private System.Windows.Forms.TextBox txtUpdateInDays; + private System.Windows.Forms.ComboBox cmbUpdateInDays; + private System.Windows.Forms.Label lblUpdateInDays; + private System.Windows.Forms.NumericUpDown numJumpCnt; + private System.Windows.Forms.Label label40; + private System.Windows.Forms.Panel pnlFilterViewUv; + private System.Windows.Forms.Label label41; + private System.Windows.Forms.Panel pnlFilterSaleCountNum; + private System.Windows.Forms.Label label42; + private System.Windows.Forms.NumericUpDown numFilterSaleCountNum; + private UserComponent.UcCheckBox chkFilterSaleCountNum; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs index e841d95..278e2fc 100644 --- a/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXDBProdUploadForm.cs @@ -366,14 +366,21 @@ namespace TemuKJD.WXForms.ProductForms { lblHot.Visible = true; cmbHot.Visible = true; - chkFilterViewUv.Visible = true; - numFilterViewUv.Visible = true; - if (!string.IsNullOrWhiteSpace(cmbSourceType.Text)) + chkFilterViewUv.Visible = true; + //numFilterViewUv.Visible = true; + pnlFilterViewUv.Visible = true; + chkFilterSaleCountNum.Visible = true; + pnlFilterSaleCountNum.Visible = true; + if (!string.IsNullOrWhiteSpace(cmbSourceType.Text)) { //lblGroupFilter.Visible = true; //cmbGroupFilter.Visible = true; } - } + cmbUpdateInDays.Visible = true; + chkUpdateInDays.Visible = true; + txtUpdateInDays.Visible = true; + lblUpdateInDays.Visible = true; + } if (BaseClass.UserAuthority.Contains("商品采集") || BaseClass.ParentAuthority.Contains("商品采集")) { if (BaseClass.UserAuthority.Contains("学员数据") || BaseClass.ParentAuthority.Contains("学员数据")) @@ -429,7 +436,8 @@ namespace TemuKJD.WXForms.ProductForms List ctrlLst = new List() { lblSourceType, cmbSourceType, lblGroupFilter, cmbGroupFilter, lblHot, cmbHot, lblIdFilter, txtIdFilter, - chkFilterViewUv, numFilterViewUv /*chkRandomFissionProduct, txtRandomFissionProductCount, lblNotes, cmbNotes*//*, lblJstInitSet, cmbJstInitSet*/ + chkFilterViewUv, pnlFilterViewUv, chkFilterSaleCountNum, pnlFilterSaleCountNum, + /*chkRandomFissionProduct, txtRandomFissionProductCount, lblNotes, cmbNotes*//*, lblJstInitSet, cmbJstInitSet*/ }; for (int i = 0; i < ctrlLst.Count - 2; i += 2) { @@ -453,8 +461,8 @@ namespace TemuKJD.WXForms.ProductForms } if (chkWXComplateProd.Visible == false) { - chkRandomFissionProduct.Location = new Point(chkRandomFissionProduct.Location.X + 54, chkRandomFissionProduct.Location.Y); - txtRandomFissionProductCount.Location = new Point(txtRandomFissionProductCount.Location.X + 54, txtRandomFissionProductCount.Location.Y); + //chkRandomFissionProduct.Location = new Point(chkRandomFissionProduct.Location.X + 54, chkRandomFissionProduct.Location.Y); + //txtRandomFissionProductCount.Location = new Point(txtRandomFissionProductCount.Location.X + 54, txtRandomFissionProductCount.Location.Y); } IsFormLoad = true; @@ -1300,7 +1308,7 @@ namespace TemuKJD.WXForms.ProductForms result.Contains("提审次数已达上限") || result.Contains("拥金上货失败:需要开通优选联盟") || result.Contains("本店铺近期提审失败比例较高,已被限")) { shop.upLimitRetryCount++; - if (shop.upLimitRetryCount >= 3) + if (shop.upLimitRetryCount >= globalShopUploadCntLimitRetryTimes) { shop.upLimitRetryCount = 0; @@ -1309,7 +1317,7 @@ namespace TemuKJD.WXForms.ProductForms Invoke(new Action(() => { shopRow.Cells["colSelect"].Value = false; })); } } - else + else if (result.Contains("\"success\":true")) { shop.upLimitRetryCount = Math.Max(0, shop.upLimitRetryCount - 1); } @@ -2407,7 +2415,7 @@ namespace TemuKJD.WXForms.ProductForms else { // 使用接口链接传主图 - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; upDate += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"img_url\":\"" + gallery_item.url.Replace("https://", "http://") + "\"}"); @@ -2458,7 +2466,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -2643,8 +2651,14 @@ namespace TemuKJD.WXForms.ProductForms var aiGalleries = prodInfo.detail.galleries.Where(g => g.type == 1).Take(3).ToList(); foreach (var gallery_item in aiGalleries) // 9张主图 { - string getImgError; - var image = GetHtml.GetUrlImg(gallery_item.url.Replace("https://", "http://"), out getImgError); + imgId++; + string getImgError; + var imgUrl = gallery_item.url; + { + if (!imgUrl.Contains("wxapp") && imgUrl.Contains("mmecimage.cn")) + imgUrl = imgUrl.Replace("https://", "http://"); + } + var image = GetHtml.GetUrlImg(imgUrl, out getImgError); var imageBg = new Bitmap(800, 800); if (!string.IsNullOrEmpty(getImgError) || image == null) { @@ -2663,7 +2677,24 @@ namespace TemuKJD.WXForms.ProductForms string imgFullPath = tempImgPath + "\\图片" + imgId + ".jpg"; tempImgFullPathLst.Add(imgFullPath); if (imgId == 1) - image.Save(imgFullPath, System.Drawing.Imaging.ImageFormat.Jpeg); + { + try + { + image.Save(imgFullPath, System.Drawing.Imaging.ImageFormat.Jpeg); + } + catch + { + // 真实图像失败传假图也能识别 + int fileSize = Randomx.GetId(1024, 10240); + using (BinaryWriter writer = new BinaryWriter(File.Create(imgFullPath))) + { + for (int i = 0; i < fileSize; i++) + { + writer.Write((byte)Randomx.GetId(256)); // 生成0到255之间的随机字节 + } + } + } + } else { // 只需要传一张真实图像即可 @@ -3325,7 +3356,7 @@ namespace TemuKJD.WXForms.ProductForms else { // 使用接口链接传详情图 - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; upDate += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"img_url\":\"" + gallery_item.url.Replace("https://", "http://") + "\"}"); @@ -3375,7 +3406,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -4387,7 +4418,7 @@ namespace TemuKJD.WXForms.ProductForms // 使用接口链接传sku图 if (1 == 1 && !sku.thumb_url.Contains("wst.wxapp.tc.qq.com")) { - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; upDate += "&post_data=" + GetHtml.UrlEncodeUtf8("{\"img_url\":\"" + sku.thumb_url.Replace("https://", "http://") + "\"}"); @@ -4433,7 +4464,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5091,7 +5122,7 @@ namespace TemuKJD.WXForms.ProductForms byte[] imageBytes = memoryStream.ToArray(); var imgBase64 = Convert.ToBase64String(imageBytes); - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5152,7 +5183,8 @@ namespace TemuKJD.WXForms.ProductForms foreach (var propParam in upProdParam.product.info.param) { - if (propParam.categorys[0].name.Contains("食品名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装")) + if (propParam.categorys[0].name.Contains("食品名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装") && + !propParam.categorys[1].name.Contains("1") && propParam.categorys[1].name.Length > 5) foodName = "食品名称:" + propParam.categorys[1].name; else if (propParam.categorys[0].name.Contains("生产企业名称") && !propParam.categorys[1].name.Contains("见包装") && !propParam.categorys[1].name.Contains("见外包装")) companyName = "生产商名称:" + propParam.categorys[1].name; @@ -5380,7 +5412,7 @@ namespace TemuKJD.WXForms.ProductForms //return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5472,7 +5504,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -5532,7 +5564,7 @@ namespace TemuKJD.WXForms.ProductForms return errMsg; } - var urlImg = BaseClass.BuildPDDObjString("product/wx_api_upload_image"); + var urlImg = BaseClass.BuildWXImgObjString("product/wx_api_upload_image"); var upDate = UserLogin.GetSignaturex(); upDate += "&token=" + token.accessToken; //upDate += "&is_file=true"; @@ -6301,7 +6333,10 @@ namespace TemuKJD.WXForms.ProductForms //if (chkSevenDays.Checked) // data += "&add_days_less=21"; if (chkUpdateInDays.Checked) + { data += "&add_days_less=" + txtUpdateInDays.Text.Trim(); + data += "&add_days_less_type=" + (cmbUpdateInDays.Text == "更新" ? "mdy" : "add"); + } // 回采数据 if (chkWXComplateProd.Checked) @@ -6313,6 +6348,9 @@ namespace TemuKJD.WXForms.ProductForms if (chkFilterViewUv.Checked) data += "&min_view_uv=" + numFilterViewUv.Value; + + if (chkFilterSaleCountNum.Checked) + data += "&sale_count_num_more=" + numFilterSaleCountNum.Value; })); var html = GetHtml.PostUtf8(url, data); //if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -6572,8 +6610,13 @@ namespace TemuKJD.WXForms.ProductForms cmbHot_TextChanged(null, null); chkFilterViewUv.Checked = false; numFilterViewUv.Value = 200; + if (chkWXComplateProd.Visible == true) chkWXComplateProd.Checked = false; + if (chkRandomFissionProduct.Visible == true) chkRandomFissionProduct.Checked = false; + if (txtRandomFissionProductCount.Visible == true) txtRandomFissionProductCount.Text = ""; - int prodCount; + + + int prodCount; pbSelectProd.Visible = true; Task.Run(() => { @@ -7189,9 +7232,15 @@ namespace TemuKJD.WXForms.ProductForms wxUploadRule.IsUseShanghaiReturnOrderAddress = chkUseShanghaiReturnOrderAddress.Checked; NaiBa.Util.Helper.ConfigHelper.SaveConfig("wx_upload_rule", wxUploadRule); } - } - public class WXUpload + int globalShopUploadCntLimitRetryTimes = 5; + private void numJumpCnt_ValueChanged(object sender, EventArgs e) + { + globalShopUploadCntLimitRetryTimes = numJumpCnt.Value.ParseToInt(); + } + } + + public class WXUpload { public static string searchProduct(ShopLoginInfo shop, string extCode, string extCode2 = "") { diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs index e30aed6..beb9c5d 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.Designer.cs @@ -399,7 +399,7 @@ namespace Work._29Tools.Forms.UserForms "充值", "管理员充值", "支付宝充值", - "礼物单支出", + "礼物单支出/礼物单退费", "拍单扣除/作废返还", "超重扣费支出", "退货包裹扣费支出", diff --git a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs index 5731a33..75d0213 100644 --- a/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXOemAccountBalanceForm.cs @@ -141,8 +141,8 @@ namespace Work._29Tools.Forms.UserForms data3 += "&type_in=1"; else if (cmbType.Text == "支付宝充值") data3 += "&type_in=30"; - else if (cmbType.Text == "礼物单支出") - data3 += "&type_in=16"; + else if (cmbType.Text == "礼物单支出/礼物单退费") + data3 += "&type_in=16,34"; else if (cmbType.Text == "拍单扣除/作废返还") data3 += "&type_in=20,23"; else if (cmbType.Text == "超重扣费支出") @@ -233,8 +233,8 @@ namespace Work._29Tools.Forms.UserForms data3 += "&type_in=1"; else if (cmbType.Text == "支付宝充值") data3 += "&type_in=30"; - else if (cmbType.Text == "礼物单支出") - data3 += "&type_in=16"; + else if (cmbType.Text == "礼物单支出/礼物单退费") + data3 += "&type_in=16,34"; else if (cmbType.Text == "拍单扣除/作废返还") data3 += "&type_in=20,23"; else if (cmbType.Text == "超重扣费支出") diff --git a/TEMUKJD/WXForms/ShopForms/WXTaxManage.cs b/TEMUKJD/WXForms/ShopForms/WXTaxManage.cs index 21f2b32..ef48689 100644 --- a/TEMUKJD/WXForms/ShopForms/WXTaxManage.cs +++ b/TEMUKJD/WXForms/ShopForms/WXTaxManage.cs @@ -620,7 +620,7 @@ namespace TemuKJD.WXForms.ShopForms } } - private void btnExportCSV_Click(object sender, EventArgs e) + private async void btnExportCSV_Click(object sender, EventArgs e) { var selectRows = dgvShop.Rows.Cast().Where(r => r.Cells["colSelect"].Value.ParseToBool() == true).ToList(); if (selectRows.Count == 0) @@ -644,6 +644,7 @@ namespace TemuKJD.WXForms.ShopForms dialog.FileName = "用户 " + BaseClass.NickName + DateTime.Now.ToString(" 订单流水yyyyMMddHHmmss") + ".csv"; if (dialog.ShowDialog() != DialogResult.OK) return; + var path = dialog.FileName; //FolderBrowserDialog dialog = new FolderBrowserDialog(); @@ -657,16 +658,12 @@ namespace TemuKJD.WXForms.ShopForms this.btnExport.Enabled = false; this.btnSearch.Enabled = false; - Task.Run(() => { - Thread.Sleep(5000); - Invoke(new Action(() => - { - this.btnExport.Enabled = true; - this.btnSearch.Enabled = true; - })); - }); - Task.Run(() => + if (cancellationTokenSource != null) + cancellationTokenSource.Cancel(); + cancellationTokenSource = new CancellationTokenSource(); + + await Task.Run(() => { int num = 0; foreach (var row in selectRows) @@ -706,6 +703,9 @@ namespace TemuKJD.WXForms.ShopForms } })); }, cancellationTokenSource.Token); + + this.btnExport.Enabled = true; + this.btnSearch.Enabled = true; } private void dgvDaRenProd_CellContentClick(object sender, DataGridViewCellEventArgs e)