diff --git a/AllBase/Model/Result/KJDDBProduct.cs b/AllBase/Model/Result/KJDDBProduct.cs index d1f737c..6e46ea0 100644 --- a/AllBase/Model/Result/KJDDBProduct.cs +++ b/AllBase/Model/Result/KJDDBProduct.cs @@ -118,5 +118,7 @@ namespace AllBase.Model.Result public string has_wx_format { get; set; } public string add_user_name { get; set; } public int? is_del { get; set; } - } + public bool? is_safe { get; set; } + + } } diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs index f9fa647..1828a2d 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.Designer.cs @@ -66,6 +66,8 @@ namespace TemuKJD.WXForms.ProductForms this.btnGetProdWxCate = new DevComponents.DotNetBar.PanelEx(); this.btnDel = new DevComponents.DotNetBar.PanelEx(); this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.cb_safe = new System.Windows.Forms.ComboBox(); + this.label11 = new System.Windows.Forms.Label(); this.cmbNotes = new System.Windows.Forms.ComboBox(); this.label9 = new System.Windows.Forms.Label(); this.cmbHasFission = new System.Windows.Forms.ComboBox(); @@ -94,9 +96,9 @@ namespace TemuKJD.WXForms.ProductForms this.chkTime = new TemuKJD.UserComponent.UcCheckBox(this.components); this.dtpStart = new System.Windows.Forms.DateTimePicker(); this.dtpEnd = new System.Windows.Forms.DateTimePicker(); - this.label10 = new System.Windows.Forms.Label(); - this.txt_listing_time = new System.Windows.Forms.TextBox(); this.btnSafeDetection = new DevComponents.DotNetBar.PanelEx(); + this.txt_listing_time = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); this.label7 = new System.Windows.Forms.Label(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); this.lblRelation = new System.Windows.Forms.Label(); @@ -149,12 +151,12 @@ namespace TemuKJD.WXForms.ProductForms this.colGetType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colSpProdType = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colWxSafe = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDetectionResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMdyTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colDetectionResult = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.toolTip1 = new System.Windows.Forms.ToolTip(this.components); @@ -583,6 +585,8 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.Controls.Add(this.cb_safe, 5, 2); + this.tableLayoutPanel1.Controls.Add(this.label11, 4, 2); this.tableLayoutPanel1.Controls.Add(this.cmbNotes, 7, 0); this.tableLayoutPanel1.Controls.Add(this.label9, 2, 2); this.tableLayoutPanel1.Controls.Add(this.cmbHasFission, 11, 1); @@ -611,9 +615,9 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Controls.Add(this.chkTime, 0, 2); this.tableLayoutPanel1.Controls.Add(this.dtpStart, 1, 2); this.tableLayoutPanel1.Controls.Add(this.dtpEnd, 3, 2); - this.tableLayoutPanel1.Controls.Add(this.label10, 10, 2); - this.tableLayoutPanel1.Controls.Add(this.txt_listing_time, 11, 2); - this.tableLayoutPanel1.Controls.Add(this.btnSafeDetection, 5, 2); + this.tableLayoutPanel1.Controls.Add(this.btnSafeDetection, 11, 2); + this.tableLayoutPanel1.Controls.Add(this.txt_listing_time, 7, 2); + this.tableLayoutPanel1.Controls.Add(this.label10, 6, 2); this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 6); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.RowCount = 3; @@ -623,12 +627,40 @@ namespace TemuKJD.WXForms.ProductForms this.tableLayoutPanel1.Size = new System.Drawing.Size(992, 105); this.tableLayoutPanel1.TabIndex = 679; // + // cb_safe + // + this.cb_safe.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.cb_safe.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; + this.cb_safe.FormattingEnabled = true; + this.cb_safe.Items.AddRange(new object[] { + "全部", + "安全", + "违规", + "未检测"}); + this.cb_safe.Location = new System.Drawing.Point(386, 73); + this.cb_safe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.cb_safe.Name = "cb_safe"; + this.cb_safe.Size = new System.Drawing.Size(99, 25); + this.cb_safe.TabIndex = 1201; + // + // label11 + // + this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label11.AutoSize = true; + this.label11.Location = new System.Drawing.Point(342, 77); + this.label11.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(44, 17); + this.label11.TabIndex = 1199; + this.label11.Text = "AI检测"; + // // cmbNotes // this.cmbNotes.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.cmbNotes.FormattingEnabled = true; - this.cmbNotes.Location = new System.Drawing.Point(554, 3); + this.cmbNotes.Location = new System.Drawing.Point(555, 3); this.cmbNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbNotes.Name = "cmbNotes"; this.cmbNotes.Size = new System.Drawing.Size(99, 25); @@ -654,17 +686,17 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbHasFission.Location = new System.Drawing.Point(888, 38); + this.cmbHasFission.Location = new System.Drawing.Point(889, 38); this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHasFission.Name = "cmbHasFission"; - this.cmbHasFission.Size = new System.Drawing.Size(101, 25); + this.cmbHasFission.Size = new System.Drawing.Size(100, 25); this.cmbHasFission.TabIndex = 982; // // label8 // this.label8.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label8.AutoSize = true; - this.label8.Location = new System.Drawing.Point(832, 42); + this.label8.Location = new System.Drawing.Point(833, 42); this.label8.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); this.label8.Name = "label8"; this.label8.Size = new System.Drawing.Size(56, 17); @@ -677,7 +709,7 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Right))); this.txtCatBoundLessThan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCatBoundLessThan.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtCatBoundLessThan.Location = new System.Drawing.Point(723, 38); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(724, 38); this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; this.txtCatBoundLessThan.Size = new System.Drawing.Size(99, 25); @@ -687,7 +719,7 @@ namespace TemuKJD.WXForms.ProductForms // chkCatBoundLessThan // this.chkCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chkCatBoundLessThan.Location = new System.Drawing.Point(659, 40); + this.chkCatBoundLessThan.Location = new System.Drawing.Point(660, 40); this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(3, 5, 0, 0); this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); @@ -777,7 +809,7 @@ namespace TemuKJD.WXForms.ProductForms | System.Windows.Forms.AnchorStyles.Right))); this.txtCatBoundMoreThan.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; this.txtCatBoundMoreThan.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtCatBoundMoreThan.Location = new System.Drawing.Point(554, 38); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(555, 38); this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; this.txtCatBoundMoreThan.Size = new System.Drawing.Size(99, 25); @@ -787,7 +819,7 @@ namespace TemuKJD.WXForms.ProductForms // chkCatBoundMoreThan // this.chkCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.chkCatBoundMoreThan.Location = new System.Drawing.Point(490, 40); + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(491, 40); this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(3, 5, 0, 0); this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); @@ -829,7 +861,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label17.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(342, 42); + this.label17.Location = new System.Drawing.Point(343, 42); this.label17.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(43, 17); @@ -845,7 +877,7 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(385, 38); + this.cmbCat3.Location = new System.Drawing.Point(386, 38); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(99, 25); @@ -858,7 +890,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSourceType.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(353, 7); + this.lblSourceType.Location = new System.Drawing.Point(354, 7); this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); this.lblSourceType.Name = "lblSourceType"; this.lblSourceType.Size = new System.Drawing.Size(32, 17); @@ -875,7 +907,7 @@ namespace TemuKJD.WXForms.ProductForms "多多商品", "1688商品", "微信商品"}); - this.cmbSourceType.Location = new System.Drawing.Point(385, 3); + this.cmbSourceType.Location = new System.Drawing.Point(386, 3); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(99, 25); @@ -887,7 +919,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblNotes.AutoSize = true; - this.lblNotes.Location = new System.Drawing.Point(518, 7); + this.lblNotes.Location = new System.Drawing.Point(519, 7); this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); this.lblNotes.Name = "lblNotes"; this.lblNotes.Size = new System.Drawing.Size(36, 17); @@ -898,7 +930,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label12.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label12.AutoSize = true; - this.label12.Location = new System.Drawing.Point(663, 7); + this.label12.Location = new System.Drawing.Point(664, 7); this.label12.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); this.label12.Name = "label12"; this.label12.Size = new System.Drawing.Size(60, 17); @@ -914,7 +946,7 @@ namespace TemuKJD.WXForms.ProductForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(723, 3); + this.cmbWxCat.Location = new System.Drawing.Point(724, 3); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(99, 25); @@ -924,7 +956,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblWxSafe.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.lblWxSafe.AutoSize = true; - this.lblWxSafe.Location = new System.Drawing.Point(828, 7); + this.lblWxSafe.Location = new System.Drawing.Point(829, 7); this.lblWxSafe.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); this.lblWxSafe.Name = "lblWxSafe"; this.lblWxSafe.Size = new System.Drawing.Size(60, 17); @@ -941,10 +973,10 @@ namespace TemuKJD.WXForms.ProductForms "安全+未校验", "安全商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(888, 3); + this.cmbWxSafe.Location = new System.Drawing.Point(889, 3); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(101, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(100, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // @@ -980,30 +1012,6 @@ namespace TemuKJD.WXForms.ProductForms this.dtpEnd.Size = new System.Drawing.Size(99, 23); this.dtpEnd.TabIndex = 982; // - // label10 - // - this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.label10.AutoSize = true; - this.label10.Location = new System.Drawing.Point(832, 77); - this.label10.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(56, 17); - this.label10.TabIndex = 983; - this.label10.Text = "上架日期"; - // - // txt_listing_time - // - this.txt_listing_time.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txt_listing_time.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.txt_listing_time.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txt_listing_time.Location = new System.Drawing.Point(888, 73); - this.txt_listing_time.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); - this.txt_listing_time.Name = "txt_listing_time"; - this.txt_listing_time.Size = new System.Drawing.Size(101, 25); - this.txt_listing_time.TabIndex = 984; - this.txt_listing_time.Text = "365"; - // // btnSafeDetection // this.btnSafeDetection.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1011,7 +1019,7 @@ namespace TemuKJD.WXForms.ProductForms this.btnSafeDetection.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSafeDetection.DisabledBackColor = System.Drawing.Color.Empty; this.btnSafeDetection.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSafeDetection.Location = new System.Drawing.Point(388, 73); + this.btnSafeDetection.Location = new System.Drawing.Point(893, 73); this.btnSafeDetection.Name = "btnSafeDetection"; this.btnSafeDetection.Size = new System.Drawing.Size(96, 25); this.btnSafeDetection.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -1025,10 +1033,34 @@ namespace TemuKJD.WXForms.ProductForms this.btnSafeDetection.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; this.btnSafeDetection.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnSafeDetection.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSafeDetection.TabIndex = 1198; + this.btnSafeDetection.TabIndex = 1202; this.btnSafeDetection.Text = "AI检测"; this.btnSafeDetection.Click += new System.EventHandler(this.btnSafeDetection_Click); // + // txt_listing_time + // + this.txt_listing_time.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txt_listing_time.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.txt_listing_time.Font = new System.Drawing.Font("微软雅黑", 10F); + this.txt_listing_time.Location = new System.Drawing.Point(555, 73); + this.txt_listing_time.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); + this.txt_listing_time.Name = "txt_listing_time"; + this.txt_listing_time.Size = new System.Drawing.Size(99, 25); + this.txt_listing_time.TabIndex = 984; + this.txt_listing_time.Text = "365"; + // + // label10 + // + this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.label10.AutoSize = true; + this.label10.Location = new System.Drawing.Point(499, 77); + this.label10.Margin = new System.Windows.Forms.Padding(3, 7, 0, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(56, 17); + this.label10.TabIndex = 983; + this.label10.Text = "上架日期"; + // // label7 // this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1346,12 +1378,12 @@ namespace TemuKJD.WXForms.ProductForms this.colGetType, this.colSpProdType, this.colWxSafe, + this.colDetectionResult, this.colAddTime, this.colMdyTime, this.col_edit, this.col_delete, - this.col_select_product, - this.colDetectionResult}); + this.col_select_product}); this.dgvDbProduct.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvDbProduct.Location = new System.Drawing.Point(4, 0); this.dgvDbProduct.MultiSelectCheckBox = true; @@ -1623,6 +1655,16 @@ namespace TemuKJD.WXForms.ProductForms this.colWxSafe.Name = "colWxSafe"; this.colWxSafe.ReadOnly = true; // + // colDetectionResult + // + this.colDetectionResult.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; + this.colDetectionResult.HeaderText = "AI检测结果"; + this.colDetectionResult.MinimumWidth = 50; + this.colDetectionResult.Name = "colDetectionResult"; + this.colDetectionResult.ReadOnly = true; + this.colDetectionResult.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colDetectionResult.Width = 160; + // // colAddTime // dataGridViewCellStyle33.WrapMode = System.Windows.Forms.DataGridViewTriState.True; @@ -1668,16 +1710,6 @@ namespace TemuKJD.WXForms.ProductForms this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; this.col_select_product.Visible = false; // - // colDetectionResult - // - this.colDetectionResult.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None; - this.colDetectionResult.HeaderText = "AI检测结果"; - this.colDetectionResult.MinimumWidth = 50; - this.colDetectionResult.Name = "colDetectionResult"; - this.colDetectionResult.ReadOnly = true; - this.colDetectionResult.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colDetectionResult.Width = 160; - // // ucSplitPage1 // this.ucSplitPage1.CurrentPage = 1; @@ -1802,43 +1834,6 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.Label label8; private System.Windows.Forms.ComboBox cmbHasFission; private DevComponents.DotNetBar.PanelEx btnAITitleFission; - private System.Windows.Forms.DataGridViewTextBoxColumn colDetectionResult; - private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; - private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; - private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopName; - private System.Windows.Forms.DataGridViewTextBoxColumn col_product_name; - private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl; - private System.Windows.Forms.DataGridViewImageColumn colMainImg; - private System.Windows.Forms.DataGridViewTextBoxColumn colSkuReplaceImgUrl; - private System.Windows.Forms.DataGridViewImageColumn colSkuReplaceImg; - private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id; - private System.Windows.Forms.DataGridViewTextBoxColumn colSpuIdShow; - private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id; - private System.Windows.Forms.DataGridViewTextBoxColumn colMainCate; - private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name; - private System.Windows.Forms.DataGridViewTextBoxColumn colCatBound; - private System.Windows.Forms.DataGridViewTextBoxColumn col_ext_code; - private System.Windows.Forms.DataGridViewTextBoxColumn colStyleCode; - private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; - private System.Windows.Forms.DataGridViewTextBoxColumn colPriceText; - private System.Windows.Forms.DataGridViewTextBoxColumn colExtCodePrice; - private System.Windows.Forms.DataGridViewLinkColumn colEdit; - private System.Windows.Forms.DataGridViewTextBoxColumn colAddTimes; - private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount; - private System.Windows.Forms.DataGridViewTextBoxColumn colSaleCount; - private System.Windows.Forms.DataGridViewTextBoxColumn col_notes; - private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords; - private System.Windows.Forms.DataGridViewTextBoxColumn colEndWords; - private System.Windows.Forms.DataGridViewTextBoxColumn colFissionWords; - private System.Windows.Forms.DataGridViewTextBoxColumn colGetType; - private System.Windows.Forms.DataGridViewTextBoxColumn colSpProdType; - private System.Windows.Forms.DataGridViewTextBoxColumn colWxSafe; - private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; - private System.Windows.Forms.DataGridViewTextBoxColumn colMdyTime; - private System.Windows.Forms.DataGridViewLinkColumn col_edit; - private System.Windows.Forms.DataGridViewLinkColumn col_delete; - private System.Windows.Forms.DataGridViewLinkColumn col_select_product; private DevComponents.DotNetBar.PanelEx btnBatchEditNotes; private DevComponents.DotNetBar.PanelEx btnEditNotes; public System.Windows.Forms.ComboBox cmbNotes; @@ -1852,6 +1847,45 @@ namespace TemuKJD.WXForms.ProductForms private System.Windows.Forms.DateTimePicker dtpEnd; private System.Windows.Forms.Label label10; private System.Windows.Forms.TextBox txt_listing_time; + private System.Windows.Forms.Label label11; + public System.Windows.Forms.ComboBox cb_safe; + private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect; + private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colFromShopName; + private System.Windows.Forms.DataGridViewTextBoxColumn col_product_name; + private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl; + private System.Windows.Forms.DataGridViewImageColumn colMainImg; + private System.Windows.Forms.DataGridViewTextBoxColumn colSkuReplaceImgUrl; + private System.Windows.Forms.DataGridViewImageColumn colSkuReplaceImg; + private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colSpuIdShow; + private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id; + private System.Windows.Forms.DataGridViewTextBoxColumn colMainCate; + private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name; + private System.Windows.Forms.DataGridViewTextBoxColumn colCatBound; + private System.Windows.Forms.DataGridViewTextBoxColumn col_ext_code; + private System.Windows.Forms.DataGridViewTextBoxColumn colStyleCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colGroup; + private System.Windows.Forms.DataGridViewTextBoxColumn colPriceText; + private System.Windows.Forms.DataGridViewTextBoxColumn colExtCodePrice; + private System.Windows.Forms.DataGridViewLinkColumn colEdit; + private System.Windows.Forms.DataGridViewTextBoxColumn colAddTimes; + private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount; + private System.Windows.Forms.DataGridViewTextBoxColumn colSaleCount; + private System.Windows.Forms.DataGridViewTextBoxColumn col_notes; + private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords; + private System.Windows.Forms.DataGridViewTextBoxColumn colEndWords; + private System.Windows.Forms.DataGridViewTextBoxColumn colFissionWords; + private System.Windows.Forms.DataGridViewTextBoxColumn colGetType; + private System.Windows.Forms.DataGridViewTextBoxColumn colSpProdType; + private System.Windows.Forms.DataGridViewTextBoxColumn colWxSafe; + private System.Windows.Forms.DataGridViewTextBoxColumn colDetectionResult; + private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colMdyTime; + private System.Windows.Forms.DataGridViewLinkColumn col_edit; + private System.Windows.Forms.DataGridViewLinkColumn col_delete; + private System.Windows.Forms.DataGridViewLinkColumn col_select_product; private DevComponents.DotNetBar.PanelEx btnSafeDetection; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs index d8bb012..3e44e60 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserCollectAuthProdListForm.cs @@ -65,7 +65,7 @@ namespace TemuKJD.WXForms.ProductForms PDDDBProdListForm.GetPDDProductNotes(new List { cmbNotes }, addUserName); PDDDBProdListForm.GetPDDProductNotes(new List { cmbBatchEditNotes }, addUserName); }); - + cb_safe.SelectedIndex = 0; //chkCatBoundLessThan.Visible = false; //chkCatBoundMoreThan.Visible = false; //tableLayoutPanel1.SetColumn(lblSourceType, 2); @@ -275,6 +275,7 @@ namespace TemuKJD.WXForms.ProductForms .Replace("已采集数据", "1688商品").Replace("机会商品", "多多商品").Replace("多多外部数据", "多多商品").Replace("微信店采", "微信商品"), prod.special_prod_type, prod.wx_safe_status, + prod.is_safe == null ? "未检测" : prod.is_safe.Value ==true ? "安全" : "违规", prod.add_time.ToString("yy-MM-dd HH:mm"), prod.mdy_time.ToString("yy-MM-dd HH:mm"), "编辑", @@ -528,9 +529,9 @@ namespace TemuKJD.WXForms.ProductForms { data += "&no_fission_words=true"; } - + data += "&safe_status=" + cb_safe.SelectedIndex; if (isNotCount) - data += "&is_not_count=true"; + data += "&is_not_count=true"; })); var html = GetHtml.PostUtf8(url, data); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) @@ -1287,7 +1288,6 @@ namespace TemuKJD.WXForms.ProductForms { detection.Cancel(); btnSafeDetection.Text = "正在停止"; - btnSafeDetection.Enabled = false; return; } if (pbLoading.Visible || !btnSelect.Enabled || !btn_import_wx.Enabled) @@ -1298,27 +1298,38 @@ namespace TemuKJD.WXForms.ProductForms var rows = dgvDbProduct.Rows.Cast() .Where(row => row.Cells["colSelect"].Value.ParseToBool()).ToList(); var ids = rows.Select(row => row.Cells["col_db_id"].Value.ParseToInt()).ToList(); - var selected = lstTemuDbProduct.Where(prod => ids.Contains(prod.id)) - .Select(prod => new ComplianceGoods - { - id = prod.id.ToString(), - name = prod.product_name, - image = prod.main_img, - type = ComplianceGoods.Library - }).ToList(); + var productDict = lstTemuDbProduct + .Where(p => ids.Contains(p.id)) + .ToDictionary(p => p.id); + + var selected = ids + .Where(id => productDict.ContainsKey(id)) + .Select(id => + { + var prod = productDict[id]; + return new ComplianceGoods + { + id = prod.id.ToString(), + name = prod.product_name, + image = prod.main_img, + type = ComplianceGoods.Library + }; + }) + .ToList(); + + if (selected.Count == 0) { BaseMsgForm.ShowInfo("请选择商品"); return; } BaseMsgForm.ShowInfo($"当前AI检测剩余:{BaseClass.ImageAnalysisQuota}张"); - var locked = splitContainer1.Panel1.Controls.Cast().Where(c => c != btnSafeDetection) - .Concat(new Control[] { splitContainer2 }).Where(c => c.Enabled).ToList(); + var originalText = btnSafeDetection.Text; detection = new CancellationTokenSource(); try { - foreach (var control in locked) control.Enabled = false; + btnSafeDetection.Text = "停止检测"; var result = await GoodsComplianceService.DetectSelectedAsync(selected, ComplianceProductReader.Read, (id, status) => { @@ -1339,9 +1350,8 @@ namespace TemuKJD.WXForms.ProductForms detection = null; if (!IsDisposed) { - foreach (var control in locked) control.Enabled = true; + btnSafeDetection.Text = originalText; - btnSafeDetection.Enabled = true; } } }