diff --git a/TEMUKJD/BLL/WXHttpResponseBLL.cs b/TEMUKJD/BLL/WXHttpResponseBLL.cs index 5be6bed..9502526 100644 --- a/TEMUKJD/BLL/WXHttpResponseBLL.cs +++ b/TEMUKJD/BLL/WXHttpResponseBLL.cs @@ -413,7 +413,7 @@ namespace TemuKJD.BLL return result; } - public static string kdniaoPostResponse(string _url, string _data, string referer, string kdnAuth = null) + public static string kdniaoPostResponse(string _url, string _data, string referer, Dictionary reqDic, string kdnAuth = null, string kdnAuthKey = "Auth") { HttpWebResponse response = null; string result; @@ -424,17 +424,27 @@ namespace TemuKJD.BLL request.KeepAlive = true; request.Headers.Add("sec-ch-ua-platform", @"""Windows"""); //request.Headers.Add("kdnAuth", @"62993d99a28947aaadd6b79427929562"); - request.Headers.Add("kdnAuth", @"kdnAuth"); + //request.Headers.Add("kdnAuth", kdnAuth); + //request.Headers.Add("Auth", kdnAuth); + //request.Headers.Add(kdnAuthKey, kdnAuth); request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/138.0.0.0 Safari/537.36"; request.Accept = "application/json, text/javascript, */*; q=0.01"; - request.Headers.Add("sec-ch-ua", @"""Not)A;Brand"";v=""8"", ""Chromium"";v=""138"""); request.ContentType = "application/x-www-form-urlencoded"; + request.Headers.Add("sec-ch-ua", @"""Not)A;Brand"";v=""8"", ""Chromium"";v=""138"""); request.Headers.Add("sec-ch-ua-mobile", @"?0"); request.Headers.Add("Origin", @"https://56.kdniao.com"); request.Headers.Set(HttpRequestHeader.AcceptLanguage, "zh-CN,zh;q=0.9"); request.Headers.Add("Sec-Fetch-Site", @"same-site"); request.Headers.Add("Sec-Fetch-Mode", @"cors"); request.Headers.Add("Sec-Fetch-Dest", @"empty"); + foreach (var key in reqDic.Keys) + { + if (request.Headers.AllKeys.Contains(key)) + continue; + + request.Headers.Add(key, reqDic[key].ParseToString()); + } + request.Referer = referer; request.Headers.Set(HttpRequestHeader.AcceptEncoding, "gzip, deflate"); diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs index 9884b5d..50a3140 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs @@ -64,7 +64,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.txtMinPrice = new System.Windows.Forms.TextBox(); this.txtReplaceText = new System.Windows.Forms.TextBox(); this.label7 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); this.chkSameSpecPrice = new TemuKJD.UserComponent.UcCheckBox(this.components); this.label9 = new System.Windows.Forms.Label(); this.btnExportTxt = new DevComponents.DotNetBar.PanelEx(); @@ -137,10 +136,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnEditExtCodePriceOK = new DevComponents.DotNetBar.PanelEx(); this.lblExtCodePrice = new System.Windows.Forms.Label(); this.pbLoading = new System.Windows.Forms.PictureBox(); - this.btnSelect = new DevComponents.DotNetBar.PanelEx(); this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx(); - this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); - this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.col_db_id = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colFromShopId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -176,6 +172,11 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn(); this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn(); + this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage(); + this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); + this.btnOutProdSaveDb = new DevComponents.DotNetBar.PanelEx(); + this.tabPage4 = new System.Windows.Forms.TabPage(); + this.label8 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit(); this.splitContainer1.Panel1.SuspendLayout(); this.splitContainer1.Panel2.SuspendLayout(); @@ -194,6 +195,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).BeginInit(); + this.tabPage4.SuspendLayout(); this.SuspendLayout(); // // splitContainer1 @@ -229,13 +231,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.ucTabControlMetro1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(251)))), ((int)(((byte)(251)))), ((int)(((byte)(251))))); this.ucTabControlMetro1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.Controls.Add(this.tabPage1); + this.ucTabControlMetro1.Controls.Add(this.tabPage4); this.ucTabControlMetro1.Controls.Add(this.tabPage3); this.ucTabControlMetro1.Controls.Add(this.tabPage2); - this.ucTabControlMetro1.Location = new System.Drawing.Point(1021, 3); + this.ucTabControlMetro1.Location = new System.Drawing.Point(1021, 2); this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(415, 105); + this.ucTabControlMetro1.Size = new System.Drawing.Size(415, 110); 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))))); @@ -244,17 +247,15 @@ namespace TemuKJD.PDDForms.ProductSelectForms // tabPage1 // this.tabPage1.Controls.Add(this.btnTitleFission); - this.tabPage1.Controls.Add(this.btnExportIdImg); this.tabPage1.Controls.Add(this.btnSetGroup); this.tabPage1.Controls.Add(this.btnDelSelect); this.tabPage1.Controls.Add(this.cmbGroup); - this.tabPage1.Controls.Add(this.btnImport); this.tabPage1.Controls.Add(this.cmbSetWxSafe); this.tabPage1.Controls.Add(this.btnSetWxSafe); 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, 75); + this.tabPage1.Size = new System.Drawing.Size(407, 80); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "数据操作"; this.tabPage1.UseVisualStyleBackColor = true; @@ -266,7 +267,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnTitleFission.Cursor = System.Windows.Forms.Cursors.Hand; this.btnTitleFission.DisabledBackColor = System.Drawing.Color.Empty; this.btnTitleFission.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnTitleFission.Location = new System.Drawing.Point(6, 39); + this.btnTitleFission.Location = new System.Drawing.Point(6, 13); this.btnTitleFission.Name = "btnTitleFission"; this.btnTitleFission.Size = new System.Drawing.Size(82, 25); this.btnTitleFission.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -286,14 +287,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms // // btnExportIdImg // - this.btnExportIdImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnExportIdImg.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnExportIdImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; 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(6, 11); + this.btnExportIdImg.Location = new System.Drawing.Point(270, 54); this.btnExportIdImg.Name = "btnExportIdImg"; - this.btnExportIdImg.Size = new System.Drawing.Size(82, 25); + this.btnExportIdImg.Size = new System.Drawing.Size(134, 23); this.btnExportIdImg.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnExportIdImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnExportIdImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -306,7 +307,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnExportIdImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnExportIdImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnExportIdImg.TabIndex = 765; - this.btnExportIdImg.Text = "导出Id+图片"; + this.btnExportIdImg.Text = "导出Id+图片(品牌校验)"; this.btnExportIdImg.Click += new System.EventHandler(this.btnExportIdImg_Click); // // btnSetGroup @@ -316,7 +317,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetGroup.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetGroup.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetGroup.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetGroup.Location = new System.Drawing.Point(197, 11); + this.btnSetGroup.Location = new System.Drawing.Point(208, 13); this.btnSetGroup.Name = "btnSetGroup"; this.btnSetGroup.Size = new System.Drawing.Size(84, 25); this.btnSetGroup.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -341,9 +342,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand; this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty; this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDelSelect.Location = new System.Drawing.Point(296, 11); + this.btnDelSelect.Location = new System.Drawing.Point(319, 13); this.btnDelSelect.Name = "btnDelSelect"; - this.btnDelSelect.Size = new System.Drawing.Size(105, 25); + this.btnDelSelect.Size = new System.Drawing.Size(84, 25); this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnDelSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnDelSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -363,7 +364,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.cmbGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.cmbGroup.FormattingEnabled = true; - this.cmbGroup.Location = new System.Drawing.Point(103, 11); + this.cmbGroup.Location = new System.Drawing.Point(114, 13); this.cmbGroup.Name = "cmbGroup"; this.cmbGroup.Size = new System.Drawing.Size(92, 25); this.cmbGroup.TabIndex = 640; @@ -375,7 +376,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnImport.Cursor = System.Windows.Forms.Cursors.Hand; this.btnImport.DisabledBackColor = System.Drawing.Color.Empty; this.btnImport.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnImport.Location = new System.Drawing.Point(296, 39); + this.btnImport.Location = new System.Drawing.Point(17, 12); this.btnImport.Name = "btnImport"; this.btnImport.Size = new System.Drawing.Size(105, 25); this.btnImport.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -402,7 +403,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbSetWxSafe.Location = new System.Drawing.Point(103, 39); + this.cmbSetWxSafe.Location = new System.Drawing.Point(114, 41); this.cmbSetWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSetWxSafe.Name = "cmbSetWxSafe"; this.cmbSetWxSafe.Size = new System.Drawing.Size(92, 25); @@ -415,7 +416,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnSetWxSafe.Cursor = System.Windows.Forms.Cursors.Hand; this.btnSetWxSafe.DisabledBackColor = System.Drawing.Color.Empty; this.btnSetWxSafe.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSetWxSafe.Location = new System.Drawing.Point(197, 39); + this.btnSetWxSafe.Location = new System.Drawing.Point(208, 41); this.btnSetWxSafe.Name = "btnSetWxSafe"; this.btnSetWxSafe.Size = new System.Drawing.Size(84, 25); this.btnSetWxSafe.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -438,6 +439,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.tabPage3.BackColor = System.Drawing.Color.White; this.tabPage3.Controls.Add(this.chkHighestPriceSku); this.tabPage3.Controls.Add(this.txtMinPrice); + this.tabPage3.Controls.Add(this.btnExportIdImg); this.tabPage3.Controls.Add(this.txtReplaceText); this.tabPage3.Controls.Add(this.label7); this.tabPage3.Controls.Add(this.label8); @@ -446,7 +448,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, 75); + this.tabPage3.Size = new System.Drawing.Size(407, 80); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "商品导出"; // @@ -455,7 +457,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkHighestPriceSku.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.chkHighestPriceSku.Checked = true; this.chkHighestPriceSku.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkHighestPriceSku.Location = new System.Drawing.Point(291, 46); + this.chkHighestPriceSku.Location = new System.Drawing.Point(106, 31); this.chkHighestPriceSku.Name = "chkHighestPriceSku"; this.chkHighestPriceSku.Size = new System.Drawing.Size(113, 21); this.chkHighestPriceSku.TabIndex = 728; @@ -465,7 +467,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms // txtMinPrice // this.txtMinPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.txtMinPrice.Location = new System.Drawing.Point(99, 44); + this.txtMinPrice.Location = new System.Drawing.Point(79, 54); this.txtMinPrice.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtMinPrice.Name = "txtMinPrice"; this.txtMinPrice.Size = new System.Drawing.Size(25, 23); @@ -476,33 +478,22 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.txtReplaceText.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); - this.txtReplaceText.Location = new System.Drawing.Point(99, 12); + this.txtReplaceText.Location = new System.Drawing.Point(93, 4); this.txtReplaceText.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtReplaceText.Name = "txtReplaceText"; - this.txtReplaceText.Size = new System.Drawing.Size(228, 23); + this.txtReplaceText.Size = new System.Drawing.Size(242, 23); this.txtReplaceText.TabIndex = 689; this.txtReplaceText.TextChanged += new System.EventHandler(this.txtReplaceText_TextChanged); // // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(2, 15); + this.label7.Location = new System.Drawing.Point(2, 7); this.label7.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(104, 17); + this.label7.Size = new System.Drawing.Size(92, 17); this.label7.TabIndex = 705; - this.label7.Text = "导出时移除词语："; - // - // 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(2, 47); - this.label8.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(104, 17); - this.label8.TabIndex = 706; - this.label8.Text = "导出时价格低于："; + this.label7.Text = "导出时移除词语"; // // chkSameSpecPrice // @@ -510,7 +501,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkSameSpecPrice.AutoSize = true; this.chkSameSpecPrice.Checked = true; this.chkSameSpecPrice.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkSameSpecPrice.Location = new System.Drawing.Point(199, 46); + this.chkSameSpecPrice.Location = new System.Drawing.Point(5, 31); this.chkSameSpecPrice.Name = "chkSameSpecPrice"; this.chkSameSpecPrice.Size = new System.Drawing.Size(99, 21); this.chkSameSpecPrice.TabIndex = 718; @@ -521,12 +512,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms // this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label9.AutoSize = true; - this.label9.Location = new System.Drawing.Point(123, 47); + this.label9.Location = new System.Drawing.Point(103, 57); this.label9.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(76, 17); + this.label9.Size = new System.Drawing.Size(40, 17); this.label9.TabIndex = 708; - this.label9.Text = "元时跳过sku"; + this.label9.Text = "元sku"; // // btnExportTxt // @@ -535,9 +526,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnExportTxt.Cursor = System.Windows.Forms.Cursors.Hand; this.btnExportTxt.DisabledBackColor = System.Drawing.Color.Empty; this.btnExportTxt.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnExportTxt.Location = new System.Drawing.Point(333, 11); + this.btnExportTxt.Location = new System.Drawing.Point(337, 4); this.btnExportTxt.Name = "btnExportTxt"; - this.btnExportTxt.Size = new System.Drawing.Size(67, 25); + this.btnExportTxt.Size = new System.Drawing.Size(67, 23); this.btnExportTxt.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnExportTxt.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.btnExportTxt.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); @@ -658,7 +649,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnStopStop.CanvasColor = System.Drawing.SystemColors.Control; this.btnStopStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; this.btnStopStop.DisabledBackColor = System.Drawing.Color.Empty; - this.btnStopStop.Location = new System.Drawing.Point(919, 81); + this.btnStopStop.Location = new System.Drawing.Point(919, 82); this.btnStopStop.Name = "btnStopStop"; this.btnStopStop.Size = new System.Drawing.Size(90, 25); this.btnStopStop.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -684,7 +675,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnPull.Cursor = System.Windows.Forms.Cursors.Hand; this.btnPull.DisabledBackColor = System.Drawing.Color.Empty; this.btnPull.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPull.Location = new System.Drawing.Point(977, 33); + this.btnPull.Location = new System.Drawing.Point(977, 34); this.btnPull.Name = "btnPull"; this.btnPull.Size = new System.Drawing.Size(32, 25); this.btnPull.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -709,7 +700,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnPushToOutServer.Cursor = System.Windows.Forms.Cursors.Hand; this.btnPushToOutServer.DisabledBackColor = System.Drawing.Color.Empty; this.btnPushToOutServer.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnPushToOutServer.Location = new System.Drawing.Point(919, 33); + this.btnPushToOutServer.Location = new System.Drawing.Point(919, 34); this.btnPushToOutServer.Name = "btnPushToOutServer"; this.btnPushToOutServer.Size = new System.Drawing.Size(56, 25); this.btnPushToOutServer.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -734,7 +725,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.btnGetProdWxCate.Cursor = System.Windows.Forms.Cursors.Hand; this.btnGetProdWxCate.DisabledBackColor = System.Drawing.Color.Empty; this.btnGetProdWxCate.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnGetProdWxCate.Location = new System.Drawing.Point(919, 5); + this.btnGetProdWxCate.Location = new System.Drawing.Point(919, 6); this.btnGetProdWxCate.Name = "btnGetProdWxCate"; this.btnGetProdWxCate.Size = new System.Drawing.Size(90, 25); this.btnGetProdWxCate.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -839,7 +830,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbHasFission.Location = new System.Drawing.Point(805, 42); + this.cmbHasFission.Location = new System.Drawing.Point(805, 40); this.cmbHasFission.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHasFission.Name = "cmbHasFission"; this.cmbHasFission.Size = new System.Drawing.Size(38, 25); @@ -883,7 +874,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbPddRelation.Location = new System.Drawing.Point(693, 7); + this.cmbPddRelation.Location = new System.Drawing.Point(693, 5); this.cmbPddRelation.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbPddRelation.Name = "cmbPddRelation"; this.cmbPddRelation.Size = new System.Drawing.Size(38, 25); @@ -938,7 +929,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(262, 77); + this.cmbCat2.Location = new System.Drawing.Point(262, 75); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; this.cmbCat2.Size = new System.Drawing.Size(38, 25); @@ -1024,7 +1015,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "机会商品", "以图搜品", "多多外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(262, 42); + this.cmbSourceType.Location = new System.Drawing.Point(262, 40); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; this.cmbSourceType.Size = new System.Drawing.Size(38, 25); @@ -1070,7 +1061,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "是", "否"}); - this.cmbWxCat.Location = new System.Drawing.Point(581, 7); + this.cmbWxCat.Location = new System.Drawing.Point(581, 5); this.cmbWxCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxCat.Name = "cmbWxCat"; this.cmbWxCat.Size = new System.Drawing.Size(38, 25); @@ -1092,7 +1083,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.cmbSort.Items.AddRange(new object[] { "入库时间", "曝光量"}); - this.cmbSort.Location = new System.Drawing.Point(357, 42); + this.cmbSort.Location = new System.Drawing.Point(357, 40); this.cmbSort.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSort.Name = "cmbSort"; this.cmbSort.Size = new System.Drawing.Size(38, 25); @@ -1156,7 +1147,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(167, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(167, 40); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; this.cmbGroupFilter.Size = new System.Drawing.Size(38, 25); @@ -1171,7 +1162,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "是", "否", "导出未拉回"}); - this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 42); + this.cmbExportToOutServer.Location = new System.Drawing.Point(581, 40); this.cmbExportToOutServer.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbExportToOutServer.Name = "cmbExportToOutServer"; this.cmbExportToOutServer.Size = new System.Drawing.Size(38, 25); @@ -1207,7 +1198,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "安全商品", "违规商品", "未校验"}); - this.cmbWxSafe.Location = new System.Drawing.Point(469, 42); + this.cmbWxSafe.Location = new System.Drawing.Point(469, 40); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; this.cmbWxSafe.Size = new System.Drawing.Size(38, 25); @@ -1249,7 +1240,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(167, 77); + this.cmbCat1.Location = new System.Drawing.Point(167, 75); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; this.cmbCat1.Size = new System.Drawing.Size(38, 25); @@ -1271,7 +1262,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(357, 77); + this.cmbCat3.Location = new System.Drawing.Point(357, 75); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; this.cmbCat3.Size = new System.Drawing.Size(38, 25); @@ -1367,7 +1358,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms "", "普通商品", "爆款数据"}); - this.cmbSpProdType.Location = new System.Drawing.Point(805, 7); + this.cmbSpProdType.Location = new System.Drawing.Point(805, 5); this.cmbSpProdType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSpProdType.Name = "cmbSpProdType"; this.cmbSpProdType.Size = new System.Drawing.Size(38, 25); @@ -1391,7 +1382,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.chkPullAfterPush.AutoSize = true; this.chkPullAfterPush.Checked = true; this.chkPullAfterPush.CheckState = System.Windows.Forms.CheckState.Checked; - this.chkPullAfterPush.Location = new System.Drawing.Point(920, 59); + this.chkPullAfterPush.Location = new System.Drawing.Point(920, 60); this.chkPullAfterPush.Name = "chkPullAfterPush"; this.chkPullAfterPush.Size = new System.Drawing.Size(99, 21); this.chkPullAfterPush.TabIndex = 874; @@ -1412,7 +1403,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.splitContainer2.Panel1.Controls.Add(this.btnGetAllCate); this.splitContainer2.Panel1.Controls.Add(this.pnlEditExtCodePrice); this.splitContainer2.Panel1.Controls.Add(this.pbLoading); - this.splitContainer2.Panel1.Controls.Add(this.btnSelect); this.splitContainer2.Panel1.Controls.Add(this.dgvDbProduct); this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 4, 0); // @@ -1583,30 +1573,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.pbLoading.TabIndex = 7; this.pbLoading.TabStop = false; // - // btnSelect - // - this.btnSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSelect.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnSelect.DisabledBackColor = System.Drawing.Color.Empty; - this.btnSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnSelect.Location = new System.Drawing.Point(1344, 33); - this.btnSelect.Name = "btnSelect"; - this.btnSelect.Size = new System.Drawing.Size(84, 25); - this.btnSelect.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnSelect.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnSelect.Style.GradientAngle = 90; - this.btnSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnSelect.TabIndex = 647; - this.btnSelect.Text = "认领选中商品"; - this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click); - // // dgvDbProduct // this.dgvDbProduct.AllowUserToAddRows = false; @@ -1674,31 +1640,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvDbProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvDbProduct_CellContentClick); this.dgvDbProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvDbProduct_Scroll); // - // ucSplitPage1 - // - this.ucSplitPage1.CurrentPage = 1; - this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; - this.ucSplitPage1.IsShowPageSize = true; - this.ucSplitPage1.Location = new System.Drawing.Point(985, 0); - this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); - this.ucSplitPage1.Name = "ucSplitPage1"; - this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); - this.ucSplitPage1.PageSize = 100; - this.ucSplitPage1.Size = new System.Drawing.Size(453, 25); - this.ucSplitPage1.TabIndex = 6; - this.ucSplitPage1.TotalPage = 1; - // - // statusBar - // - this.statusBar.BackColor = System.Drawing.Color.White; - this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; - this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.statusBar.Location = new System.Drawing.Point(0, 0); - this.statusBar.Margin = new System.Windows.Forms.Padding(0); - this.statusBar.Name = "statusBar"; - this.statusBar.Size = new System.Drawing.Size(1438, 25); - this.statusBar.TabIndex = 5; - // // colSelect // this.colSelect.FillWeight = 26F; @@ -1986,6 +1927,80 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.col_select_product.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.col_select_product.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // + // ucSplitPage1 + // + this.ucSplitPage1.CurrentPage = 1; + this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right; + this.ucSplitPage1.IsShowPageSize = true; + this.ucSplitPage1.Location = new System.Drawing.Point(985, 0); + this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0); + this.ucSplitPage1.Name = "ucSplitPage1"; + this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0); + this.ucSplitPage1.PageSize = 100; + this.ucSplitPage1.Size = new System.Drawing.Size(453, 25); + this.ucSplitPage1.TabIndex = 6; + this.ucSplitPage1.TotalPage = 1; + // + // statusBar + // + this.statusBar.BackColor = System.Drawing.Color.White; + this.statusBar.Dock = System.Windows.Forms.DockStyle.Fill; + this.statusBar.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.statusBar.Location = new System.Drawing.Point(0, 0); + this.statusBar.Margin = new System.Windows.Forms.Padding(0); + this.statusBar.Name = "statusBar"; + this.statusBar.Size = new System.Drawing.Size(1438, 25); + this.statusBar.TabIndex = 5; + // + // btnOutProdSaveDb + // + this.btnOutProdSaveDb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.btnOutProdSaveDb.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnOutProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnOutProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty; + this.btnOutProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnOutProdSaveDb.Location = new System.Drawing.Point(17, 43); + this.btnOutProdSaveDb.Name = "btnOutProdSaveDb"; + this.btnOutProdSaveDb.Size = new System.Drawing.Size(105, 23); + this.btnOutProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnOutProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnOutProdSaveDb.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnOutProdSaveDb.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnOutProdSaveDb.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnOutProdSaveDb.Style.GradientAngle = 90; + this.btnOutProdSaveDb.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnOutProdSaveDb.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnOutProdSaveDb.TabIndex = 1154; + this.btnOutProdSaveDb.Text = "导入已采集数据"; + this.btnOutProdSaveDb.Visible = false; + this.btnOutProdSaveDb.Click += new System.EventHandler(this.btnOutProdSaveDb_Click); + // + // tabPage4 + // + this.tabPage4.Controls.Add(this.btnOutProdSaveDb); + this.tabPage4.Controls.Add(this.btnImport); + 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.TabIndex = 3; + this.tabPage4.Text = "商品导入"; + this.tabPage4.UseVisualStyleBackColor = true; + // + // 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(2, 57); + this.label8.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); + this.label8.Name = "label8"; + this.label8.Size = new System.Drawing.Size(80, 17); + this.label8.TabIndex = 706; + this.label8.Text = "移除价格低于"; + // // PDDDBProdListForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -2026,6 +2041,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvDbProduct)).EndInit(); + this.tabPage4.ResumeLayout(false); this.ResumeLayout(false); } @@ -2055,7 +2071,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private DevComponents.DotNetBar.PanelEx btnSetGroup; private System.Windows.Forms.Label lblGroup; private DevComponents.DotNetBar.PanelEx btnSearch; - private DevComponents.DotNetBar.PanelEx btnSelect; private DevComponents.DotNetBar.PanelEx btnDelSelect; private System.Windows.Forms.ComboBox cmbGroupFilter; private System.Windows.Forms.Panel pnlEditExtCodePrice; @@ -2071,7 +2086,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.Label label7; private System.Windows.Forms.Label label9; private System.Windows.Forms.TextBox txtMinPrice; - private System.Windows.Forms.Label label8; private UserComponent.UcCheckBox chkSameSpecPrice; private UserComponent.UcCheckBox chkHighestPriceSku; private System.Windows.Forms.ComboBox cmbSourceType; @@ -2160,5 +2174,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms private System.Windows.Forms.DataGridViewLinkColumn col_edit; private System.Windows.Forms.DataGridViewLinkColumn col_delete; private System.Windows.Forms.DataGridViewLinkColumn col_select_product; + private DevComponents.DotNetBar.PanelEx btnOutProdSaveDb; + private System.Windows.Forms.TabPage tabPage4; + private System.Windows.Forms.Label label8; } } \ No newline at end of file diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs index ffd1b63..ee86126 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs @@ -104,12 +104,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms this.dgvDbProduct.Columns["colEdit"].Visible = false; } - btnSelect.Visible = false; this.dgvDbProduct.Columns["col_select_product"].Visible = false; this.dgvDbProduct.Columns["colAddTimes"].Visible = false; if (shop != null) { - btnSelect.Visible = true; this.dgvDbProduct.Columns["col_select_product"].Visible = true; this.dgvDbProduct.Columns["colAddTimes"].Visible = true; } @@ -623,9 +621,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms ShowImgForm imgFrom = new ShowImgForm(dgvDbProduct.Rows[e.RowIndex].Cells["colImgUrl"].Value.ParseToString().Replace("?imageView2/2/w/90/h/90", "")); imgFrom.ShowDialog(); break; - case "认领": - //Task.Run(() => { SelectProduct(new KJDDBProduct[] { dbProduct }); }); - break; case "编辑": this.lblExtCodePrice.Text = "调整货号 " + dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value.ParseToString() + " 价格"; this.lblExtCode.Text = dgvDbProduct.Rows[e.RowIndex].Cells["col_ext_code"].Value.ParseToString(); @@ -711,30 +706,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms } } - private void btnSelect_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 (prodList.Count() > 0) - { - this.btnSelect.Enabled = false; - Task.Run(() => - { - //SelectProduct(prodList); - Invoke(new Action(() => - { - this.btnSelect.Enabled = true; - })); - }); - } - else - { - BaseMsgForm.ShowError("请选择商品！"); - } - } - private void dgvDbProduct_Scroll(object sender, ScrollEventArgs e) { ShowDgvImg(); @@ -2410,5 +2381,10 @@ namespace TemuKJD.PDDForms.ProductSelectForms DouBaoTitleFissionCefForm fissionCefForm = new DouBaoTitleFissionCefForm(prodList); fissionCefForm.ShowDialog(); } + + private void btnOutProdSaveDb_Click(object sender, EventArgs e) + { + Get1688ProductForm.Out1688ProductImport(false, this.statusBar, this.pbLoading); + } } } diff --git a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs index f43e08f..d300b11 100644 --- a/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs +++ b/TEMUKJD/ToolForms/DouBaoTitleFissionCefForm.cs @@ -186,7 +186,7 @@ namespace TemuKJD.ToolForms foreach (var row in rows) { var cell = row.Cells["colOpResult"]; - Invoke(new Action(() => { cell.Value = ""; })); + Invoke(new Action(() => { cell.Value = "生成中..."; })); var prodId = row.Cells["col_spu_id"].Value.ParseToString(); var prod = this.lstDbProd.FirstOrDefault(p => prodId == p.spu_id); @@ -348,11 +348,18 @@ namespace TemuKJD.ToolForms { foreach (var row in rows) { - Invoke(new Action(() => { row.Cells["colOpResult"].Value = "标题裂变成功"; })); + Invoke(new Action(() => { + row.Cells["colSelect"].Value = false; + row.Cells["colOpResult"].Value = "标题裂变成功"; + })); } } + currentProd = null; + } + else + { + } - currentProd = null; } private void dgvDbProduct_CellContentClick(object sender, DataGridViewCellEventArgs e) diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs index ae3e4d2..6da79fc 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs +++ b/TEMUKJD/ToolForms/Get1688ProductForm.Designer.cs @@ -30,16 +30,11 @@ namespace TemuKJD.ToolForms private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = 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(); this.line1 = new DevComponents.DotNetBar.Controls.Line(); this.label2 = new System.Windows.Forms.Label(); this.btnImportCookie = new DevComponents.DotNetBar.PanelEx(); @@ -95,23 +90,6 @@ namespace TemuKJD.ToolForms this.colMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage3 = new System.Windows.Forms.TabPage(); this.panel1 = new System.Windows.Forms.Panel(); - this.tabPage4 = new System.Windows.Forms.TabPage(); - this.panel2 = new System.Windows.Forms.Panel(); - this.dgvOut1688Prod = new TemuKJD.UserComponent.DataGridViewEx(); - this.dataGridViewCheckBoxColumn1 = new System.Windows.Forms.DataGridViewCheckBoxColumn(); - this.colFileName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutSupplierName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutGoodsId = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutGoodsName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutCat = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutImg = new System.Windows.Forms.DataGridViewImageColumn(); - this.colOutPrice = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.colOutStock = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.dataGridViewLinkColumn1 = new System.Windows.Forms.DataGridViewLinkColumn(); - this.colOutMsg = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.btnOutProdSaveDb = new DevComponents.DotNetBar.PanelEx(); this.chkSkip = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnGetDetail = new DevComponents.DotNetBar.PanelEx(); this.pnlMultiLogin.SuspendLayout(); @@ -128,9 +106,6 @@ namespace TemuKJD.ToolForms ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).BeginInit(); this.tabPage3.SuspendLayout(); - this.tabPage4.SuspendLayout(); - this.panel2.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dgvOut1688Prod)).BeginInit(); this.SuspendLayout(); // // line1 @@ -567,7 +542,6 @@ namespace TemuKJD.ToolForms // splitContainer1.Panel2 // this.splitContainer1.Panel2.BackColor = System.Drawing.Color.White; - this.splitContainer1.Panel2.Controls.Add(this.btnOutProdSaveDb); this.splitContainer1.Panel2.Controls.Add(this.chkSkip); this.splitContainer1.Panel2.Controls.Add(this.btnGetDetail); this.splitContainer1.Panel2.Controls.Add(this.btnStopStop); @@ -593,7 +567,7 @@ namespace TemuKJD.ToolForms this.splitContainer1.Panel2.Controls.Add(this.label2); this.splitContainer1.Panel2.Controls.Add(this.line1); this.splitContainer1.Size = new System.Drawing.Size(1404, 561); - this.splitContainer1.SplitterDistance = 463; + this.splitContainer1.SplitterDistance = 464; this.splitContainer1.SplitterWidth = 3; this.splitContainer1.TabIndex = 4; // @@ -604,14 +578,13 @@ namespace TemuKJD.ToolForms this.ucTabControlMetro1.Controls.Add(this.tabPage1); this.ucTabControlMetro1.Controls.Add(this.tabPage2); this.ucTabControlMetro1.Controls.Add(this.tabPage3); - this.ucTabControlMetro1.Controls.Add(this.tabPage4); this.ucTabControlMetro1.Dock = System.Windows.Forms.DockStyle.Fill; this.ucTabControlMetro1.ItemSize = new System.Drawing.Size(72, 24); this.ucTabControlMetro1.Location = new System.Drawing.Point(0, 0); this.ucTabControlMetro1.Name = "ucTabControlMetro1"; this.ucTabControlMetro1.SelectedIndex = 0; this.ucTabControlMetro1.ShowCloseButton = false; - this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 463); + this.ucTabControlMetro1.Size = new System.Drawing.Size(1404, 464); this.ucTabControlMetro1.TabIndex = 462; this.ucTabControlMetro1.TabSelectColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); this.ucTabControlMetro1.TabSelectTextColor = System.Drawing.Color.Gray; @@ -625,7 +598,7 @@ namespace TemuKJD.ToolForms this.tabPage1.Margin = new System.Windows.Forms.Padding(5); this.tabPage1.Name = "tabPage1"; this.tabPage1.Padding = new System.Windows.Forms.Padding(3); - this.tabPage1.Size = new System.Drawing.Size(1396, 431); + this.tabPage1.Size = new System.Drawing.Size(1396, 432); this.tabPage1.TabIndex = 0; this.tabPage1.Text = "商品页面"; this.tabPage1.UseVisualStyleBackColor = true; @@ -644,7 +617,7 @@ namespace TemuKJD.ToolForms this.splitContainer2.Panel1.Controls.Add(this.btnNext); this.splitContainer2.Panel1.Controls.Add(this.btnPrev); this.splitContainer2.Panel1.Controls.Add(this.txtAddress); - this.splitContainer2.Size = new System.Drawing.Size(1390, 425); + this.splitContainer2.Size = new System.Drawing.Size(1390, 426); this.splitContainer2.SplitterDistance = 26; this.splitContainer2.TabIndex = 6; // @@ -686,7 +659,7 @@ namespace TemuKJD.ToolForms this.tabPage2.Location = new System.Drawing.Point(4, 28); this.tabPage2.Name = "tabPage2"; this.tabPage2.Padding = new System.Windows.Forms.Padding(3); - this.tabPage2.Size = new System.Drawing.Size(1396, 430); + this.tabPage2.Size = new System.Drawing.Size(1396, 431); this.tabPage2.TabIndex = 1; this.tabPage2.Text = "采集商品列表"; this.tabPage2.UseVisualStyleBackColor = true; @@ -707,20 +680,20 @@ namespace TemuKJD.ToolForms // this.dgvProduct.AllowUserToAddRows = false; this.dgvProduct.AllowUserToDeleteRows = false; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1; this.dgvProduct.AutoRowNumber = true; this.dgvProduct.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; this.dgvProduct.BackgroundColor = System.Drawing.Color.White; this.dgvProduct.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.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12; + 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.dgvProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2; this.dgvProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colCheck, @@ -746,7 +719,7 @@ namespace TemuKJD.ToolForms this.dgvProduct.Name = "dgvProduct"; this.dgvProduct.ReadOnly = true; this.dgvProduct.RowTemplate.Height = 23; - this.dgvProduct.Size = new System.Drawing.Size(1390, 424); + this.dgvProduct.Size = new System.Drawing.Size(1390, 425); this.dgvProduct.TabIndex = 7; this.dgvProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvProduct_CellContentClick); // @@ -782,8 +755,8 @@ namespace TemuKJD.ToolForms // // colGoodsName // - dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle13; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colGoodsName.DefaultCellStyle = dataGridViewCellStyle3; this.colGoodsName.HeaderText = "商品名称"; this.colGoodsName.Name = "colGoodsName"; this.colGoodsName.ReadOnly = true; @@ -815,8 +788,8 @@ namespace TemuKJD.ToolForms // // colPrice // - dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colPrice.DefaultCellStyle = dataGridViewCellStyle14; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colPrice.DefaultCellStyle = dataGridViewCellStyle4; this.colPrice.FillWeight = 40F; this.colPrice.HeaderText = "供货价"; this.colPrice.Name = "colPrice"; @@ -875,8 +848,8 @@ namespace TemuKJD.ToolForms // // colMsg // - dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colMsg.DefaultCellStyle = dataGridViewCellStyle15; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colMsg.DefaultCellStyle = dataGridViewCellStyle5; this.colMsg.FillWeight = 160F; this.colMsg.HeaderText = "操作结果"; this.colMsg.Name = "colMsg"; @@ -888,7 +861,7 @@ namespace TemuKJD.ToolForms this.tabPage3.Location = new System.Drawing.Point(4, 28); this.tabPage3.Name = "tabPage3"; this.tabPage3.Padding = new System.Windows.Forms.Padding(3); - this.tabPage3.Size = new System.Drawing.Size(1396, 430); + this.tabPage3.Size = new System.Drawing.Size(1396, 431); this.tabPage3.TabIndex = 2; this.tabPage3.Text = "1688地址管理"; this.tabPage3.UseVisualStyleBackColor = true; @@ -898,202 +871,9 @@ namespace TemuKJD.ToolForms this.panel1.Dock = System.Windows.Forms.DockStyle.Fill; this.panel1.Location = new System.Drawing.Point(3, 3); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(1390, 424); + this.panel1.Size = new System.Drawing.Size(1390, 425); this.panel1.TabIndex = 0; // - // tabPage4 - // - this.tabPage4.Controls.Add(this.panel2); - this.tabPage4.Location = new System.Drawing.Point(4, 28); - this.tabPage4.Name = "tabPage4"; - this.tabPage4.Padding = new System.Windows.Forms.Padding(3); - this.tabPage4.Size = new System.Drawing.Size(1396, 430); - this.tabPage4.TabIndex = 3; - this.tabPage4.Text = "已采集数据"; - this.tabPage4.UseVisualStyleBackColor = true; - // - // panel2 - // - this.panel2.Controls.Add(this.dgvOut1688Prod); - this.panel2.Dock = System.Windows.Forms.DockStyle.Fill; - this.panel2.Location = new System.Drawing.Point(3, 3); - this.panel2.Name = "panel2"; - this.panel2.Size = new System.Drawing.Size(1390, 424); - this.panel2.TabIndex = 1; - // - // dgvOut1688Prod - // - this.dgvOut1688Prod.AllowUserToAddRows = false; - this.dgvOut1688Prod.AllowUserToDeleteRows = false; - dataGridViewCellStyle16.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvOut1688Prod.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16; - this.dgvOut1688Prod.AutoRowNumber = true; - this.dgvOut1688Prod.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill; - this.dgvOut1688Prod.BackgroundColor = System.Drawing.Color.White; - this.dgvOut1688Prod.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvOut1688Prod.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17; - this.dgvOut1688Prod.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dgvOut1688Prod.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.dataGridViewCheckBoxColumn1, - this.colFileName, - this.colOutSupplierId, - this.colOutSupplierName, - this.colOutGoodsId, - this.colOutGoodsName, - this.colOutCat, - this.colOutImgUrl, - this.colOutImg, - this.colOutPrice, - this.colOutStock, - this.dataGridViewLinkColumn1, - this.colOutMsg}); - this.dgvOut1688Prod.Dock = System.Windows.Forms.DockStyle.Fill; - this.dgvOut1688Prod.Location = new System.Drawing.Point(0, 0); - this.dgvOut1688Prod.MultiSelectCheckBox = true; - this.dgvOut1688Prod.Name = "dgvOut1688Prod"; - this.dgvOut1688Prod.ReadOnly = true; - this.dgvOut1688Prod.RowTemplate.Height = 23; - this.dgvOut1688Prod.Size = new System.Drawing.Size(1390, 424); - this.dgvOut1688Prod.TabIndex = 839; - // - // dataGridViewCheckBoxColumn1 - // - this.dataGridViewCheckBoxColumn1.FillWeight = 26F; - this.dataGridViewCheckBoxColumn1.HeaderText = "选"; - this.dataGridViewCheckBoxColumn1.Name = "dataGridViewCheckBoxColumn1"; - this.dataGridViewCheckBoxColumn1.ReadOnly = true; - this.dataGridViewCheckBoxColumn1.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewCheckBoxColumn1.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colFileName - // - this.colFileName.FillWeight = 150F; - this.colFileName.HeaderText = "文件名称"; - this.colFileName.Name = "colFileName"; - this.colFileName.ReadOnly = true; - // - // colOutSupplierId - // - this.colOutSupplierId.FillWeight = 50F; - this.colOutSupplierId.HeaderText = "供应商Id"; - this.colOutSupplierId.Name = "colOutSupplierId"; - this.colOutSupplierId.ReadOnly = true; - // - // colOutSupplierName - // - this.colOutSupplierName.FillWeight = 90F; - this.colOutSupplierName.HeaderText = "供应商名称"; - this.colOutSupplierName.Name = "colOutSupplierName"; - this.colOutSupplierName.ReadOnly = true; - // - // colOutGoodsId - // - this.colOutGoodsId.FillWeight = 50F; - this.colOutGoodsId.HeaderText = "商品Id"; - this.colOutGoodsId.Name = "colOutGoodsId"; - this.colOutGoodsId.ReadOnly = true; - // - // colOutGoodsName - // - dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOutGoodsName.DefaultCellStyle = dataGridViewCellStyle18; - this.colOutGoodsName.FillWeight = 150F; - this.colOutGoodsName.HeaderText = "商品名称"; - this.colOutGoodsName.Name = "colOutGoodsName"; - this.colOutGoodsName.ReadOnly = true; - // - // colOutCat - // - this.colOutCat.FillWeight = 40F; - this.colOutCat.HeaderText = "商品类目"; - this.colOutCat.Name = "colOutCat"; - this.colOutCat.ReadOnly = true; - // - // colOutImgUrl - // - this.colOutImgUrl.FillWeight = 300F; - this.colOutImgUrl.HeaderText = "图片路径"; - this.colOutImgUrl.Name = "colOutImgUrl"; - this.colOutImgUrl.ReadOnly = true; - this.colOutImgUrl.Visible = false; - // - // colOutImg - // - this.colOutImg.FillWeight = 40F; - this.colOutImg.HeaderText = "图片"; - this.colOutImg.ImageLayout = System.Windows.Forms.DataGridViewImageCellLayout.Zoom; - this.colOutImg.Name = "colOutImg"; - this.colOutImg.ReadOnly = true; - this.colOutImg.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colOutImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; - // - // colOutPrice - // - dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOutPrice.DefaultCellStyle = dataGridViewCellStyle19; - this.colOutPrice.FillWeight = 40F; - this.colOutPrice.HeaderText = "供货价"; - this.colOutPrice.Name = "colOutPrice"; - this.colOutPrice.ReadOnly = true; - // - // colOutStock - // - this.colOutStock.FillWeight = 50F; - this.colOutStock.HeaderText = "库存"; - this.colOutStock.Name = "colOutStock"; - this.colOutStock.ReadOnly = true; - this.colOutStock.Visible = false; - // - // dataGridViewLinkColumn1 - // - this.dataGridViewLinkColumn1.FillWeight = 35F; - this.dataGridViewLinkColumn1.HeaderText = "删除"; - this.dataGridViewLinkColumn1.Name = "dataGridViewLinkColumn1"; - this.dataGridViewLinkColumn1.ReadOnly = true; - this.dataGridViewLinkColumn1.Visible = false; - // - // colOutMsg - // - dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colOutMsg.DefaultCellStyle = dataGridViewCellStyle20; - this.colOutMsg.FillWeight = 160F; - this.colOutMsg.HeaderText = "操作结果"; - this.colOutMsg.Name = "colOutMsg"; - this.colOutMsg.ReadOnly = true; - // - // btnOutProdSaveDb - // - this.btnOutProdSaveDb.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.btnOutProdSaveDb.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnOutProdSaveDb.Cursor = System.Windows.Forms.Cursors.Hand; - this.btnOutProdSaveDb.DisabledBackColor = System.Drawing.Color.Empty; - this.btnOutProdSaveDb.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnOutProdSaveDb.Location = new System.Drawing.Point(929, 58); - this.btnOutProdSaveDb.Name = "btnOutProdSaveDb"; - this.btnOutProdSaveDb.Size = new System.Drawing.Size(97, 23); - this.btnOutProdSaveDb.Style.Alignment = System.Drawing.StringAlignment.Center; - this.btnOutProdSaveDb.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; - this.btnOutProdSaveDb.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; - this.btnOutProdSaveDb.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; - this.btnOutProdSaveDb.Style.ForeColor.Color = System.Drawing.Color.White; - this.btnOutProdSaveDb.Style.GradientAngle = 90; - this.btnOutProdSaveDb.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; - this.btnOutProdSaveDb.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); - this.btnOutProdSaveDb.TabIndex = 1150; - this.btnOutProdSaveDb.Text = "已采集数据入库"; - this.btnOutProdSaveDb.Visible = false; - this.btnOutProdSaveDb.Click += new System.EventHandler(this.btnOutProdSaveDb_Click); - // // chkSkip // this.chkSkip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1158,9 +938,6 @@ namespace TemuKJD.ToolForms ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dgvProduct)).EndInit(); this.tabPage3.ResumeLayout(false); - this.tabPage4.ResumeLayout(false); - this.panel2.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dgvOut1688Prod)).EndInit(); this.ResumeLayout(false); } @@ -1224,22 +1001,5 @@ namespace TemuKJD.ToolForms private System.Windows.Forms.DataGridViewTextBoxColumn colMsg; private System.Windows.Forms.TabPage tabPage3; private System.Windows.Forms.Panel panel1; - private System.Windows.Forms.TabPage tabPage4; - private System.Windows.Forms.Panel panel2; - private UserComponent.DataGridViewEx dgvOut1688Prod; - private System.Windows.Forms.DataGridViewCheckBoxColumn dataGridViewCheckBoxColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn colFileName; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutSupplierId; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutSupplierName; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutGoodsId; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutGoodsName; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutCat; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutImgUrl; - private System.Windows.Forms.DataGridViewImageColumn colOutImg; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutPrice; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutStock; - private System.Windows.Forms.DataGridViewLinkColumn dataGridViewLinkColumn1; - private System.Windows.Forms.DataGridViewTextBoxColumn colOutMsg; - private DevComponents.DotNetBar.PanelEx btnOutProdSaveDb; } } \ No newline at end of file diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.cs b/TEMUKJD/ToolForms/Get1688ProductForm.cs index 555f61b..fbaeeb6 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.cs +++ b/TEMUKJD/ToolForms/Get1688ProductForm.cs @@ -28,6 +28,7 @@ using TemuKJD.BLL; using TemuKJD.Extension; using TemuKJD.Helper; using TemuKJD.PDDForms.ProductSelectForms; +using TemuKJD.UserControls; using TemuKJD.WXForms.ProductForms; using Work; @@ -68,16 +69,13 @@ namespace TemuKJD.ToolForms { if(IsAuthorityUser) { - tabPage2.Controls.Add(dgvOut1688Prod); this.ucTabControlMetro1.TabPages.RemoveAt(3); this.ucTabControlMetro1.TabPages.RemoveAt(2); - btnOutProdSaveDb.Visible = true; } this.splitContainer1.SplitterDistance = 472; this.dgvProduct.AddSelectorColumn("colCheck"); this.dgvProduct.AddImgColumn("colImg", "colImgUrl"); - this.dgvOut1688Prod.AddImgColumn("colOutImg", "colOutImgUrl"); lst1688cookie = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("1688_cookies"); if (lst1688cookie == null) @@ -987,10 +985,6 @@ namespace TemuKJD.ToolForms })); }, cancellationTokenSource.Token); } - else if (btnSaveDb.Text == "外部商品入库" || btnSaveDb.Text == "已采集数据入库") - { - Out1688ProductImport(); - } } @@ -1140,31 +1134,11 @@ namespace TemuKJD.ToolForms BaseMsgForm.ShowInfo("复制成功"); } - - private void btnStop_Click(object sender, EventArgs e) - { - if (CancelReturn != null) - CancelReturn.Cancel(); - } - private void ucTabControlMetro1_SelectedIndexChanged(object sender, EventArgs e) { - if (ucTabControlMetro1.SelectedTab.Text == "1688外部数据" || ucTabControlMetro1.SelectedTab.Text == "已采集数据") - { - btnSaveDb.Text = "外部商品入库"; - btnSaveDb.Text = "已采集数据入库"; - btnGetDetail.Visible = false; - btnGetGoods.Visible = false; - } - else - { - btnSaveDb.Text = "采集商品入库"; - btnGetDetail.Visible = true; - btnGetGoods.Visible = true; - } } - void Out1688ProductImport() + public static void Out1688ProductImport(bool isAuthorityUser, StatusBarUserControl statusBar, PictureBox pbLoading) { OpenFileDialog openFileDialog = new OpenFileDialog(); openFileDialog.Multiselect = true; @@ -1173,14 +1147,14 @@ namespace TemuKJD.ToolForms // 显示对话框并获取结果 if (openFileDialog.ShowDialog() == DialogResult.OK) { - dgvOut1688Prod.BringToFront(); - pbLoading.BringToFront(); + //dgvOut1688Prod.BringToFront(); + //pbLoading.BringToFront(); var filePathLst = openFileDialog.FileNames.ToList(); - dgvOut1688Prod.Rows.Clear(); - pbLoading.Visible = true; - this.statusBar.pgbTaskProgress.Maximum = filePathLst.Count; - this.statusBar.UpdateProgressBar(0); + //dgvOut1688Prod.Rows.Clear(); + //pbLoading.Visible = true; + statusBar.pgbTaskProgress.Maximum = filePathLst.Count; + statusBar.UpdateProgressBar(0); Task.Run(() => { int successNum = 0; @@ -1195,49 +1169,47 @@ namespace TemuKJD.ToolForms { content = sr.ReadToEnd(); } - rst = Out1688ProdImportOne(path, content); + rst = Out1688ProdImportOne(isAuthorityUser, path, content); Thread.Sleep(100); - if (this.IsAuthorityUser) + if (isAuthorityUser) Thread.Sleep(1000); } catch (Exception ex) { rst = ex.Message; } - if (string.IsNullOrEmpty(rst)) + if (string.IsNullOrEmpty(rst) || rst.Contains("成功")) successNum++; else failedNum++; - Invoke(new Action(() => + statusBar.Invoke(new Action(() => { - this.statusBar.UpdateProgressBar(this.statusBar.pgbTaskProgress.Value + 1); - this.statusBar.lblTaskStatus.Text = "正在导入"; + statusBar.UpdateProgressBar(statusBar.pgbTaskProgress.Value + 1); + statusBar.lblTaskStatus.Text = "正在导入 成功" + successNum + " 失败" + failedNum; })); } - Invoke(new Action(() => + statusBar.Invoke(new Action(() => { pbLoading.Visible = false; - this.statusBar.lblTaskStatus.Text = "导入完成"; + statusBar.lblTaskStatus.Text = "导入完成 成功" + successNum + " 失败" + failedNum; BaseMsgForm.ShowInfo("导入完成！"); })); }); } } - string Out1688ProdImportOne(string filePath, string content) + public static string Out1688ProdImportOne(bool isAuthorityUser, string filePath, string content) { - - DataGridViewRow row = null; - Invoke(new Action(() => - { - var index = dgvOut1688Prod.Rows.Add(false, filePath); - row = dgvOut1688Prod.Rows[index]; - row.Height = 60; - })); + //DataGridViewRow row = null; + //Invoke(new Action(() => + //{ + // var index = dgvOut1688Prod.Rows.Add(false, filePath); + // row = dgvOut1688Prod.Rows[index]; + // row.Height = 60; + //})); try { - if (string.IsNullOrEmpty(content) || content.Length < 10) return "商品数据为空"; @@ -1252,12 +1224,10 @@ namespace TemuKJD.ToolForms return convertRst; Thread.Sleep(25); - //if (row.Index % 20 == 0) - // NaiBa.Util.Helper.ConfigHelper.SaveConfig("1688_product_list_" + MainForm.ProcessCount, lst1688OneProductListInfo); // 商品采集权限用户采集的数据加上用户前缀（商品前缀显示给用户的时候隐藏） string collectAuthorityTag = ""; - if (IsAuthorityUser) + if (isAuthorityUser) collectAuthorityTag = "-" + BaseClass.UserName; bool isExist = false; @@ -1268,10 +1238,10 @@ namespace TemuKJD.ToolForms html = GetHtml.PostUtf8(existUrl, existData); if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) { - Invoke(new Action(() => - { - row.Cells["colOutMsg"].Value = "入库失败，产品数据库连接失败"; - })); + //Invoke(new Action(() => + //{ + // row.Cells["colOutMsg"].Value = "入库失败，产品数据库连接失败"; + //})); return "入库失败，产品数据库连接失败"; } else @@ -1280,42 +1250,37 @@ namespace TemuKJD.ToolForms isExist = true; } - - var priceMin = (prodInfo.detail.sku?.Min(x => x.multi_price)).ParseToInt() * 0.01m; var priceMax = (prodInfo.detail.sku?.Max(x => x.multi_price)).ParseToInt() * 0.01m; - Invoke(new Action(() => - { - row.Cells["colOutSupplierId"].Value = (string.IsNullOrEmpty(outProd.shopId) ? outProd.shopName : outProd.shopId); - row.Cells["colOutSupplierName"].Value = outProd.shopName; - row.Cells["colOutGoodsId"].Value = prodInfo.detail.goods_id.ParseToString(); - row.Cells["colOutGoodsName"].Value = prodInfo.detail.goods_name; - row.Cells["colOutCat"].Value = outProd.categoryName; - row.Cells["colOutImgUrl"].Value = prodInfo.detail.image_url; - row.Cells["colOutPrice"].Value = priceMin + "-" + priceMax; - })); - - - + //Invoke(new Action(() => + //{ + // row.Cells["colOutSupplierId"].Value = (string.IsNullOrEmpty(outProd.shopId) ? outProd.shopName : outProd.shopId); + // row.Cells["colOutSupplierName"].Value = outProd.shopName; + // row.Cells["colOutGoodsId"].Value = prodInfo.detail.goods_id.ParseToString(); + // row.Cells["colOutGoodsName"].Value = prodInfo.detail.goods_name; + // row.Cells["colOutCat"].Value = outProd.categoryName; + // row.Cells["colOutImgUrl"].Value = prodInfo.detail.image_url; + // row.Cells["colOutPrice"].Value = priceMin + "-" + priceMax; + //})); //var SetPartnerSpuRst = ""; var url = BaseClass.BuildPDDObjString("product/add_product"); if (isExist) { - if (chkOverride.Checked) - { + //if (chkOverride.Checked) + //{ url = BaseClass.BuildPDDObjString("product/mdy_product"); - } - else - { - //入库成功 已存在相同id商品 - Invoke(new Action(() => - { - row.Cells["colOutMsg"].Value = "已存在相同商品Id，跳过"; - })); - return ""; - } + //} + //else + //{ + // //入库成功 已存在相同id商品 + // Invoke(new Action(() => + // { + // row.Cells["colOutMsg"].Value = "已存在相同商品Id，跳过"; + // })); + // return ""; + //} } if (outProd.minOrderQuaitity.ParseToInt() > 1) @@ -1345,7 +1310,7 @@ namespace TemuKJD.ToolForms "&main_img=" + HttpUtility.UrlEncode(prodInfo.detail.image_url, Encoding.UTF8) + "&wx_safe_status=" + HttpUtility.UrlEncode("未校验", Encoding.UTF8) + "&product_get_type=" + HttpUtility.UrlEncode("1688外部数据", Encoding.UTF8); - if (IsAuthorityUser) + if (isAuthorityUser) { data += "&add_user_name=" + BaseClass.UserName; data += "&group=用户" + BaseClass.UserName; @@ -1371,38 +1336,32 @@ namespace TemuKJD.ToolForms if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) { string msg = "商品入库失败！请检查网络连接：" + BaseRegex.GetStringJson(ref html, "msg"); - Invoke(new Action(() => - { - row.Cells["colOutMsg"].Value = msg; - })); + //Invoke(new Action(() => + //{ + // row.Cells["colOutMsg"].Value = msg; + //})); return msg; } else { - var getProductMsg = "商品入库成功!"; - if (url == BaseClass.BuildPDDObjString("product/mdy_product")) - getProductMsg = "商品覆盖成功!"; - Invoke(new Action(() => - { - row.Cells["colOutMsg"].Value = getProductMsg; - })); + //var getProductMsg = "商品入库成功!"; + //if (url == BaseClass.BuildPDDObjString("product/mdy_product")) + // getProductMsg = "商品覆盖成功!"; + //Invoke(new Action(() => + //{ + // row.Cells["colOutMsg"].Value = getProductMsg; + //})); } - //NaiBa.Util.Helper.ConfigHelper.SaveConfig("1688_product_list_" + MainForm.ProcessCount, lst1688OneProductListInfo); } catch (Exception ex) { - Invoke(new Action(() => - { - row.Cells["colOutMsg"].Value = "商品入库失败" + ex.Message; - })); + //Invoke(new Action(() => + //{ + // row.Cells["colOutMsg"].Value = "商品入库失败" + ex.Message; + //})); return "商品入库失败" + ex.Message; } return ""; } - - private void btnOutProdSaveDb_Click(object sender, EventArgs e) - { - Out1688ProductImport(); - } } } diff --git a/TEMUKJD/ToolForms/Get1688ProductForm.resx b/TEMUKJD/ToolForms/Get1688ProductForm.resx index f7794d5..4c69ba7 100644 --- a/TEMUKJD/ToolForms/Get1688ProductForm.resx +++ b/TEMUKJD/ToolForms/Get1688ProductForm.resx @@ -168,43 +168,4 @@ True - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - - - True - \ No newline at end of file diff --git a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs index d0f9162..705aab5 100644 --- a/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs +++ b/TEMUKJD/WXForms/ProductForms/WXUserProdListForm.Designer.cs @@ -330,16 +330,16 @@ namespace TemuKJD.WXForms.ProductForms // 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(1132, 41); + this.txtViewUvMin.Location = new System.Drawing.Point(1127, 41); this.txtViewUvMin.Name = "txtViewUvMin"; - this.txtViewUvMin.Size = new System.Drawing.Size(58, 23); + this.txtViewUvMin.Size = new System.Drawing.Size(63, 23); this.txtViewUvMin.TabIndex = 882; this.txtViewUvMin.Visible = false; // // chkViewUvMin // this.chkViewUvMin.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkViewUvMin.Location = new System.Drawing.Point(1078, 42); + this.chkViewUvMin.Location = new System.Drawing.Point(1073, 42); this.chkViewUvMin.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkViewUvMin.Name = "chkViewUvMin"; this.chkViewUvMin.Size = new System.Drawing.Size(48, 21); @@ -356,10 +356,10 @@ namespace TemuKJD.WXForms.ProductForms "", "爆款数据", "普通商品"}); - this.cmbHot.Location = new System.Drawing.Point(921, 7); + this.cmbHot.Location = new System.Drawing.Point(917, 7); this.cmbHot.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbHot.Name = "cmbHot"; - this.cmbHot.Size = new System.Drawing.Size(148, 25); + this.cmbHot.Size = new System.Drawing.Size(147, 25); this.cmbHot.TabIndex = 882; this.cmbHot.Text = "普通商品"; this.cmbHot.Visible = false; @@ -369,7 +369,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblHot.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblHot.AutoSize = true; - this.lblHot.Location = new System.Drawing.Point(877, 9); + this.lblHot.Location = new System.Drawing.Point(873, 9); this.lblHot.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblHot.Name = "lblHot"; this.lblHot.Size = new System.Drawing.Size(44, 17); @@ -384,7 +384,7 @@ namespace TemuKJD.WXForms.ProductForms 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(1075, 5); + this.btnSearch.Location = new System.Drawing.Point(1070, 5); this.btnSearch.Name = "btnSearch"; this.btnSearch.Size = new System.Drawing.Size(51, 25); this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center; @@ -408,9 +408,9 @@ namespace TemuKJD.WXForms.ProductForms 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(1132, 5); + this.btnEmpty.Location = new System.Drawing.Point(1127, 5); this.btnEmpty.Name = "btnEmpty"; - this.btnEmpty.Size = new System.Drawing.Size(58, 25); + this.btnEmpty.Size = new System.Drawing.Size(63, 25); this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center; this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255))))); @@ -435,10 +435,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat3.DropDownWidth = 1; this.cmbCat3.FormattingEnabled = true; this.cmbCat3.IntegralHeight = false; - this.cmbCat3.Location = new System.Drawing.Point(723, 7); + this.cmbCat3.Location = new System.Drawing.Point(720, 7); this.cmbCat3.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat3.Name = "cmbCat3"; - this.cmbCat3.Size = new System.Drawing.Size(148, 25); + this.cmbCat3.Size = new System.Drawing.Size(147, 25); this.cmbCat3.TabIndex = 811; this.cmbCat3.Text = "全部"; this.cmbCat3.SelectedIndexChanged += new System.EventHandler(this.cmbCat3_SelectedIndexChanged); @@ -448,7 +448,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label17.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(672, 9); + this.label17.Location = new System.Drawing.Point(669, 9); this.label17.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label17.Name = "label17"; this.label17.Size = new System.Drawing.Size(51, 17); @@ -463,10 +463,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat2.DropDownWidth = 1; this.cmbCat2.FormattingEnabled = true; this.cmbCat2.IntegralHeight = false; - this.cmbCat2.Location = new System.Drawing.Point(519, 7); + this.cmbCat2.Location = new System.Drawing.Point(517, 7); this.cmbCat2.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat2.Name = "cmbCat2"; - this.cmbCat2.Size = new System.Drawing.Size(147, 25); + this.cmbCat2.Size = new System.Drawing.Size(146, 25); this.cmbCat2.TabIndex = 804; this.cmbCat2.Text = "全部"; this.cmbCat2.SelectedIndexChanged += new System.EventHandler(this.cmbCat2_SelectedIndexChanged); @@ -476,7 +476,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label14.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label14.AutoSize = true; - this.label14.Location = new System.Drawing.Point(468, 9); + this.label14.Location = new System.Drawing.Point(466, 9); this.label14.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label14.Name = "label14"; this.label14.Size = new System.Drawing.Size(51, 17); @@ -491,10 +491,10 @@ namespace TemuKJD.WXForms.ProductForms this.cmbCat1.DropDownWidth = 1; this.cmbCat1.FormattingEnabled = true; this.cmbCat1.IntegralHeight = false; - this.cmbCat1.Location = new System.Drawing.Point(295, 5); + this.cmbCat1.Location = new System.Drawing.Point(294, 5); this.cmbCat1.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbCat1.Name = "cmbCat1"; - this.cmbCat1.Size = new System.Drawing.Size(148, 25); + this.cmbCat1.Size = new System.Drawing.Size(147, 25); this.cmbCat1.TabIndex = 805; this.cmbCat1.Text = "全部"; this.cmbCat1.SelectedIndexChanged += new System.EventHandler(this.cmbCat1_SelectedIndexChanged); @@ -504,7 +504,7 @@ namespace TemuKJD.WXForms.ProductForms // this.label2.Anchor = System.Windows.Forms.AnchorStyles.Right; this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(244, 9); + this.label2.Location = new System.Drawing.Point(243, 9); this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(51, 17); @@ -517,7 +517,7 @@ namespace TemuKJD.WXForms.ProductForms this.txtProdName.Location = new System.Drawing.Point(71, 6); this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtProdName.Name = "txtProdName"; - this.txtProdName.Size = new System.Drawing.Size(148, 23); + this.txtProdName.Size = new System.Drawing.Size(147, 23); this.txtProdName.TabIndex = 427; // // label3 @@ -554,14 +554,14 @@ namespace TemuKJD.WXForms.ProductForms this.cmbWxSafe.Location = new System.Drawing.Point(71, 40); this.cmbWxSafe.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbWxSafe.Name = "cmbWxSafe"; - this.cmbWxSafe.Size = new System.Drawing.Size(148, 25); + this.cmbWxSafe.Size = new System.Drawing.Size(147, 25); this.cmbWxSafe.TabIndex = 676; this.cmbWxSafe.Text = "安全+未校验"; // // chkCatBoundMoreThan // this.chkCatBoundMoreThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundMoreThan.Location = new System.Drawing.Point(228, 42); + this.chkCatBoundMoreThan.Location = new System.Drawing.Point(227, 42); this.chkCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundMoreThan.Name = "chkCatBoundMoreThan"; this.chkCatBoundMoreThan.Size = new System.Drawing.Size(64, 21); @@ -573,10 +573,10 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundMoreThan // this.txtCatBoundMoreThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundMoreThan.Location = new System.Drawing.Point(295, 41); + this.txtCatBoundMoreThan.Location = new System.Drawing.Point(294, 41); this.txtCatBoundMoreThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundMoreThan.Name = "txtCatBoundMoreThan"; - this.txtCatBoundMoreThan.Size = new System.Drawing.Size(148, 23); + this.txtCatBoundMoreThan.Size = new System.Drawing.Size(147, 23); this.txtCatBoundMoreThan.TabIndex = 882; this.txtCatBoundMoreThan.Text = "1000"; this.txtCatBoundMoreThan.Visible = false; @@ -584,7 +584,7 @@ namespace TemuKJD.WXForms.ProductForms // chkCatBoundLessThan // this.chkCatBoundLessThan.Anchor = System.Windows.Forms.AnchorStyles.Left; - this.chkCatBoundLessThan.Location = new System.Drawing.Point(452, 42); + this.chkCatBoundLessThan.Location = new System.Drawing.Point(450, 42); this.chkCatBoundLessThan.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3); this.chkCatBoundLessThan.Name = "chkCatBoundLessThan"; this.chkCatBoundLessThan.Size = new System.Drawing.Size(64, 21); @@ -596,10 +596,10 @@ namespace TemuKJD.WXForms.ProductForms // txtCatBoundLessThan // this.txtCatBoundLessThan.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right))); - this.txtCatBoundLessThan.Location = new System.Drawing.Point(519, 41); + this.txtCatBoundLessThan.Location = new System.Drawing.Point(517, 41); this.txtCatBoundLessThan.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.txtCatBoundLessThan.Name = "txtCatBoundLessThan"; - this.txtCatBoundLessThan.Size = new System.Drawing.Size(147, 23); + this.txtCatBoundLessThan.Size = new System.Drawing.Size(146, 23); this.txtCatBoundLessThan.TabIndex = 883; this.txtCatBoundLessThan.Text = "100000"; this.txtCatBoundLessThan.Visible = false; @@ -608,10 +608,10 @@ namespace TemuKJD.WXForms.ProductForms // 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(921, 42); + this.cmbGroupFilter.Location = new System.Drawing.Point(917, 42); this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbGroupFilter.Name = "cmbGroupFilter"; - this.cmbGroupFilter.Size = new System.Drawing.Size(148, 25); + this.cmbGroupFilter.Size = new System.Drawing.Size(147, 25); this.cmbGroupFilter.TabIndex = 653; this.cmbGroupFilter.Visible = false; this.cmbGroupFilter.SelectedIndexChanged += new System.EventHandler(this.cmbGroupFilter_SelectedIndexChanged); @@ -620,7 +620,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblSourceType.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblSourceType.AutoSize = true; - this.lblSourceType.Location = new System.Drawing.Point(679, 44); + this.lblSourceType.Location = new System.Drawing.Point(676, 44); this.lblSourceType.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblSourceType.Name = "lblSourceType"; this.lblSourceType.Size = new System.Drawing.Size(44, 17); @@ -632,7 +632,7 @@ namespace TemuKJD.WXForms.ProductForms // this.lblGroupFilter.Anchor = System.Windows.Forms.AnchorStyles.Right; this.lblGroupFilter.AutoSize = true; - this.lblGroupFilter.Location = new System.Drawing.Point(877, 44); + this.lblGroupFilter.Location = new System.Drawing.Point(873, 44); this.lblGroupFilter.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0); this.lblGroupFilter.Name = "lblGroupFilter"; this.lblGroupFilter.Size = new System.Drawing.Size(44, 17); @@ -655,10 +655,10 @@ namespace TemuKJD.WXForms.ProductForms "机会商品", "以图搜品", "多多外部数据"}); - this.cmbSourceType.Location = new System.Drawing.Point(723, 42); + this.cmbSourceType.Location = new System.Drawing.Point(720, 42); this.cmbSourceType.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3); this.cmbSourceType.Name = "cmbSourceType"; - this.cmbSourceType.Size = new System.Drawing.Size(148, 25); + this.cmbSourceType.Size = new System.Drawing.Size(147, 25); this.cmbSourceType.TabIndex = 654; this.cmbSourceType.Text = "厂商直采"; this.cmbSourceType.Visible = false; diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs index fac5207..8e01a8f 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.Designer.cs @@ -91,6 +91,9 @@ namespace TemuKJD.WXForms.ShopForms System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle57 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle58 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle59 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle60 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle61 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle62 = new System.Windows.Forms.DataGridViewCellStyle(); this.splitContainer1 = new System.Windows.Forms.SplitContainer(); this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); this.btnWaybillManage = new DevComponents.DotNetBar.PanelEx(); @@ -134,6 +137,7 @@ namespace TemuKJD.WXForms.ShopForms this.colRemaining = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.splitContainer2 = new System.Windows.Forms.SplitContainer(); + this.chkUseReshipmentApi = new TemuKJD.UserComponent.UcCheckBox(this.components); this.btnUpdateKdn = new DevComponents.DotNetBar.PanelEx(); this.txtFilterOrderId = new System.Windows.Forms.TextBox(); this.btnRestoreFilter = new DevComponents.DotNetBar.PanelEx(); @@ -162,6 +166,8 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv1Img = new System.Windows.Forms.DataGridViewImageColumn(); this.colDgv1SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv1ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1SkuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv1Cnt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv1Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv1SkuCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv1OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -184,6 +190,8 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv2Img = new System.Windows.Forms.DataGridViewImageColumn(); this.colDgv2SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv2SkuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv2Cnt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2SkuCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv2EvaluationId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -207,8 +215,10 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3InShop = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv3ImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv3Img = new System.Windows.Forms.DataGridViewImageColumn(); - this.colDgv3DraftId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv3ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3SkuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3Cnt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv3Spec = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv3SkuCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv3OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -222,6 +232,8 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv3Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv3Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3WaybillStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv3WaybillLatelyTrace = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage4 = new System.Windows.Forms.TabPage(); this.panel4 = new System.Windows.Forms.Panel(); this.pictureBox4 = new System.Windows.Forms.PictureBox(); @@ -235,6 +247,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv4Img = new System.Windows.Forms.DataGridViewImageColumn(); this.colDgv4SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv4ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4SkuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv4Cnt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv4SkuCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv4OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -248,6 +261,8 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv4OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv4Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv4Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4WaybillStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv4WaybillLatelyTrace = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage5 = new System.Windows.Forms.TabPage(); this.panel5 = new System.Windows.Forms.Panel(); this.pictureBox5 = new System.Windows.Forms.PictureBox(); @@ -261,6 +276,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv5Img = new System.Windows.Forms.DataGridViewImageColumn(); this.colDgv5SpuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv5ProductName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv5SkuId = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv5Cnt = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv5SkuCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv5OrderId = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -273,6 +289,8 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv5OptimizeStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.colDgv5Optimize = new System.Windows.Forms.DataGridViewLinkColumn(); this.colDgv5Remark = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv5WaybillStatus = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.colDgv5WaybillLatelyTrace = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.tabPage6 = new System.Windows.Forms.TabPage(); this.splitContainer4 = new System.Windows.Forms.SplitContainer(); this.statusBar = new TemuKJD.UserControls.StatusBarUserControl(); @@ -995,6 +1013,7 @@ namespace TemuKJD.WXForms.ShopForms // // splitContainer2.Panel2 // + this.splitContainer2.Panel2.Controls.Add(this.chkUseReshipmentApi); this.splitContainer2.Panel2.Controls.Add(this.btnUpdateKdn); this.splitContainer2.Panel2.Controls.Add(this.txtFilterOrderId); this.splitContainer2.Panel2.Controls.Add(this.btnRestoreFilter); @@ -1006,6 +1025,17 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer2.SplitterDistance = 365; this.splitContainer2.TabIndex = 0; // + // chkUseReshipmentApi + // + this.chkUseReshipmentApi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.chkUseReshipmentApi.AutoSize = true; + this.chkUseReshipmentApi.Location = new System.Drawing.Point(732, 10); + this.chkUseReshipmentApi.Name = "chkUseReshipmentApi"; + this.chkUseReshipmentApi.Size = new System.Drawing.Size(75, 21); + this.chkUseReshipmentApi.TabIndex = 782; + this.chkUseReshipmentApi.Text = "补发测试"; + this.chkUseReshipmentApi.UseVisualStyleBackColor = true; + // // btnUpdateKdn // this.btnUpdateKdn.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); @@ -1029,17 +1059,16 @@ namespace TemuKJD.WXForms.ShopForms this.btnUpdateKdn.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); this.btnUpdateKdn.TabIndex = 801; this.btnUpdateKdn.Text = "刷新订单助手状态"; - this.btnUpdateKdn.Visible = false; this.btnUpdateKdn.Click += new System.EventHandler(this.btnUpdateKdn_Click); // // txtFilterOrderId // this.txtFilterOrderId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.txtFilterOrderId.Font = new System.Drawing.Font("微软雅黑", 10F); - this.txtFilterOrderId.Location = new System.Drawing.Point(777, 7); + this.txtFilterOrderId.Location = new System.Drawing.Point(852, 7); this.txtFilterOrderId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2); this.txtFilterOrderId.Name = "txtFilterOrderId"; - this.txtFilterOrderId.Size = new System.Drawing.Size(219, 25); + this.txtFilterOrderId.Size = new System.Drawing.Size(144, 25); this.txtFilterOrderId.TabIndex = 790; // // btnRestoreFilter @@ -1096,7 +1125,7 @@ namespace TemuKJD.WXForms.ShopForms // this.label3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(730, 12); + this.label3.Location = new System.Drawing.Point(806, 12); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(56, 17); this.label3.TabIndex = 797; @@ -1306,6 +1335,8 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv1Img, this.colDgv1SpuId, this.colDgv1ProductName, + this.colDgv1SkuId, + this.colDgv1Cnt, this.colDgv1Spec, this.colDgv1SkuCode, this.colDgv1OrderId, @@ -1403,6 +1434,20 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv1ProductName.ReadOnly = true; this.colDgv1ProductName.Width = 180; // + // colDgv1SkuId + // + this.colDgv1SkuId.HeaderText = "SkuId"; + this.colDgv1SkuId.Name = "colDgv1SkuId"; + this.colDgv1SkuId.ReadOnly = true; + this.colDgv1SkuId.Visible = false; + // + // colDgv1Cnt + // + this.colDgv1Cnt.HeaderText = "数量"; + this.colDgv1Cnt.Name = "colDgv1Cnt"; + this.colDgv1Cnt.ReadOnly = true; + this.colDgv1Cnt.Visible = false; + // // colDgv1Spec // dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; @@ -1536,6 +1581,8 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv2Img, this.colDgv2SpuId, this.colDgv2ProductName, + this.colDgv2SkuId, + this.colDgv2Cnt, this.colDgv2Spec, this.colDgv2SkuCode, this.colDgv2EvaluationId, @@ -1638,6 +1685,20 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv2ProductName.ReadOnly = true; this.colDgv2ProductName.Width = 160; // + // colDgv2SkuId + // + this.colDgv2SkuId.HeaderText = "SkuId"; + this.colDgv2SkuId.Name = "colDgv2SkuId"; + this.colDgv2SkuId.ReadOnly = true; + this.colDgv2SkuId.Visible = false; + // + // colDgv2Cnt + // + this.colDgv2Cnt.HeaderText = "数量"; + this.colDgv2Cnt.Name = "colDgv2Cnt"; + this.colDgv2Cnt.ReadOnly = true; + this.colDgv2Cnt.Visible = false; + // // colDgv2Spec // dataGridViewCellStyle16.WrapMode = System.Windows.Forms.DataGridViewTriState.True; @@ -1794,8 +1855,10 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3InShop, this.colDgv3ImgUrl, this.colDgv3Img, - this.colDgv3DraftId, + this.colDgv3SpuId, this.colDgv3ProductName, + this.colDgv3SkuId, + this.colDgv3Cnt, this.colDgv3Spec, this.colDgv3SkuCode, this.colDgv3OrderId, @@ -1808,7 +1871,9 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3WaybillId, this.colDgv3OptimizeStatus, this.colDgv3Optimize, - this.colDgv3Remark}); + this.colDgv3Remark, + this.colDgv3WaybillStatus, + this.colDgv3WaybillLatelyTrace}); this.dgvData3.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvData3.Location = new System.Drawing.Point(0, 0); this.dgvData3.MultiSelectCheckBox = true; @@ -1881,14 +1946,14 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3Img.ReadOnly = true; this.colDgv3Img.Width = 60; // - // colDgv3DraftId + // colDgv3SpuId // - this.colDgv3DraftId.HeaderText = "商品Id"; - this.colDgv3DraftId.Name = "colDgv3DraftId"; - this.colDgv3DraftId.ReadOnly = true; - this.colDgv3DraftId.Resizable = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv3DraftId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; - this.colDgv3DraftId.Width = 110; + this.colDgv3SpuId.HeaderText = "商品Id"; + this.colDgv3SpuId.Name = "colDgv3SpuId"; + this.colDgv3SpuId.ReadOnly = true; + this.colDgv3SpuId.Resizable = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3SpuId.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable; + this.colDgv3SpuId.Width = 110; // // colDgv3ProductName // @@ -1899,6 +1964,20 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3ProductName.ReadOnly = true; this.colDgv3ProductName.Width = 120; // + // colDgv3SkuId + // + this.colDgv3SkuId.HeaderText = "SkuId"; + this.colDgv3SkuId.Name = "colDgv3SkuId"; + this.colDgv3SkuId.ReadOnly = true; + this.colDgv3SkuId.Visible = false; + // + // colDgv3Cnt + // + this.colDgv3Cnt.HeaderText = "数量"; + this.colDgv3Cnt.Name = "colDgv3Cnt"; + this.colDgv3Cnt.ReadOnly = true; + this.colDgv3Cnt.Visible = false; + // // colDgv3Spec // dataGridViewCellStyle27.WrapMode = System.Windows.Forms.DataGridViewTriState.True; @@ -2007,6 +2086,21 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv3Remark.Name = "colDgv3Remark"; this.colDgv3Remark.ReadOnly = true; // + // colDgv3WaybillStatus + // + this.colDgv3WaybillStatus.HeaderText = "物流状态"; + this.colDgv3WaybillStatus.Name = "colDgv3WaybillStatus"; + this.colDgv3WaybillStatus.ReadOnly = true; + this.colDgv3WaybillStatus.Width = 68; + // + // colDgv3WaybillLatelyTrace + // + dataGridViewCellStyle35.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv3WaybillLatelyTrace.DefaultCellStyle = dataGridViewCellStyle35; + this.colDgv3WaybillLatelyTrace.HeaderText = "最新路由"; + this.colDgv3WaybillLatelyTrace.Name = "colDgv3WaybillLatelyTrace"; + this.colDgv3WaybillLatelyTrace.ReadOnly = true; + // // tabPage4 // this.tabPage4.Controls.Add(this.panel4); @@ -2044,19 +2138,19 @@ namespace TemuKJD.WXForms.ShopForms // this.dgvData4.AllowUserToAddRows = false; this.dgvData4.AllowUserToDeleteRows = false; - dataGridViewCellStyle35.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle35; + dataGridViewCellStyle36.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData4.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle36; this.dgvData4.AutoRowNumber = true; this.dgvData4.BackgroundColor = System.Drawing.Color.White; this.dgvData4.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle36.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle36.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle36.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle36.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle36.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle36.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle36.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle36; + dataGridViewCellStyle37.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle37.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle37.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle37.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle37.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle37.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData4.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle37; this.dgvData4.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvData4.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colDgv4Check, @@ -2068,6 +2162,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv4Img, this.colDgv4SpuId, this.colDgv4ProductName, + this.colDgv4SkuId, this.colDgv4Cnt, this.colDgv4SkuCode, this.colDgv4OrderId, @@ -2080,7 +2175,9 @@ namespace TemuKJD.WXForms.ShopForms this.dataGridViewTextBoxColumn12, this.colDgv4OptimizeStatus, this.colDgv4Optimize, - this.colDgv4Remark}); + this.colDgv4Remark, + this.colDgv4WaybillStatus, + this.colDgv4WaybillLatelyTrace}); this.dgvData4.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvData4.Location = new System.Drawing.Point(0, 0); this.dgvData4.MultiSelectCheckBox = true; @@ -2111,8 +2208,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv4ShopName // - dataGridViewCellStyle37.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4ShopName.DefaultCellStyle = dataGridViewCellStyle37; + dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4ShopName.DefaultCellStyle = dataGridViewCellStyle38; this.colDgv4ShopName.Frozen = true; this.colDgv4ShopName.HeaderText = "店铺名称"; this.colDgv4ShopName.Name = "colDgv4ShopName"; @@ -2164,17 +2261,24 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv4ProductName // - dataGridViewCellStyle38.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4ProductName.DefaultCellStyle = dataGridViewCellStyle38; + dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4ProductName.DefaultCellStyle = dataGridViewCellStyle39; this.colDgv4ProductName.HeaderText = "商品标题"; this.colDgv4ProductName.Name = "colDgv4ProductName"; this.colDgv4ProductName.ReadOnly = true; this.colDgv4ProductName.Width = 120; // + // colDgv4SkuId + // + this.colDgv4SkuId.HeaderText = "skuId"; + this.colDgv4SkuId.Name = "colDgv4SkuId"; + this.colDgv4SkuId.ReadOnly = true; + this.colDgv4SkuId.Visible = false; + // // colDgv4Cnt // - dataGridViewCellStyle39.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Cnt.DefaultCellStyle = dataGridViewCellStyle39; + dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Cnt.DefaultCellStyle = dataGridViewCellStyle40; this.colDgv4Cnt.HeaderText = "数量"; this.colDgv4Cnt.Name = "colDgv4Cnt"; this.colDgv4Cnt.ReadOnly = true; @@ -2190,8 +2294,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv4OrderId // - dataGridViewCellStyle40.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4OrderId.DefaultCellStyle = dataGridViewCellStyle40; + dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OrderId.DefaultCellStyle = dataGridViewCellStyle41; this.colDgv4OrderId.HeaderText = "单号"; this.colDgv4OrderId.Name = "colDgv4OrderId"; this.colDgv4OrderId.ReadOnly = true; @@ -2199,16 +2303,16 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv4Address // - dataGridViewCellStyle41.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle41; + dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Address.DefaultCellStyle = dataGridViewCellStyle42; this.colDgv4Address.HeaderText = "收货地址"; this.colDgv4Address.Name = "colDgv4Address"; this.colDgv4Address.ReadOnly = true; // // colDgv4OrderTime // - dataGridViewCellStyle42.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4OrderTime.DefaultCellStyle = dataGridViewCellStyle42; + dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OrderTime.DefaultCellStyle = dataGridViewCellStyle43; this.colDgv4OrderTime.HeaderText = "下单时间"; this.colDgv4OrderTime.Name = "colDgv4OrderTime"; this.colDgv4OrderTime.ReadOnly = true; @@ -2216,8 +2320,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv4DeliveryName // - dataGridViewCellStyle43.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4DeliveryName.DefaultCellStyle = dataGridViewCellStyle43; + dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4DeliveryName.DefaultCellStyle = dataGridViewCellStyle44; this.colDgv4DeliveryName.HeaderText = "物流公司"; this.colDgv4DeliveryName.Name = "colDgv4DeliveryName"; this.colDgv4DeliveryName.ReadOnly = true; @@ -2232,8 +2336,8 @@ namespace TemuKJD.WXForms.ShopForms // // dataGridViewTextBoxColumn10 // - dataGridViewCellStyle44.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle44; + dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn10.DefaultCellStyle = dataGridViewCellStyle45; this.dataGridViewTextBoxColumn10.HeaderText = "揽收、签收时间"; this.dataGridViewTextBoxColumn10.Name = "dataGridViewTextBoxColumn10"; this.dataGridViewTextBoxColumn10.ReadOnly = true; @@ -2241,8 +2345,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv4Addresses // - dataGridViewCellStyle45.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4Addresses.DefaultCellStyle = dataGridViewCellStyle45; + dataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4Addresses.DefaultCellStyle = dataGridViewCellStyle46; this.colDgv4Addresses.HeaderText = "发货、收货地"; this.colDgv4Addresses.Name = "colDgv4Addresses"; this.colDgv4Addresses.ReadOnly = true; @@ -2250,8 +2354,8 @@ namespace TemuKJD.WXForms.ShopForms // // dataGridViewTextBoxColumn12 // - dataGridViewCellStyle46.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle46; + dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dataGridViewTextBoxColumn12.DefaultCellStyle = dataGridViewCellStyle47; this.dataGridViewTextBoxColumn12.HeaderText = "配送时长"; this.dataGridViewTextBoxColumn12.Name = "dataGridViewTextBoxColumn12"; this.dataGridViewTextBoxColumn12.ReadOnly = true; @@ -2259,8 +2363,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv4OptimizeStatus // - dataGridViewCellStyle47.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv4OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle47; + dataGridViewCellStyle48.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle48; this.colDgv4OptimizeStatus.HeaderText = "补发状态"; this.colDgv4OptimizeStatus.Name = "colDgv4OptimizeStatus"; this.colDgv4OptimizeStatus.ReadOnly = true; @@ -2279,6 +2383,21 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv4Remark.Name = "colDgv4Remark"; this.colDgv4Remark.ReadOnly = true; // + // colDgv4WaybillStatus + // + this.colDgv4WaybillStatus.HeaderText = "物流状态"; + this.colDgv4WaybillStatus.Name = "colDgv4WaybillStatus"; + this.colDgv4WaybillStatus.ReadOnly = true; + this.colDgv4WaybillStatus.Width = 68; + // + // colDgv4WaybillLatelyTrace + // + dataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv4WaybillLatelyTrace.DefaultCellStyle = dataGridViewCellStyle49; + this.colDgv4WaybillLatelyTrace.HeaderText = "最新路由"; + this.colDgv4WaybillLatelyTrace.Name = "colDgv4WaybillLatelyTrace"; + this.colDgv4WaybillLatelyTrace.ReadOnly = true; + // // tabPage5 // this.tabPage5.Controls.Add(this.panel5); @@ -2316,19 +2435,19 @@ namespace TemuKJD.WXForms.ShopForms // this.dgvData5.AllowUserToAddRows = false; this.dgvData5.AllowUserToDeleteRows = false; - dataGridViewCellStyle48.BackColor = System.Drawing.Color.WhiteSmoke; - this.dgvData5.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle48; + dataGridViewCellStyle50.BackColor = System.Drawing.Color.WhiteSmoke; + this.dgvData5.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle50; this.dgvData5.AutoRowNumber = true; this.dgvData5.BackgroundColor = System.Drawing.Color.White; this.dgvData5.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); - dataGridViewCellStyle49.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle49.BackColor = System.Drawing.SystemColors.Control; - dataGridViewCellStyle49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle49.ForeColor = System.Drawing.SystemColors.WindowText; - dataGridViewCellStyle49.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle49.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle49.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvData5.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle49; + dataGridViewCellStyle51.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle51.BackColor = System.Drawing.SystemColors.Control; + dataGridViewCellStyle51.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle51.ForeColor = System.Drawing.SystemColors.WindowText; + dataGridViewCellStyle51.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle51.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvData5.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle51; this.dgvData5.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; this.dgvData5.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { this.colDgv5Check, @@ -2340,6 +2459,7 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv5Img, this.colDgv5SpuId, this.colDgv5ProductName, + this.colDgv5SkuId, this.colDgv5Cnt, this.colDgv5SkuCode, this.colDgv5OrderId, @@ -2351,7 +2471,9 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv5NegativeReason, this.colDgv5OptimizeStatus, this.colDgv5Optimize, - this.colDgv5Remark}); + this.colDgv5Remark, + this.colDgv5WaybillStatus, + this.colDgv5WaybillLatelyTrace}); this.dgvData5.Dock = System.Windows.Forms.DockStyle.Fill; this.dgvData5.Location = new System.Drawing.Point(0, 0); this.dgvData5.MultiSelectCheckBox = true; @@ -2382,8 +2504,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv5ShopName // - dataGridViewCellStyle50.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5ShopName.DefaultCellStyle = dataGridViewCellStyle50; + dataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5ShopName.DefaultCellStyle = dataGridViewCellStyle52; this.colDgv5ShopName.Frozen = true; this.colDgv5ShopName.HeaderText = "店铺名称"; this.colDgv5ShopName.Name = "colDgv5ShopName"; @@ -2435,17 +2557,24 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv5ProductName // - dataGridViewCellStyle51.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5ProductName.DefaultCellStyle = dataGridViewCellStyle51; + dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5ProductName.DefaultCellStyle = dataGridViewCellStyle53; this.colDgv5ProductName.HeaderText = "商品标题"; this.colDgv5ProductName.Name = "colDgv5ProductName"; this.colDgv5ProductName.ReadOnly = true; this.colDgv5ProductName.Width = 120; // + // colDgv5SkuId + // + this.colDgv5SkuId.HeaderText = "SkuId"; + this.colDgv5SkuId.Name = "colDgv5SkuId"; + this.colDgv5SkuId.ReadOnly = true; + this.colDgv5SkuId.Visible = false; + // // colDgv5Cnt // - dataGridViewCellStyle52.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5Cnt.DefaultCellStyle = dataGridViewCellStyle52; + dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5Cnt.DefaultCellStyle = dataGridViewCellStyle54; this.colDgv5Cnt.HeaderText = "数量"; this.colDgv5Cnt.Name = "colDgv5Cnt"; this.colDgv5Cnt.ReadOnly = true; @@ -2461,8 +2590,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv5OrderId // - dataGridViewCellStyle53.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5OrderId.DefaultCellStyle = dataGridViewCellStyle53; + dataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5OrderId.DefaultCellStyle = dataGridViewCellStyle55; this.colDgv5OrderId.HeaderText = "单号"; this.colDgv5OrderId.Name = "colDgv5OrderId"; this.colDgv5OrderId.ReadOnly = true; @@ -2470,16 +2599,16 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv5Address // - dataGridViewCellStyle54.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5Address.DefaultCellStyle = dataGridViewCellStyle54; + dataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5Address.DefaultCellStyle = dataGridViewCellStyle56; this.colDgv5Address.HeaderText = "收货地址"; this.colDgv5Address.Name = "colDgv5Address"; this.colDgv5Address.ReadOnly = true; // // colDgv5OrderTime // - dataGridViewCellStyle55.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5OrderTime.DefaultCellStyle = dataGridViewCellStyle55; + dataGridViewCellStyle57.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5OrderTime.DefaultCellStyle = dataGridViewCellStyle57; this.colDgv5OrderTime.HeaderText = "下单时间"; this.colDgv5OrderTime.Name = "colDgv5OrderTime"; this.colDgv5OrderTime.ReadOnly = true; @@ -2487,8 +2616,8 @@ namespace TemuKJD.WXForms.ShopForms // // colDgv5DeliveryName // - dataGridViewCellStyle56.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5DeliveryName.DefaultCellStyle = dataGridViewCellStyle56; + dataGridViewCellStyle58.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5DeliveryName.DefaultCellStyle = dataGridViewCellStyle58; this.colDgv5DeliveryName.HeaderText = "物流公司"; this.colDgv5DeliveryName.Name = "colDgv5DeliveryName"; this.colDgv5DeliveryName.ReadOnly = true; @@ -2503,24 +2632,24 @@ namespace TemuKJD.WXForms.ShopForms // // colDev5ComplaintReason // - dataGridViewCellStyle57.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDev5ComplaintReason.DefaultCellStyle = dataGridViewCellStyle57; + dataGridViewCellStyle59.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDev5ComplaintReason.DefaultCellStyle = dataGridViewCellStyle59; this.colDev5ComplaintReason.HeaderText = "投诉原因"; this.colDev5ComplaintReason.Name = "colDev5ComplaintReason"; this.colDev5ComplaintReason.ReadOnly = true; // // colDgv5NegativeReason // - dataGridViewCellStyle58.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5NegativeReason.DefaultCellStyle = dataGridViewCellStyle58; + dataGridViewCellStyle60.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5NegativeReason.DefaultCellStyle = dataGridViewCellStyle60; this.colDgv5NegativeReason.HeaderText = "差评原因"; this.colDgv5NegativeReason.Name = "colDgv5NegativeReason"; this.colDgv5NegativeReason.ReadOnly = true; // // colDgv5OptimizeStatus // - dataGridViewCellStyle59.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.colDgv5OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle59; + dataGridViewCellStyle61.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5OptimizeStatus.DefaultCellStyle = dataGridViewCellStyle61; this.colDgv5OptimizeStatus.HeaderText = "补发状态"; this.colDgv5OptimizeStatus.Name = "colDgv5OptimizeStatus"; this.colDgv5OptimizeStatus.ReadOnly = true; @@ -2539,6 +2668,21 @@ namespace TemuKJD.WXForms.ShopForms this.colDgv5Remark.Name = "colDgv5Remark"; this.colDgv5Remark.ReadOnly = true; // + // colDgv5WaybillStatus + // + this.colDgv5WaybillStatus.HeaderText = "物流状态"; + this.colDgv5WaybillStatus.Name = "colDgv5WaybillStatus"; + this.colDgv5WaybillStatus.ReadOnly = true; + this.colDgv5WaybillStatus.Width = 68; + // + // colDgv5WaybillLatelyTrace + // + dataGridViewCellStyle62.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.colDgv5WaybillLatelyTrace.DefaultCellStyle = dataGridViewCellStyle62; + this.colDgv5WaybillLatelyTrace.HeaderText = "最新路由"; + this.colDgv5WaybillLatelyTrace.Name = "colDgv5WaybillLatelyTrace"; + this.colDgv5WaybillLatelyTrace.ReadOnly = true; + // // tabPage6 // this.tabPage6.Controls.Add(this.splitContainer4); @@ -2557,7 +2701,7 @@ namespace TemuKJD.WXForms.ShopForms this.splitContainer4.Name = "splitContainer4"; this.splitContainer4.Panel1MinSize = 0; this.splitContainer4.Size = new System.Drawing.Size(1082, 483); - this.splitContainer4.SplitterDistance = 0; + this.splitContainer4.SplitterDistance = 25; this.splitContainer4.TabIndex = 0; // // statusBar @@ -2707,27 +2851,6 @@ namespace TemuKJD.WXForms.ShopForms private DevComponents.DotNetBar.PanelEx btnRemarkOK; private System.Windows.Forms.Label label1; private System.Windows.Forms.TextBox txtRemark; - private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv2Check; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopId; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopName; - private System.Windows.Forms.DataGridViewLinkColumn colDgv2Login; - private System.Windows.Forms.DataGridViewLinkColumn colDgv2InShop; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ImgUrl; - private System.Windows.Forms.DataGridViewImageColumn colDgv2Img; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2SpuId; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ProductName; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Spec; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2SkuCode; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2EvaluationId; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OrderId; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Address; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OrderTime; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2UserNick; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2CommentTime; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2CommentContent; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OptimizeStatus; - private System.Windows.Forms.DataGridViewLinkColumn colDgv2Optimize; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Remark; private System.Windows.Forms.Label lblShopId; private System.Windows.Forms.Label label2; private System.Windows.Forms.TextBox txtFilterOrderId; @@ -2753,6 +2876,10 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colOnSaleNum; private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining; private System.Windows.Forms.DataGridViewTextBoxColumn colMessage; + private System.Windows.Forms.TabPage tabPage6; + private System.Windows.Forms.SplitContainer splitContainer4; + private DevComponents.DotNetBar.PanelEx btnUpdateKdn; + private UserComponent.UcCheckBox chkUseReshipmentApi; private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv3Check; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ShopName; @@ -2760,8 +2887,10 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewLinkColumn colDgv3InShop; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ImgUrl; private System.Windows.Forms.DataGridViewImageColumn colDgv3Img; - private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3DraftId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3SpuId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3ProductName; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3SkuId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Cnt; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Spec; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3SkuCode; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OrderId; @@ -2775,6 +2904,8 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3OptimizeStatus; private System.Windows.Forms.DataGridViewLinkColumn colDgv3Optimize; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3Remark; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3WaybillStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv3WaybillLatelyTrace; private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv1Check; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1ShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1ShopName; @@ -2784,6 +2915,8 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewImageColumn colDgv1Img; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1SpuId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1ProductName; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1SkuId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1Cnt; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1Spec; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1SkuCode; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OrderId; @@ -2793,6 +2926,29 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1OptimizeStatus; private System.Windows.Forms.DataGridViewLinkColumn colDgv1Optimize; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv1Remark; + private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv2Check; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ShopName; + private System.Windows.Forms.DataGridViewLinkColumn colDgv2Login; + private System.Windows.Forms.DataGridViewLinkColumn colDgv2InShop; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ImgUrl; + private System.Windows.Forms.DataGridViewImageColumn colDgv2Img; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2SpuId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2ProductName; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2SkuId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Cnt; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Spec; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2SkuCode; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2EvaluationId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OrderId; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Address; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OrderTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2UserNick; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2CommentTime; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2CommentContent; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2OptimizeStatus; + private System.Windows.Forms.DataGridViewLinkColumn colDgv2Optimize; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv2Remark; private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv4Check; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ShopName; @@ -2802,6 +2958,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewImageColumn colDgv4Img; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4SpuId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4ProductName; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4SkuId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Cnt; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4SkuCode; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OrderId; @@ -2815,6 +2972,8 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4OptimizeStatus; private System.Windows.Forms.DataGridViewLinkColumn colDgv4Optimize; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4Remark; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4WaybillStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv4WaybillLatelyTrace; private System.Windows.Forms.DataGridViewCheckBoxColumn colDgv5Check; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5ShopId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5ShopName; @@ -2824,6 +2983,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewImageColumn colDgv5Img; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5SpuId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5ProductName; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5SkuId; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5Cnt; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5SkuCode; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5OrderId; @@ -2836,8 +2996,7 @@ namespace TemuKJD.WXForms.ShopForms private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5OptimizeStatus; private System.Windows.Forms.DataGridViewLinkColumn colDgv5Optimize; private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5Remark; - private System.Windows.Forms.TabPage tabPage6; - private System.Windows.Forms.SplitContainer splitContainer4; - private DevComponents.DotNetBar.PanelEx btnUpdateKdn; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5WaybillStatus; + private System.Windows.Forms.DataGridViewTextBoxColumn colDgv5WaybillLatelyTrace; } } \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs index b51aabd..f00722f 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.cs @@ -33,13 +33,18 @@ using TemuKJD.WXForms.ProductForms; using TemuKJD.WXForms.AdminForms; using CefSharp.WinForms; using NaiBa.CefHelper; -using System.Net; +using CefSharp; +using TemuKJD.Helper; +using NaiBa.CefHelper.Handler; namespace TemuKJD.WXForms.ShopForms { public partial class WXShopOptimizeForm : BaseForm { - public string expressToolUrl = "https://56.kdniao.com/main.html"; + public string kdnAuth = ""; + public string kdnAuthKey = "Auth"; + public string expressToolUrl = "https://56.kdniao.com/main.html"; + public Dictionary dicKdnRequest = new Dictionary(); public ChromiumWebBrowser cefWebBrowser = null; public CancellationTokenSource cancellationTokenSource { get; set; } = null; @@ -86,15 +91,55 @@ namespace TemuKJD.WXForms.ShopForms this.tabPage6.Select(); cefWebBrowser = CEFBrowser.CreateChromiumWebBrowser(expressToolUrl); + CustomResourceRequestHandlerLocal resourceRequestHandler = new CustomResourceRequestHandlerLocal(); + resourceRequestHandler.ResourceLoadCompleteEvent += RequestHandler_ResourceLoadComplete; + resourceRequestHandler.BeforeResourceLoadEvent += RequestHandler_BeforeResourceLoad; + cefWebBrowser.RequestHandler = new CustomRequestHandler(resourceRequestHandler); splitContainer4.Panel2.Controls.Add(cefWebBrowser); Task.Run(() => { Thread.Sleep(500); Invoke(new Action(() => { this.tabPage1.Select(); })); }); - this.ucTabControl1.TabPages.Remove(tabPage6); + //this.ucTabControl1.TabPages.Remove(tabPage6); IsLoadComplate = true; } + private void RequestHandler_ResourceLoadComplete(object sender, string url, string postData, string responseData, IRequest request) + { + //if (url.StartsWith("https://lmsapinew.kdniao.com/WayBillMonitor/GetWayBillPageResult")) + //{ + // var reqStr = JsonHelper.SerializeObject(request.Headers); + // var keys = request.Headers.AllKeys; + // foreach (var key in keys) + // { + // this.dicKdnRequest[key] = request.Headers.GetValues(key); + // } + //} + if (url .StartsWith("https://lmsapinew.kdniao.com/")) + { + try + { + kdnAuth = request.Headers["Auth"].ParseToString(); + } + catch + { + } + } + } + private bool RequestHandler_BeforeResourceLoad(object sender, string url, string postData, IRequest request) + { + if (url.StartsWith("https://lmsapinew.kdniao.com/WayBillMonitor/GetWayBillPageResult")) + { + var reqStr = JsonHelper.SerializeObject(request.Headers); + var keys = request.Headers.AllKeys; + foreach (var key in keys) + { + this.dicKdnRequest[key] = request.Headers[key]; + } + } + + return false; + } private void chkSelectAll_CheckedChanged(object sender, EventArgs e) { @@ -674,6 +719,10 @@ namespace TemuKJD.WXForms.ShopForms refundOrder.province = wxOrder.acceptInfo.addressInfo.provinceName; refundOrder.city = wxOrder.acceptInfo.addressInfo.cityName; refundOrder.district = wxOrder.acceptInfo.addressInfo.countyName; + + var prod = wxOrder.orderProductInfo.FirstOrDefault(p => p.productId == refundOrder.spuId && p.skuCode == refundOrder.skuCode); + if (prod != null) + refundOrder.skuId = prod.skuId; } } } @@ -843,6 +892,8 @@ namespace TemuKJD.WXForms.ShopForms DataGridViewExtension.defaultBitmap, refundOrder.orderInfo.spuId, refundOrder.orderInfo.name, + refundOrder.skuId, + refundOrder.cnt, refundOrder.orderInfo.skuName, refundOrder.orderInfo.skuCode, refundOrder.orderInfo.orderId, @@ -980,11 +1031,22 @@ namespace TemuKJD.WXForms.ShopForms prodEvaluationInfo.order_id = string.Join(" ", wxOrderLst.Select(o => o.commonInfo.orderId)) + " 获取到多条订单号"; else { - prodEvaluationInfo.order_id = wxOrderLst.FirstOrDefault().commonInfo.orderId; - prodEvaluationInfo.orderTime = wxOrderLst.FirstOrDefault().commonInfo.createTime; - prodEvaluationInfo.province = wxOrderLst.FirstOrDefault().acceptInfo.addressInfo.provinceName; - prodEvaluationInfo.city = wxOrderLst.FirstOrDefault().acceptInfo.addressInfo.cityName; - prodEvaluationInfo.district = wxOrderLst.FirstOrDefault().acceptInfo.addressInfo.countyName; + var wxOrder = wxOrderLst.FirstOrDefault(); + if (wxOrder != null) + { + prodEvaluationInfo.order_id = wxOrder.commonInfo.orderId; + prodEvaluationInfo.orderTime = wxOrder.commonInfo.createTime; + prodEvaluationInfo.province = wxOrder.acceptInfo.addressInfo.provinceName; + prodEvaluationInfo.city = wxOrder.acceptInfo.addressInfo.cityName; + prodEvaluationInfo.district = wxOrder.acceptInfo.addressInfo.countyName; + + var prod = wxOrder.orderProductInfo.FirstOrDefault(p => p.productId == prodEvaluationInfo.spuId && p.skuId == prodEvaluationInfo.skuId); + if (prod != null) + { + prodEvaluationInfo.skuCode = prod.skuCode; + prodEvaluationInfo.cnt = prod.productCnt; + } + } } } catch @@ -1153,6 +1215,8 @@ namespace TemuKJD.WXForms.ShopForms DataGridViewExtension.defaultBitmap, prodEvaluationInfo.productInfo.productId, prodEvaluationInfo.productInfo.spuName, + prodEvaluationInfo.skuId, + prodEvaluationInfo.cnt, prodEvaluationInfo.productInfo.skuName, "", // spuCode 此处获取不到填空 prodEvaluationInfo.productEvaluationId, @@ -1340,6 +1404,10 @@ namespace TemuKJD.WXForms.ShopForms orderWaybill.province = wxOrder.acceptInfo.addressInfo.provinceName; orderWaybill.city = wxOrder.acceptInfo.addressInfo.cityName; orderWaybill.district = wxOrder.acceptInfo.addressInfo.countyName; + + var prod = wxOrder.orderProductInfo.FirstOrDefault(p => p.productId == orderWaybill.spuId && p.skuCode == orderWaybill.skuCode); + if (prod != null) + orderWaybill.skuId = prod.skuId; } } } @@ -1512,6 +1580,8 @@ namespace TemuKJD.WXForms.ShopForms DataGridViewExtension.defaultBitmap, orderWaybill.orderInfo.spuId, orderWaybill.orderInfo.name, + orderWaybill.skuId, + orderWaybill.cnt, orderWaybill.orderInfo.skuName + " x" + orderWaybill.orderInfo.productCnt, orderWaybill.orderInfo.skuCode, orderWaybill.orderInfo.orderId, // + "\r\n" + orderWaybill.waybillId, @@ -1850,6 +1920,7 @@ namespace TemuKJD.WXForms.ShopForms DataGridViewExtension.defaultBitmap, string.Join("\r\n", orderLinerCgiInfo.product_list.Select(p => p.product_id)), string.Join("\r\n", orderLinerCgiInfo.product_list.Select(p => p.title)), + "", // skuId不展示 string.Join("\r\n", orderLinerCgiInfo.product_list.Select(p => "x" + p.product_count)), "", //skuCode不展示 orderLinerCgiInfo.order_id, // + "\r\n" + orderLinerCgiInfo.waybill_id, @@ -2190,6 +2261,7 @@ namespace TemuKJD.WXForms.ShopForms DataGridViewExtension.defaultBitmap, feedbackOrder.orderInfo.spuId, feedbackOrder.orderInfo.name, + "", // skuId不展示 feedbackOrder.orderInfo.productCnt, feedbackOrder.orderInfo.skuCode, feedbackOrder.orderInfo.orderId, @@ -2231,7 +2303,7 @@ namespace TemuKJD.WXForms.ShopForms cancellationTokenSource.Cancel(); } - public string OptimizeExpress(ShopLoginInfo shop, string orderId, string orderCreateTime = "") + public string OptimizeExpress(ShopLoginInfo shop, string orderId, string orderCreateTime = "", string spuId = "", string skuId = "", int cnt = 1) { var url = BaseClass.BuildObjString("shop/select_waybill"); var data = ""; @@ -2253,21 +2325,40 @@ namespace TemuKJD.WXForms.ShopForms var delivery_id = BaseRegex.GetStringJson(ref html, "delivery_id"); var delivery_name = BaseRegex.GetStringJson(ref html, "delivery_name"); - JObject body = new JObject(); - body["platform"] = "WEISHOP"; - //body["shopId"] = shop.ShopId; - body["orderId"] = orderId; - body["expressNo"] = waybill_id; - body["expressName"] = delivery_id; - url = "https://po.e57.cn/prod-api/api/oms-api/order/optimize/optimizeExpressInfo"; - var bodyStr = JsonHelper.SerializeObject(body); - var optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, ""); - if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200")) - optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, ""); - System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument(); - + string optimizeExpressRst = ""; string msg = ""; string code = ""; + string mode = ""; + if (!chkUseReshipmentApi.Checked) + { + JObject body = new JObject(); + body["platform"] = "WEISHOP"; + //body["shopId"] = shop.ShopId; + body["orderId"] = orderId; + body["expressNo"] = waybill_id; + body["expressName"] = delivery_id; + url = "https://po.e57.cn/prod-api/api/oms-api/order/optimize/optimizeExpressInfo"; + var bodyStr = JsonHelper.SerializeObject(body); + optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, ""); + if (!optimizeExpressRst.Contains("修改物流信息成功") && !optimizeExpressRst.Contains("200")) + optimizeExpressRst = WXHttpResponseBLL.e57PostResponse(url, bodyStr, ""); + } + else + { + mode = "2"; + var rst = ShopOptimize.orderCompensationDelivery(shop, orderId, delivery_id, waybill_id, spuId, skuId, cnt); + if (rst.Contains("\"code\":0")) + { + optimizeExpressRst = "补发货修改物流信息成功200"; + } + else + { + var errMsg = BaseRegex.GetStringJsonByRegs(ref rst, rst, "errmsg", "errMsg"); + optimizeExpressRst = "" + errMsg + "500"; + } + } + + System.Xml.XmlDocument xmlDoc = new System.Xml.XmlDocument(); try { xmlDoc.LoadXml(optimizeExpressRst); //订单不存在，orderId:3735398415030708224500 @@ -2283,7 +2374,7 @@ namespace TemuKJD.WXForms.ShopForms { data += "&waybill_id=" + waybill_id; data += "&delivery_name=" + delivery_name; - data += "&optimize_rst=补发成功" + " " + delivery_id + ":" + waybill_id; + data += "&optimize_rst=补发成功" + mode + " " + delivery_id + ":" + waybill_id; } else { @@ -2321,7 +2412,7 @@ namespace TemuKJD.WXForms.ShopForms } if (!optimizeExpressRst.ParseToString().Contains("修改物流信息成功") && !optimizeExpressRst.ParseToString().Contains("200")) return "补发失败，已还原\r\n" + msg + " " + delivery_id + ":" + waybill_id; - return "补发成功" + " " + delivery_id + ":" + waybill_id; + return "补发成功" + mode + " " + delivery_id + ":" + waybill_id; } private void dgvData_CellContentClick(object sender, DataGridViewCellEventArgs e) @@ -2395,7 +2486,17 @@ namespace TemuKJD.WXForms.ShopForms BaseMsgForm.ShowError("缺少订单编号无法补发！"); return; } - var rst = OptimizeExpress(shop, orderId, row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString()); + if (chkUseReshipmentApi.Checked && dgvNum != "2") + { + BaseMsgForm.ShowError("补发货模式仅支持订单评价补发！"); + return; + } + + var orderCreateTime = row.Cells[$"colDgv{dgvNum}OrderTime"].Value.ParseToString(); + var spuId = row.Cells[$"colDgv{dgvNum}SpuId"].Value.ParseToString(); + var skuId = row.Cells[$"colDgv{dgvNum}SkuId"].Value.ParseToString(); + var cnt = row.Cells[$"colDgv{dgvNum}Cnt"].Value.ParseToInt(); + var rst = OptimizeExpress(shop, orderId, orderCreateTime, spuId, skuId, cnt); row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Value = rst; row.Cells[$"colDgv{dgvNum}OptimizeStatus"].Style.ForeColor = rst.Contains("成功") ? Control.DefaultForeColor : Color.Red; break; @@ -2531,18 +2632,134 @@ namespace TemuKJD.WXForms.ShopForms private void btnUpdateKdn_Click(object sender, EventArgs e) { - List waybillIds = new List(); - var dgvRows1 = dgvData1.Rows.Cast().Where(r => r.Cells["colDgv1OptimizeStatus"].Value.ParseToString().IsNullOrEmpty()).ToList(); - waybillIds.AddRange(dgvRows1.Select(r => r.Cells["colDgv1OrderId"].Value.ParseToString())); - - - while (dgvRows1.Count > 0) + this.ucTabControl1.SelectedTab = tabPage6; + //kdnAuth + Task.Run(() => { - var dgvRows1Tmp = dgvRows1.Take(500).ToList(); - dgvRows1.RemoveAll(r => dgvRows1Tmp.Contains(r)); - waybillIds.AddRange(dgvRows1Tmp.Select(r => r.Cells["colDgv1OrderId"].Value.ParseToString())); - } - + while (!cefWebBrowser.IsBrowserInitialized) + { + Thread.Sleep(1000); + } + cefWebBrowser.Load(expressToolUrl); + Thread.Sleep(Randomx.GetId(2000, 3000)); + + List waybillIds = new List(); + //var dgvRows1 = dgvData1.Rows.Cast().Where(r => r.Cells["colDgv1OptimizeStatus"].Value.ParseToString().Trim(' ', '\r', '\n').IsNullOrEmpty()).ToList(); + //waybillIds.AddRange(dgvRows1.Select(r => r.Cells["colDgv1WaybillId"].Value.ParseToString())); + //var dgvRows2 = dgvData2.Rows.Cast().Where(r => r.Cells["colDgv2OptimizeStatus"].Value.ParseToString().Trim(' ', '\r', '\n').IsNullOrEmpty()).ToList(); + //waybillIds.AddRange(dgvRows2.Select(r => r.Cells["colDgv2WaybillId"].Value.ParseToString())); + var dgvRows3 = dgvData3.Rows.Cast().Where(r => r.Cells["colDgv3OptimizeStatus"].Value.ParseToString().Trim(' ', '\r', '\n').IsNullOrEmpty()).ToList(); + waybillIds.AddRange(dgvRows3.Select(r => r.Cells["colDgv3WaybillId"].Value.ParseToString())); + var dgvRows4 = dgvData4.Rows.Cast().Where(r => r.Cells["colDgv4OptimizeStatus"].Value.ParseToString().Trim(' ', '\r', '\n').IsNullOrEmpty()).ToList(); + waybillIds.AddRange(dgvRows4.Select(r => r.Cells["colDgv4WaybillId"].Value.ParseToString())); + var dgvRows5 = dgvData5.Rows.Cast().Where(r => r.Cells["colDgv5OptimizeStatus"].Value.ParseToString().Trim(' ', '\r', '\n').IsNullOrEmpty()).ToList(); + waybillIds.AddRange(dgvRows5.Select(r => r.Cells["colDgv5WaybillId"].Value.ParseToString())); + waybillIds = waybillIds.Distinct().ToList(); + + while (waybillIds.Count > 0) + { + Thread.Sleep(Randomx.GetId(100, 500)); + var waybillIdsTmp = waybillIds.Take(200).ToList(); + waybillIds.RemoveAll(w => waybillIdsTmp.Contains(w)); + + var rst = ShopOptimize.kdniaoGetWayBillPage(string.Join(",", waybillIdsTmp), dicKdnRequest); + if (!rst.Contains("\"Code\":200")) + { + var errMsg = BaseRegex.GetStringJsonByRegs(ref rst, rst, "Message", "Message"); + BaseMsgForm.ShowError("物流信息更新失败 " + errMsg); + return; + } + + var jObj = JsonHelper.JObjectParse(rst)["Data"]["ResultList"]; + var data = JsonHelper.SerializeObject(jObj); + List kdnWaybillList = JsonHelper.DeserializeJsonToList(data); + foreach (var kdnWaybill in kdnWaybillList) + { + var rows = dgvData3.Rows.Cast().Where(r => r.Cells["colDgv3WaybillId"].Value.ParseToString() == kdnWaybill.LogisticsCode).ToList(); + if (rows.Count > 0) + { + foreach (var row in rows) + { + Invoke(new Action(() => + { + var latelyTraceTime = kdnWaybill.LastUpdateTime.ParseToDateTime(); + var duration = DateTime.Now - latelyTraceTime; + var durationStr = duration.TotalMinutes < 60 ? duration.TotalMinutes.ParseToInt() + "分钟前" : + (duration.TotalHours < 24 ? duration.TotalHours.ParseToInt() + "小时前" : duration.TotalDays.ParseToInt() + "天前"); + row.Cells["colDgv3WaybillLatelyTrace"].Value = durationStr + " " + kdnWaybill.LatelyTrace?.AcceptStation; + row.Cells["colDgv3WaybillStatus"].Value = kdnWaybill.LogisticsStatusStr; + row.Cells["colDgv3WaybillStatus"].Style.ForeColor = DefaultForeColor; + if (kdnWaybill.LogisticsStatusStr == "待揽件") + row.Cells["colDgv3WaybillStatus"].Style.ForeColor = Color.Orange; + if (kdnWaybill.LogisticsStatusStr == "在途中") + row.Cells["colDgv3WaybillStatus"].Style.ForeColor = Color.DarkGreen; + if (kdnWaybill.LogisticsStatusStr == "派件中") + row.Cells["colDgv3WaybillStatus"].Style.ForeColor = Color.Green; + if (kdnWaybill.LogisticsStatusStr == "已签收") + row.Cells["colDgv3WaybillStatus"].Style.ForeColor = Color.LightGreen; + })); + } + continue; + } + + rows = dgvData4.Rows.Cast().Where(r => r.Cells["colDgv4WaybillId"].Value.ParseToString() == kdnWaybill.LogisticsCode).ToList(); + if (rows.Count > 0) + { + foreach (var row in rows) + { + Invoke(new Action(() => + { + var latelyTraceTime = kdnWaybill.LatelyTrace.AcceptTime.ParseToDateTime(); + var duration = DateTime.Now - latelyTraceTime; + var durationStr = duration.TotalMinutes < 60 ? duration.TotalMinutes + "分钟" : (duration.TotalHours < 24 ? duration.TotalHours + "小时前" : duration.TotalDays + "天前"); + row.Cells["colDgv4WaybillLatelyTrace"].Value = durationStr + " " + kdnWaybill.LatelyTrace.AcceptStation; + row.Cells["colDgv4WaybillStatus"].Value = kdnWaybill.LogisticsStatusStr; + row.Cells["colDgv4WaybillStatus"].Style.ForeColor = DefaultForeColor; + if (kdnWaybill.LogisticsStatusStr == "待揽件") + row.Cells["colDgv4WaybillStatus"].Style.ForeColor = Color.Orange; + if (kdnWaybill.LogisticsStatusStr == "在途中") + row.Cells["colDgv4WaybillStatus"].Style.ForeColor = Color.DarkGreen; + if (kdnWaybill.LogisticsStatusStr == "派件中") + row.Cells["colDgv4WaybillStatus"].Style.ForeColor = Color.Green; + if (kdnWaybill.LogisticsStatusStr == "已签收") + row.Cells["colDgv4WaybillStatus"].Style.ForeColor = Color.LightGreen; + })); + } + continue; + } + + rows = dgvData5.Rows.Cast().Where(r => r.Cells["colDgv5WaybillId"].Value.ParseToString() == kdnWaybill.LogisticsCode).ToList(); + if (rows.Count > 0) + { + foreach (var row in rows) + { + Invoke(new Action(() => + { + var latelyTraceTime = kdnWaybill.LatelyTrace.AcceptTime.ParseToDateTime(); + var duration = DateTime.Now - latelyTraceTime; + var durationStr = duration.TotalMinutes < 60 ? duration.TotalMinutes + "分钟" : (duration.TotalHours < 24 ? duration.TotalHours + "小时前" : duration.TotalDays + "天前"); + row.Cells["colDgv5WaybillLatelyTrace"].Value = durationStr + " " + kdnWaybill.LatelyTrace.AcceptStation; + row.Cells["colDgv5WaybillStatus"].Value = kdnWaybill.LogisticsStatusStr; + row.Cells["colDgv5WaybillStatus"].Style.ForeColor = DefaultForeColor; + if (kdnWaybill.LogisticsStatusStr == "待揽件") + row.Cells["colDgv5WaybillStatus"].Style.ForeColor = Color.Orange; + if (kdnWaybill.LogisticsStatusStr == "在途中") + row.Cells["colDgv5WaybillStatus"].Style.ForeColor = Color.DarkGreen; + if (kdnWaybill.LogisticsStatusStr == "派件中") + row.Cells["colDgv5WaybillStatus"].Style.ForeColor = Color.Green; + if (kdnWaybill.LogisticsStatusStr == "已签收") + row.Cells["colDgv5WaybillStatus"].Style.ForeColor = Color.LightGreen; + })); + } + continue; + } + } + } + Invoke(new Action(() => { + BaseMsgForm.ShowInfo("物流更新完毕"); + })); + }); + //var waybillIds = string.Join(",", dgvRows1Tmp.Select(r => r.Cells["colDgv1OrderId"].Value.ParseToString()).Distinct()); } } @@ -2649,7 +2866,25 @@ namespace TemuKJD.WXForms.ShopForms return result; } - public static string kdniaoGetWayBillPage(string kdnAuth, string wayBillIds = "", int page=1) + /// + /// 补发货接口 + /// + /// + /// + /// + public static string orderCompensationDelivery(ShopLoginInfo shop, string orderId, string deliveryId, string waybillId, string productId, string skuId, int productCnt) + { + string url = "https://store.weixin.qq.com/shop-faas/mmchannelstradeorder/ship/cgi/compensationDelivery?token=&lang=zh_CN"; + string referer = "https://store.weixin.qq.com/shop/order/list"; + //string body = @"{""orderId"":""3736582240830642176"",""reason"":1,""deliveryProductInfo"":[{""deliveryId"":""EMS"",""waybillId"":""9822445565261"",""productInfos"":[{""productId"":""10000697373414"",""skuId"":""11709320615"",""productCnt"":1}]}]}"; + string body = @"{""orderId"":""" + orderId + @""",""reason"":1,""deliveryProductInfo"":[{""deliveryId"":""" + deliveryId + + @""",""waybillId"":""" + waybillId + @""",""productInfos"":[{""productId"":""" + productId + @""",""skuId"":""" + skuId + + @""",""productCnt"":" + productCnt + @"}]}]}"; + var result = WXHttpResponseBLL.WeiXinPostResponse(shop, url, body, referer); + return result; + } + + public static string kdniaoGetWayBillPage(string wayBillIds, Dictionary reqDic, int page=1) { //string body = @"LogisticsCode=321166519053000%0A773423272400495&PlatformOrderCode=&ShipperCode=&StartTime=2026-05-27+00%3A00%3A00&EndTime=2026-06-03+23%3A59%3A59&StartCollectTime=&EndCollectTime=&StartSignTime=&EndSignTime=&StartPayTime=&EndPayTime=&Remark=&ShopName=&Warehouse=&CustomerName=&PlatformName=&CurrentMonitorStatus=&PageIndex=1&PageSize=500&IsFollow="; @@ -2660,8 +2895,53 @@ namespace TemuKJD.WXForms.ShopForms "+00%3A00%3A00&EndTime=" + DateTime.Now.Date.AddDays(1).ToString("yyyy-MM-dd") + "+23%3A59%3A59&StartCollectTime=&EndCollectTime=&StartSignTime=&EndSignTime=&StartPayTime=" + "&EndPayTime=&Remark=&ShopName=&Warehouse=&CustomerName=&PlatformName=&CurrentMonitorStatus=&PageIndex=1&PageSize=500&IsFollow="; - var result = WXHttpResponseBLL.kdniaoPostResponse(kdnAuth, url, body, referer); + var result = WXHttpResponseBLL.kdniaoPostResponse(url, body, referer, reqDic); return result; } } + + public class kdnWaybillResultInfo + { + public long? ID { get; set; } // 881822643, + public string OrderCode { get; set; } // "26060301782049", + public string ShipperCode { get; set; } // "ZTO", + public string ShipperCompanyName { get; set; } // "中通快递", + public string LogisticsCode { get; set; } // "76939494896052", + public string OrderPrintTime { get; set; } // "2026-06-03 15:48:17", + public string OrderPaymentTime { get; set; } // "2026-06-03 15:48:17", + public int? LogisticsStatus { get; set; } // 3, + public string LogisticsStatusStr { get; set; } // "在途中", + public int? LogisticsExceptionType { get; set; } // 4, + public string LogisticsExceptionTypeStr { get; set; } // "派件异常", + public string LogisticsExceptionReason { get; set; } // "派件异常", + public int? MonitorStatus { get; set; } // 1, + public string MonitorStatusStr { get; set; } // "正常", + public int? CurrentMonitorStatus { get; set; } // 4, + public int? Source { get; set; } // 2, + public string SourceStr { get; set; } // "线下导入-粘贴", + public int? IgnoreMonitor { get; set; } // 1, + public string OvertimeStr { get; set; } // "", + public string OverTimeSpan { get; set; } // "00:00:00", + public int? SubStatus { get; set; } // 1, + public kdnWaybillLatelyTrace LatelyTrace { get; set; } + public int? IsFollow { get; set; } // 0, + public string LastUpdateTime { get; set; } // "2026-06-03 15:48:20", + public string CollectTime { get; set; } // "2026-06-01 12:05:08", + public long? LogisticsStatusEx { get; set; } // 405, + public string SenderCity { get; set; } // "", + public string ReceiverCity { get; set; } // "", + public int? SignTimeoutStatus { get; set; } // 1, + public int? SignTimeoutType { get; set; } // 2, + public string LatelyTrackInfo { get; set; } // "2026-06-03 09:18:37 收件人地址/姓名信息不详，且无法联系上收件人，投递失败，等待发件人处理！如有疑问请联系【枣庄市】【枣庄台儿庄区】（0632-4034989）", + public string ArrivalTimeStr { get; set; } // "需完善收寄城市信息" + + } + + public class kdnWaybillLatelyTrace + { + public string AcceptTime { get; set; } // "2026-06-03 09:18:37", + public string AcceptStation { get; set; } // "收件人地址/姓名信息不详，且无法联系上收件人，投递失败，等待发件人处理！如有疑问请联系【枣庄市】【枣庄台儿庄区】（0632-4034989）", + public string Location { get; set; } // "枣庄市", + public string Action { get; set; } // "405" + } } diff --git a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx index 5c2d585..a543ad9 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx +++ b/TEMUKJD/WXForms/ShopForms/WXShopOptimizeForm.resx @@ -183,6 +183,12 @@ True + + True + + + True + True @@ -237,6 +243,12 @@ True + + True + + + True + True @@ -294,12 +306,18 @@ True - + True True + + True + + + True + True @@ -339,6 +357,12 @@ True + + True + + + True + True @@ -366,6 +390,9 @@ True + + True + True @@ -405,6 +432,12 @@ True + + True + + + True + True @@ -432,6 +465,9 @@ True + + True + True @@ -468,4 +504,10 @@ True + + True + + + True + \ No newline at end of file