diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 8cd0c93..da73101 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 768;
+ public static int VersionCount = 770;
//public static int VersionCount = 613;
///
diff --git a/TEMUKJD/Extension/DataGridViewExtension.cs b/TEMUKJD/Extension/DataGridViewExtension.cs
index a68dc82..8244329 100644
--- a/TEMUKJD/Extension/DataGridViewExtension.cs
+++ b/TEMUKJD/Extension/DataGridViewExtension.cs
@@ -799,6 +799,8 @@ namespace TemuKJD.Extension
continue;
}
+ if (row.Index < 0)
+ continue;
if (row.Index >= 0 && row.Cells[imgColumn].Value != null && row.Cells[imgColumn].Value != defaultBitmap)
continue;
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
index cea6931..33f012b 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.Designer.cs
@@ -38,27 +38,29 @@ namespace TemuKJD.PDDForms.ProductSelectForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(PDDDBProdListForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
- this.btnExportTxt = new DevComponents.DotNetBar.PanelEx();
+ this.txtReplaceText = new System.Windows.Forms.TextBox();
+ this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.label5 = new System.Windows.Forms.Label();
+ this.txtSPU = new System.Windows.Forms.TextBox();
+ this.label2 = new System.Windows.Forms.Label();
+ this.txtCat = new System.Windows.Forms.TextBox();
+ this.label3 = new System.Windows.Forms.Label();
this.cmbGroupFilter = new System.Windows.Forms.ComboBox();
- this.btnSelect = new DevComponents.DotNetBar.PanelEx();
- this.btnDelSelect = new DevComponents.DotNetBar.PanelEx();
- this.cmbSort = new System.Windows.Forms.ComboBox();
+ this.txtProdName = new System.Windows.Forms.TextBox();
+ this.label4 = new System.Windows.Forms.Label();
+ this.txtExtCode = new System.Windows.Forms.TextBox();
+ this.lblNotes = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
+ this.cmbSort = new System.Windows.Forms.ComboBox();
+ this.txtNotes = new System.Windows.Forms.TextBox();
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
+ this.lblGroup = new System.Windows.Forms.Label();
+ this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+ this.btnExportTxt = new DevComponents.DotNetBar.PanelEx();
+ this.btnDelSelect = new DevComponents.DotNetBar.PanelEx();
this.cmbGroup = new System.Windows.Forms.ComboBox();
this.btnSetGroup = new DevComponents.DotNetBar.PanelEx();
- this.txtNotes = new System.Windows.Forms.TextBox();
- this.lblNotes = new System.Windows.Forms.Label();
- this.txtSPU = new System.Windows.Forms.TextBox();
- this.label5 = new System.Windows.Forms.Label();
- this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
- this.txtExtCode = new System.Windows.Forms.TextBox();
- this.label4 = new System.Windows.Forms.Label();
- this.txtProdName = new System.Windows.Forms.TextBox();
- this.label3 = new System.Windows.Forms.Label();
- this.txtCat = new System.Windows.Forms.TextBox();
- this.label2 = new System.Windows.Forms.Label();
- this.lblGroup = new System.Windows.Forms.Label();
+ this.label7 = new System.Windows.Forms.Label();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pnlEditExtCodePrice = new System.Windows.Forms.Panel();
this.lblExtCode = new System.Windows.Forms.Label();
@@ -70,9 +72,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.pbLoading = new System.Windows.Forms.PictureBox();
this.txtSKC = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
+ 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();
@@ -101,10 +102,13 @@ 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();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
+ this.tableLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
@@ -126,27 +130,13 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
// splitContainer1.Panel1
//
+ this.splitContainer1.Panel1.Controls.Add(this.txtReplaceText);
+ this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1);
this.splitContainer1.Panel1.Controls.Add(this.btnExportTxt);
- this.splitContainer1.Panel1.Controls.Add(this.cmbGroupFilter);
- this.splitContainer1.Panel1.Controls.Add(this.btnSelect);
this.splitContainer1.Panel1.Controls.Add(this.btnDelSelect);
- this.splitContainer1.Panel1.Controls.Add(this.cmbSort);
- this.splitContainer1.Panel1.Controls.Add(this.label6);
- this.splitContainer1.Panel1.Controls.Add(this.btnSearch);
this.splitContainer1.Panel1.Controls.Add(this.cmbGroup);
this.splitContainer1.Panel1.Controls.Add(this.btnSetGroup);
- this.splitContainer1.Panel1.Controls.Add(this.txtNotes);
- this.splitContainer1.Panel1.Controls.Add(this.lblNotes);
- this.splitContainer1.Panel1.Controls.Add(this.txtSPU);
- this.splitContainer1.Panel1.Controls.Add(this.label5);
- this.splitContainer1.Panel1.Controls.Add(this.pnlEmpty);
- this.splitContainer1.Panel1.Controls.Add(this.txtExtCode);
- this.splitContainer1.Panel1.Controls.Add(this.label4);
- this.splitContainer1.Panel1.Controls.Add(this.txtProdName);
- this.splitContainer1.Panel1.Controls.Add(this.label3);
- this.splitContainer1.Panel1.Controls.Add(this.txtCat);
- this.splitContainer1.Panel1.Controls.Add(this.label2);
- this.splitContainer1.Panel1.Controls.Add(this.lblGroup);
+ this.splitContainer1.Panel1.Controls.Add(this.label7);
//
// splitContainer1.Panel2
//
@@ -155,6 +145,255 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.splitContainer1.SplitterDistance = 53;
this.splitContainer1.TabIndex = 1;
//
+ // txtReplaceText
+ //
+ this.txtReplaceText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtReplaceText.Location = new System.Drawing.Point(1235, 16);
+ this.txtReplaceText.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.txtReplaceText.Name = "txtReplaceText";
+ this.txtReplaceText.Size = new System.Drawing.Size(104, 23);
+ this.txtReplaceText.TabIndex = 689;
+ this.txtReplaceText.TextChanged += new System.EventHandler(this.txtReplaceText_TextChanged);
+ //
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tableLayoutPanel1.ColumnCount = 16;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 13.33333F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 20F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.Controls.Add(this.label5, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtSPU, 1, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label2, 2, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtCat, 3, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label3, 4, 0);
+ this.tableLayoutPanel1.Controls.Add(this.cmbGroupFilter, 11, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtProdName, 5, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label4, 6, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 7, 0);
+ this.tableLayoutPanel1.Controls.Add(this.lblNotes, 8, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label6, 12, 0);
+ this.tableLayoutPanel1.Controls.Add(this.cmbSort, 13, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtNotes, 9, 0);
+ this.tableLayoutPanel1.Controls.Add(this.btnSearch, 14, 0);
+ this.tableLayoutPanel1.Controls.Add(this.lblGroup, 10, 0);
+ this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 15, 0);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(4, 3);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 1;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(822, 47);
+ this.tableLayoutPanel1.TabIndex = 679;
+ //
+ // label5
+ //
+ this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(3, 15);
+ this.label5.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(57, 17);
+ this.label5.TabIndex = 435;
+ this.label5.Text = "商品ID：";
+ //
+ // txtSPU
+ //
+ this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtSPU.Location = new System.Drawing.Point(60, 12);
+ this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.txtSPU.Name = "txtSPU";
+ this.txtSPU.Size = new System.Drawing.Size(44, 23);
+ this.txtSPU.TabIndex = 434;
+ //
+ // label2
+ //
+ this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(110, 15);
+ this.label2.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(44, 17);
+ this.label2.TabIndex = 426;
+ this.label2.Text = "类目：";
+ //
+ // txtCat
+ //
+ this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtCat.Location = new System.Drawing.Point(154, 12);
+ this.txtCat.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.txtCat.Name = "txtCat";
+ this.txtCat.Size = new System.Drawing.Size(44, 23);
+ this.txtCat.TabIndex = 425;
+ //
+ // label3
+ //
+ this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(204, 15);
+ this.label3.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(44, 17);
+ this.label3.TabIndex = 428;
+ this.label3.Text = "标题：";
+ //
+ // cmbGroupFilter
+ //
+ this.cmbGroupFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.cmbGroupFilter.FormattingEnabled = true;
+ this.cmbGroupFilter.Location = new System.Drawing.Point(530, 13);
+ this.cmbGroupFilter.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.cmbGroupFilter.Name = "cmbGroupFilter";
+ this.cmbGroupFilter.Size = new System.Drawing.Size(44, 25);
+ this.cmbGroupFilter.TabIndex = 653;
+ //
+ // txtProdName
+ //
+ this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtProdName.Location = new System.Drawing.Point(248, 12);
+ this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.txtProdName.Name = "txtProdName";
+ this.txtProdName.Size = new System.Drawing.Size(44, 23);
+ this.txtProdName.TabIndex = 427;
+ //
+ // label4
+ //
+ this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(298, 15);
+ this.label4.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(44, 17);
+ this.label4.TabIndex = 430;
+ this.label4.Text = "货号：";
+ //
+ // txtExtCode
+ //
+ this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtExtCode.Location = new System.Drawing.Point(342, 12);
+ this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.txtExtCode.Name = "txtExtCode";
+ this.txtExtCode.Size = new System.Drawing.Size(44, 23);
+ this.txtExtCode.TabIndex = 429;
+ //
+ // lblNotes
+ //
+ this.lblNotes.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblNotes.AutoSize = true;
+ this.lblNotes.Location = new System.Drawing.Point(392, 15);
+ this.lblNotes.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.lblNotes.Name = "lblNotes";
+ this.lblNotes.Size = new System.Drawing.Size(44, 17);
+ this.lblNotes.TabIndex = 440;
+ this.lblNotes.Text = "备注：";
+ //
+ // label6
+ //
+ this.label6.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(580, 15);
+ this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(44, 17);
+ this.label6.TabIndex = 449;
+ this.label6.Text = "排序：";
+ //
+ // cmbSort
+ //
+ this.cmbSort.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.cmbSort.FormattingEnabled = true;
+ this.cmbSort.Items.AddRange(new object[] {
+ "入库时间",
+ "认领总数"});
+ this.cmbSort.Location = new System.Drawing.Point(627, 13);
+ this.cmbSort.Name = "cmbSort";
+ this.cmbSort.Size = new System.Drawing.Size(65, 25);
+ this.cmbSort.TabIndex = 448;
+ this.cmbSort.Text = "入库时间";
+ //
+ // txtNotes
+ //
+ this.txtNotes.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtNotes.Location = new System.Drawing.Point(436, 12);
+ this.txtNotes.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.txtNotes.Name = "txtNotes";
+ this.txtNotes.Size = new System.Drawing.Size(44, 23);
+ this.txtNotes.TabIndex = 439;
+ //
+ // btnSearch
+ //
+ this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSearch.Location = new System.Drawing.Point(698, 11);
+ this.btnSearch.Name = "btnSearch";
+ this.btnSearch.Size = new System.Drawing.Size(56, 25);
+ this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnSearch.Style.GradientAngle = 90;
+ this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnSearch.TabIndex = 643;
+ this.btnSearch.Text = "搜索";
+ this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+ //
+ // lblGroup
+ //
+ this.lblGroup.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.lblGroup.AutoSize = true;
+ this.lblGroup.Location = new System.Drawing.Point(486, 15);
+ this.lblGroup.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.lblGroup.Name = "lblGroup";
+ this.lblGroup.Size = new System.Drawing.Size(44, 17);
+ this.lblGroup.TabIndex = 641;
+ this.lblGroup.Text = "分组：";
+ //
+ // pnlEmpty
+ //
+ this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+ this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+ this.pnlEmpty.Location = new System.Drawing.Point(760, 11);
+ this.pnlEmpty.Name = "pnlEmpty";
+ this.pnlEmpty.Size = new System.Drawing.Size(56, 25);
+ this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.pnlEmpty.Style.GradientAngle = 90;
+ this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.pnlEmpty.TabIndex = 431;
+ this.pnlEmpty.Text = "清空条件";
+ this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
+ //
// btnExportTxt
//
this.btnExportTxt.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -180,45 +419,14 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnExportTxt.Text = "批量导出";
this.btnExportTxt.Click += new System.EventHandler(this.btnExportTxt_Click);
//
- // cmbGroupFilter
- //
- this.cmbGroupFilter.FormattingEnabled = true;
- this.cmbGroupFilter.Location = new System.Drawing.Point(608, 15);
- this.cmbGroupFilter.Name = "cmbGroupFilter";
- this.cmbGroupFilter.Size = new System.Drawing.Size(85, 25);
- this.cmbGroupFilter.TabIndex = 653;
- //
- // 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(1274, 15);
- this.btnSelect.Name = "btnSelect";
- this.btnSelect.Size = new System.Drawing.Size(84, 25);
- this.btnSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSelect.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSelect.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSelect.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnSelect.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnSelect.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnSelect.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnSelect.Style.GradientAngle = 90;
- this.btnSelect.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSelect.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSelect.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSelect.TabIndex = 647;
- this.btnSelect.Text = "认领选中商品";
- this.btnSelect.Click += new System.EventHandler(this.btnSelect_Click);
- //
// btnDelSelect
//
+ this.btnDelSelect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnDelSelect.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty;
this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnDelSelect.Location = new System.Drawing.Point(1187, 15);
+ this.btnDelSelect.Location = new System.Drawing.Point(1038, 15);
this.btnDelSelect.Name = "btnDelSelect";
this.btnDelSelect.Size = new System.Drawing.Size(84, 25);
this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -236,66 +444,23 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnDelSelect.Text = "删除选中商品";
this.btnDelSelect.Click += new System.EventHandler(this.btnDelSelect_Click);
//
- // cmbSort
- //
- this.cmbSort.FormattingEnabled = true;
- this.cmbSort.Items.AddRange(new object[] {
- "入库时间",
- "认领总数"});
- this.cmbSort.Location = new System.Drawing.Point(891, 15);
- this.cmbSort.Name = "cmbSort";
- this.cmbSort.Size = new System.Drawing.Size(79, 25);
- this.cmbSort.TabIndex = 448;
- this.cmbSort.Text = "入库时间";
- //
- // label6
- //
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(834, 19);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(68, 17);
- this.label6.TabIndex = 449;
- this.label6.Text = "排序方式：";
- //
- // btnSearch
- //
- this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearch.Location = new System.Drawing.Point(695, 15);
- this.btnSearch.Name = "btnSearch";
- this.btnSearch.Size = new System.Drawing.Size(56, 25);
- this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSearch.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSearch.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSearch.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnSearch.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnSearch.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnSearch.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnSearch.Style.GradientAngle = 90;
- this.btnSearch.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnSearch.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSearch.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnSearch.TabIndex = 643;
- this.btnSearch.Text = "搜索";
- this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
- //
// cmbGroup
//
+ this.cmbGroup.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(994, 15);
+ this.cmbGroup.Location = new System.Drawing.Point(845, 15);
this.cmbGroup.Name = "cmbGroup";
this.cmbGroup.Size = new System.Drawing.Size(85, 25);
this.cmbGroup.TabIndex = 640;
//
// btnSetGroup
//
+ this.btnSetGroup.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSetGroup.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
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(1081, 15);
+ this.btnSetGroup.Location = new System.Drawing.Point(932, 15);
this.btnSetGroup.Name = "btnSetGroup";
this.btnSetGroup.Size = new System.Drawing.Size(84, 25);
this.btnSetGroup.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -313,118 +478,16 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnSetGroup.Text = "批量设置分组";
this.btnSetGroup.Click += new System.EventHandler(this.btnSetGroup_Click);
//
- // txtNotes
+ // label7
//
- this.txtNotes.Location = new System.Drawing.Point(498, 16);
- this.txtNotes.Name = "txtNotes";
- this.txtNotes.Size = new System.Drawing.Size(77, 23);
- this.txtNotes.TabIndex = 439;
- //
- // lblNotes
- //
- this.lblNotes.AutoSize = true;
- this.lblNotes.Location = new System.Drawing.Point(464, 19);
- this.lblNotes.Name = "lblNotes";
- this.lblNotes.Size = new System.Drawing.Size(44, 17);
- this.lblNotes.TabIndex = 440;
- this.lblNotes.Text = "备注：";
- //
- // txtSPU
- //
- this.txtSPU.Location = new System.Drawing.Point(54, 16);
- this.txtSPU.Name = "txtSPU";
- this.txtSPU.Size = new System.Drawing.Size(77, 23);
- this.txtSPU.TabIndex = 434;
- //
- // label5
- //
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(8, 19);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(57, 17);
- this.label5.TabIndex = 435;
- this.label5.Text = "商品ID：";
- //
- // pnlEmpty
- //
- this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
- this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
- this.pnlEmpty.Location = new System.Drawing.Point(753, 15);
- this.pnlEmpty.Name = "pnlEmpty";
- this.pnlEmpty.Size = new System.Drawing.Size(56, 25);
- this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.pnlEmpty.Style.GradientAngle = 90;
- this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.pnlEmpty.TabIndex = 431;
- this.pnlEmpty.Text = "清空条件";
- this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
- //
- // txtExtCode
- //
- this.txtExtCode.Location = new System.Drawing.Point(387, 16);
- this.txtExtCode.Name = "txtExtCode";
- this.txtExtCode.Size = new System.Drawing.Size(77, 23);
- this.txtExtCode.TabIndex = 429;
- //
- // label4
- //
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(353, 19);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(44, 17);
- this.label4.TabIndex = 430;
- this.label4.Text = "货号：";
- //
- // txtProdName
- //
- this.txtProdName.Location = new System.Drawing.Point(276, 16);
- this.txtProdName.Name = "txtProdName";
- this.txtProdName.Size = new System.Drawing.Size(77, 23);
- this.txtProdName.TabIndex = 427;
- //
- // label3
- //
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(242, 19);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(44, 17);
- this.label3.TabIndex = 428;
- this.label3.Text = "标题：";
- //
- // txtCat
- //
- this.txtCat.Location = new System.Drawing.Point(165, 16);
- this.txtCat.Name = "txtCat";
- this.txtCat.Size = new System.Drawing.Size(77, 23);
- this.txtCat.TabIndex = 425;
- //
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(131, 19);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(44, 17);
- this.label2.TabIndex = 426;
- this.label2.Text = "类目：";
- //
- // lblGroup
- //
- this.lblGroup.AutoSize = true;
- this.lblGroup.Location = new System.Drawing.Point(575, 19);
- this.lblGroup.Name = "lblGroup";
- this.lblGroup.Size = new System.Drawing.Size(44, 17);
- this.lblGroup.TabIndex = 641;
- this.lblGroup.Text = "分组：";
+ this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(1138, 19);
+ 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.TabIndex = 705;
+ this.label7.Text = "导出时移除词语：";
//
// splitContainer2
//
@@ -440,6 +503,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.splitContainer2.Panel1.Controls.Add(this.pbLoading);
this.splitContainer2.Panel1.Controls.Add(this.txtSKC);
this.splitContainer2.Panel1.Controls.Add(this.label1);
+ 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);
//
@@ -578,6 +642,30 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.label1.Text = "SKC：";
this.label1.Visible = 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(1117, 36);
+ 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;
@@ -636,31 +724,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(1024, 0);
- this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
- this.ucSplitPage1.Name = "ucSplitPage1";
- this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
- this.ucSplitPage1.PageSize = 50;
- this.ucSplitPage1.Size = new System.Drawing.Size(414, 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;
@@ -879,6 +942,31 @@ 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(1024, 0);
+ this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucSplitPage1.Name = "ucSplitPage1";
+ this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
+ this.ucSplitPage1.PageSize = 50;
+ this.ucSplitPage1.Size = new System.Drawing.Size(414, 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;
+ //
// PDDDBProdListForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -897,6 +985,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.splitContainer1.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
+ this.tableLayoutPanel1.ResumeLayout(false);
+ this.tableLayoutPanel1.PerformLayout();
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel1.PerformLayout();
this.splitContainer2.Panel2.ResumeLayout(false);
@@ -978,5 +1068,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 System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ private System.Windows.Forms.TextBox txtReplaceText;
+ private System.Windows.Forms.Label label7;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
index 0b9f192..004228b 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdListForm.cs
@@ -1,6 +1,7 @@
using AllBase;
using AllBase.Model.Result;
using AllBase.Model.Result.PDDResult;
+using NaiBa.Util;
using NaiBa.Util.Extension;
using Newtonsoft.Json.Linq;
using System;
@@ -28,6 +29,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
ShopLoginInfo shop = null;
List lstTemuDbProduct = new List();
+ ConcurrentList lstTitleReplaceText = new ConcurrentList();
public PDDDBProdListForm()
{
@@ -327,6 +329,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.txtSPU.Text = "";
this.txtNotes.Text = "";
this.cmbGroupFilter.Text = "";
+ this.cmbSort.Text = "入库时间";
}
private void dgvDbProduct_CellContentClick(object sender, DataGridViewCellEventArgs e)
@@ -741,6 +744,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.statusBar.pgbTaskProgress.Maximum = lstProdId.Count;
this.statusBar.UpdateProgressBar(0);
+ txtReplaceText_TextChanged(null, null);
+
Task.Run(() =>
{
foreach (var pId in lstProdId)
@@ -752,13 +757,53 @@ namespace TemuKJD.PDDForms.ProductSelectForms
Thread.Sleep(200);
}
- StreamWriter sw = new StreamWriter(Path.Combine(path, prod.spu_id + ".txt"), true, Encoding.UTF8);
-
- JObject jObj = JObject.Parse(prod.product_json);
- if (!string.IsNullOrEmpty(prod.ext_code))
- jObj["out_goods_sn"] = prod.ext_code;
- if (!string.IsNullOrEmpty(prod.sku_edit_json))
- jObj["sku"] = JsonHelper.SerializeObject(JsonHelper.DeserializeJsonToList(prod.sku_edit_json));
+ StreamWriter sw = new StreamWriter(Path.Combine(path, prod.spu_id + ".txt"), false, Encoding.UTF8);
+
+ JObject jObj = new JObject();
+ try
+ {
+ jObj = JObject.Parse(prod.product_json);
+
+ // 过滤标题内指定词语
+ if (lstTitleReplaceText.Count > 0)
+ {
+ var goods_name = jObj["detail"]["goods_name"].ParseToString();
+ foreach (var txt in lstTitleReplaceText)
+ {
+ goods_name = goods_name.Replace(txt, "");
+ }
+ jObj["detail"]["goods_name"] = goods_name;
+
+ var tiny_name = jObj["detail"]["tiny_name"].ParseToString();
+ foreach (var txt in lstTitleReplaceText)
+ {
+ tiny_name = tiny_name.Replace(txt, "");
+ }
+ jObj["detail"]["tiny_name"] = tiny_name;
+
+ var goods_desc = jObj["detail"]["goods_desc"].ParseToString();
+ foreach (var txt in lstTitleReplaceText)
+ {
+ goods_desc = goods_desc.Replace(txt, "");
+ }
+ jObj["detail"]["goods_desc"] = goods_desc;
+
+ var share_desc = jObj["detail"]["share_desc"].ParseToString();
+ foreach (var txt in lstTitleReplaceText)
+ {
+ share_desc = share_desc.Replace(txt, "");
+ }
+ jObj["detail"]["share_desc"] = share_desc;
+ }
+ // 替换货号
+ if (!string.IsNullOrEmpty(prod.ext_code))
+ jObj["detail"]["out_goods_sn"] = prod.ext_code;
+ // 替换编辑过的sku
+ if (!string.IsNullOrEmpty(prod.sku_edit_json))
+ jObj["detail"]["sku"] = JArray.Parse(JsonHelper.SerializeObject(JsonHelper.DeserializeJsonToList(prod.sku_edit_json)));
+ }
+ catch (Exception ex) { }
+
string exportData = JsonHelper.SerializeObject(jObj);
//sw.Write(prod.product_json);
sw.Write(exportData);
@@ -779,5 +824,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
});
}
}
+
+ private void txtReplaceText_TextChanged(object sender, EventArgs e)
+ {
+ this.lstTitleReplaceText.Clear();
+ if (!txtReplaceText.Text.Trim().IsNullOrEmpty())
+ this.lstTitleReplaceText.AddRange(txtReplaceText.Text.Trim().Split(new string[] { ",", "，", " " }, StringSplitOptions.RemoveEmptyEntries));
+ }
}
}
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs
index a3a83f1..2dbca09 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.Designer.cs
@@ -38,6 +38,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.label7 = new System.Windows.Forms.Label();
+ this.txtWaitSeconds = new System.Windows.Forms.TextBox();
+ this.label6 = new System.Windows.Forms.Label();
this.chkUseExtCodePrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.pbUpgradeVersion = new System.Windows.Forms.PictureBox();
this.lblUpgradeVersion = new System.Windows.Forms.Label();
@@ -117,7 +120,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.txtTest20981 = new System.Windows.Forms.TextBox();
this.btnTest20981 = new DevComponents.DotNetBar.PanelEx();
this.pbLoading = new System.Windows.Forms.PictureBox();
- this.panel1 = new System.Windows.Forms.Panel();
this.dgvSelectProduct = new TemuKJD.UserComponent.DataGridViewEx();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSelectId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -145,6 +147,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
+ this.panel1 = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -190,7 +193,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
- this.splitContainer1.Size = new System.Drawing.Size(1484, 546);
+ this.splitContainer1.Size = new System.Drawing.Size(1523, 546);
this.splitContainer1.SplitterDistance = 140;
this.splitContainer1.TabIndex = 11;
//
@@ -201,6 +204,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
| System.Windows.Forms.AnchorStyles.Right)));
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+ this.ucGroupBoxEx2.Controls.Add(this.label7);
+ this.ucGroupBoxEx2.Controls.Add(this.txtWaitSeconds);
+ this.ucGroupBoxEx2.Controls.Add(this.label6);
this.ucGroupBoxEx2.Controls.Add(this.chkUseExtCodePrice);
this.ucGroupBoxEx2.Controls.Add(this.pbUpgradeVersion);
this.ucGroupBoxEx2.Controls.Add(this.lblUpgradeVersion);
@@ -245,11 +251,43 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.ucGroupBoxEx2.Controls.Add(this.lblLowPriceSkuImg);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(459, 2);
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
- this.ucGroupBoxEx2.Size = new System.Drawing.Size(1023, 140);
+ this.ucGroupBoxEx2.Size = new System.Drawing.Size(1062, 140);
this.ucGroupBoxEx2.TabIndex = 667;
this.ucGroupBoxEx2.TabStop = false;
this.ucGroupBoxEx2.Text = "商品上传";
//
+ // label7
+ //
+ this.label7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(944, 43);
+ this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(20, 17);
+ this.label7.TabIndex = 729;
+ this.label7.Text = "秒";
+ //
+ // txtWaitSeconds
+ //
+ this.txtWaitSeconds.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtWaitSeconds.Location = new System.Drawing.Point(912, 40);
+ this.txtWaitSeconds.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtWaitSeconds.Name = "txtWaitSeconds";
+ this.txtWaitSeconds.Size = new System.Drawing.Size(32, 23);
+ this.txtWaitSeconds.TabIndex = 728;
+ this.txtWaitSeconds.Text = "100";
+ //
+ // label6
+ //
+ this.label6.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(858, 43);
+ this.label6.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(56, 17);
+ this.label6.TabIndex = 727;
+ this.label6.Text = "额外等待";
+ //
// chkUseExtCodePrice
//
this.chkUseExtCodePrice.AutoSize = true;
@@ -350,7 +388,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnStop.Location = new System.Drawing.Point(926, 68);
+ this.btnStop.Location = new System.Drawing.Point(965, 68);
this.btnStop.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(84, 23);
@@ -555,7 +593,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnClearDgv.CanvasColor = System.Drawing.SystemColors.Control;
this.btnClearDgv.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnClearDgv.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnClearDgv.Location = new System.Drawing.Point(926, 96);
+ this.btnClearDgv.Location = new System.Drawing.Point(965, 96);
this.btnClearDgv.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnClearDgv.Name = "btnClearDgv";
this.btnClearDgv.Size = new System.Drawing.Size(84, 23);
@@ -783,7 +821,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnUpload.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnUpload.DisabledBackColor = System.Drawing.Color.Empty;
this.btnUpload.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnUpload.Location = new System.Drawing.Point(926, 40);
+ this.btnUpload.Location = new System.Drawing.Point(965, 40);
this.btnUpload.Name = "btnUpload";
this.btnUpload.Size = new System.Drawing.Size(84, 23);
this.btnUpload.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -849,7 +887,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.chkChance.AutoSize = true;
this.chkChance.Checked = true;
this.chkChance.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkChance.Location = new System.Drawing.Point(929, 17);
+ this.chkChance.Location = new System.Drawing.Point(968, 17);
this.chkChance.Name = "chkChance";
this.chkChance.Size = new System.Drawing.Size(87, 21);
this.chkChance.TabIndex = 556;
@@ -1146,7 +1184,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
- this.splitContainer3.Size = new System.Drawing.Size(1484, 402);
+ this.splitContainer3.Size = new System.Drawing.Size(1523, 402);
this.splitContainer3.SplitterDistance = 372;
this.splitContainer3.TabIndex = 1;
//
@@ -1169,7 +1207,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.splitContainer2.Panel2.Controls.Add(this.pbLoading);
this.splitContainer2.Panel2.Controls.Add(this.dgvSelectProduct);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(1484, 372);
+ this.splitContainer2.Size = new System.Drawing.Size(1523, 372);
this.splitContainer2.SplitterDistance = 300;
this.splitContainer2.TabIndex = 0;
//
@@ -1297,7 +1335,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
// txtTest20981
//
this.txtTest20981.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.txtTest20981.Location = new System.Drawing.Point(957, 30);
+ this.txtTest20981.Location = new System.Drawing.Point(996, 30);
this.txtTest20981.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtTest20981.Name = "txtTest20981";
this.txtTest20981.Size = new System.Drawing.Size(127, 23);
@@ -1310,7 +1348,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.btnTest20981.CanvasColor = System.Drawing.SystemColors.Control;
this.btnTest20981.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnTest20981.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnTest20981.Location = new System.Drawing.Point(1088, 30);
+ this.btnTest20981.Location = new System.Drawing.Point(1127, 30);
this.btnTest20981.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnTest20981.Name = "btnTest20981";
this.btnTest20981.Size = new System.Drawing.Size(84, 23);
@@ -1334,7 +1372,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbLoading.Location = new System.Drawing.Point(565, 161);
+ this.pbLoading.Location = new System.Drawing.Point(584, 161);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1342,17 +1380,6 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.pbLoading.TabStop = false;
this.pbLoading.Visible = false;
//
- // panel1
- //
- this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
- | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.panel1.Location = new System.Drawing.Point(699, 552);
- this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(881, 86);
- this.panel1.TabIndex = 189;
- this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
- //
// dgvSelectProduct
//
this.dgvSelectProduct.AllowUserToAddRows = false;
@@ -1399,7 +1426,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.dgvSelectProduct.Name = "dgvSelectProduct";
this.dgvSelectProduct.ReadOnly = true;
this.dgvSelectProduct.RowTemplate.Height = 23;
- this.dgvSelectProduct.Size = new System.Drawing.Size(1176, 372);
+ this.dgvSelectProduct.Size = new System.Drawing.Size(1215, 372);
this.dgvSelectProduct.TabIndex = 187;
this.dgvSelectProduct.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectProduct_CellContentClick);
this.dgvSelectProduct.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvSelectProduct_Scroll);
@@ -1597,8 +1624,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//
this.splitContainer4.Panel2.Controls.Add(this.btnClear);
this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
- this.splitContainer4.Size = new System.Drawing.Size(1484, 26);
- this.splitContainer4.SplitterDistance = 793;
+ this.splitContainer4.Size = new System.Drawing.Size(1523, 26);
+ this.splitContainer4.SplitterDistance = 832;
this.splitContainer4.TabIndex = 3;
//
// statusBar
@@ -1609,7 +1636,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar";
- this.statusBar.Size = new System.Drawing.Size(793, 26);
+ this.statusBar.Size = new System.Drawing.Size(832, 26);
this.statusBar.TabIndex = 2;
//
// btnClear
@@ -1662,6 +1689,17 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.panelEx1.Text = "停止当前操作";
this.panelEx1.Visible = false;
//
+ // panel1
+ //
+ this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.panel1.Location = new System.Drawing.Point(699, 552);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(881, 86);
+ this.panel1.TabIndex = 189;
+ this.panel1.Paint += new System.Windows.Forms.PaintEventHandler(this.panel1_Paint);
+ //
// PDDDBProdUserSelectForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1821,5 +1859,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
+ private System.Windows.Forms.Label label7;
+ private System.Windows.Forms.TextBox txtWaitSeconds;
+ private System.Windows.Forms.Label label6;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
index b454142..749c8af 100644
--- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
+++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdUserSelectForm.cs
@@ -914,6 +914,9 @@ namespace TemuKJD.PDDForms.ProductSelectForms
}
}));
+ if (result.Contains("您的店铺操作过于频繁，请稍后操作"))
+ Thread.Sleep(Randomx.GetId(60000, 90000));
+
if (result.Contains("会话已过期"))
{
if (PDDShopListForm.Instance == null)
@@ -1071,6 +1074,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms
chanceGoodLst.AddRange(JsonHelper.DeserializeJsonToList(chanceGoodsString));
var chanceGood = chanceGoodLst.OrderBy(g => Randomx.GetId(10000))
.FirstOrDefault(g => g.cat_id_3 == prodInfo.detail.cat_id || g.cat_id_2 == prodInfo.detail.cat_id);
+ if (chanceGood == null)
+ chanceGood = chanceGoodLst.OrderBy(g => Randomx.GetId(10000)).FirstOrDefault();
if (chanceGood != null)
chance_id = chanceGood.chance_id;
}
@@ -1097,7 +1102,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//失败了继续走普通商品上传接口
var draftId = BaseRegex.GetStringJson(ref rst, "draft_id");
var goods_id = BaseRegex.GetLongJson(ref rst, "goods_id");
- if (getChanceIdCount <= 3 && rst.Contains("\"success\":true") && string.IsNullOrEmpty(draftId) && string.IsNullOrEmpty(prodInfo.chance_id))
+ if (getChanceIdCount <= 5 && rst.Contains("\"success\":true") && string.IsNullOrEmpty(draftId) && string.IsNullOrEmpty(prodInfo.chance_id))
{
chance_id = "";
goto reGetChanceId;
@@ -2274,6 +2279,12 @@ namespace TemuKJD.PDDForms.ProductSelectForms
}
}
+
+ var waitTime = 0;
+ Invoke(new Action(() => { waitTime = txtWaitSeconds.Text.Trim().ParseToInt(); }));
+ if (waitTime > 0)
+ Thread.Sleep(Randomx.GetId(waitTime * 1000, (waitTime + 10) * 1000));
+
var size_result = "";
if (prodInfo.size != null && prodInfo.size.classId != null)
{
@@ -3307,7 +3318,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
//21365 7折活动 //活动2
if (1 == 1 && sign21365)
{
- SignActivity21365(shop, prodParam);
+ activityErr += SignActivity21365(shop, prodParam);
}
restoreSkuImg2: