diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index c302dab..608896b 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,7 +27,7 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 685;
+ public static int VersionCount = 687;
//public static int VersionCount = 613;
///
diff --git a/TEMUKJD/Extension/DataGridViewExtension.cs b/TEMUKJD/Extension/DataGridViewExtension.cs
index 92ca26b..860187c 100644
--- a/TEMUKJD/Extension/DataGridViewExtension.cs
+++ b/TEMUKJD/Extension/DataGridViewExtension.cs
@@ -548,10 +548,18 @@ namespace TemuKJD.Extension
{
ShowDgvImg(dgv, null, imgColumn, imgPathColumn, isSetHttpsHttp);
};
+ dgv.RowsRemoved += (s, e) =>
+ {
+ ShowDgvImg(dgv, null, imgColumn, imgPathColumn, isSetHttpsHttp);
+ };
dgv.RowsAdded += (s, e) =>
{
ShowDgvImg(dgv, new ConcurrentList { dgv.Rows[e.RowIndex] }, imgColumn, imgPathColumn, isSetHttpsHttp);
};
+ dgv.RowPostPaint += (s, e) =>
+ {
+ ShowDgvImg(dgv, new ConcurrentList { dgv.Rows[e.RowIndex] }, imgColumn, imgPathColumn, isSetHttpsHttp);
+ };
dgv.CellValueChanged += (s, e) =>
{
if (dgv.Columns[e.ColumnIndex].Name == imgPathColumn)
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
index 0cc55f5..43ff8f2 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.Designer.cs
@@ -30,19 +30,35 @@ namespace TemuKJD.KJDForms.AdminForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- 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();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
+ this.btnRestoreFilterParams = new DevComponents.DotNetBar.PanelEx();
+ this.btnSaveFilterParams = new DevComponents.DotNetBar.PanelEx();
+ this.txtPrice2 = new System.Windows.Forms.TextBox();
+ this.label16 = new System.Windows.Forms.Label();
+ this.txtPrice1 = new System.Windows.Forms.TextBox();
+ this.label14 = new System.Windows.Forms.Label();
+ this.cmbSymbol = new System.Windows.Forms.ComboBox();
+ this.label13 = new System.Windows.Forms.Label();
+ this.dgvExtCode = new TemuKJD.UserComponent.DataGridViewEx();
+ this.colSelectExtCode = new System.Windows.Forms.DataGridViewCheckBoxColumn();
+ this.colFilterExtCode = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.colFilterRule = new System.Windows.Forms.DataGridViewTextBoxColumn();
+ this.pnlMutliCancelWithTitleWrong = new DevComponents.DotNetBar.PanelEx();
this.btnResetExtCode = new DevComponents.DotNetBar.PanelEx();
this.txtExtCode = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.numJudgeWeight = new System.Windows.Forms.NumericUpDown();
+ this.btnMutliCancel = new DevComponents.DotNetBar.PanelEx();
this.numJudgeLen = new System.Windows.Forms.NumericUpDown();
this.label8 = new System.Windows.Forms.Label();
this.btnRestoreSizeAndNumber = new DevComponents.DotNetBar.PanelEx();
@@ -51,6 +67,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.numWeight1 = new System.Windows.Forms.NumericUpDown();
this.numHeight1 = new System.Windows.Forms.NumericUpDown();
this.numWidth1 = new System.Windows.Forms.NumericUpDown();
+ this.btnMutliOk = new DevComponents.DotNetBar.PanelEx();
this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
this.numLen2 = new System.Windows.Forms.NumericUpDown();
@@ -63,7 +80,6 @@ namespace TemuKJD.KJDForms.AdminForms
this.label15 = new System.Windows.Forms.Label();
this.btnRestoreProdName = new DevComponents.DotNetBar.PanelEx();
this.txtSkcId = new System.Windows.Forms.TextBox();
- this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
this.btnSearchPrice = new DevComponents.DotNetBar.PanelEx();
this.label5 = new System.Windows.Forms.Label();
@@ -81,15 +97,13 @@ namespace TemuKJD.KJDForms.AdminForms
this.txtPriceDown = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
- this.btnMutliCancel = new DevComponents.DotNetBar.PanelEx();
- this.btnMutliOk = new DevComponents.DotNetBar.PanelEx();
- this.pnlDetailOperate2 = new System.Windows.Forms.Panel();
- this.pnlMutliCancelWithTitleWrong = new DevComponents.DotNetBar.PanelEx();
- this.chkFilter = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkFilterTitle = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.label18 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label();
this.label9 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
+ this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbShopLoading = new System.Windows.Forms.PictureBox();
@@ -140,6 +154,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
this.ucGroupBoxEx1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvExtCode)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numJudgeWeight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numJudgeLen)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numWeight2)).BeginInit();
@@ -151,7 +166,6 @@ namespace TemuKJD.KJDForms.AdminForms
((System.ComponentModel.ISupportInitialize)(this.numWidth2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.numLen1)).BeginInit();
this.pnlDetailOperate1.SuspendLayout();
- this.pnlDetailOperate2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
this.splitContainer3.Panel1.SuspendLayout();
this.splitContainer3.Panel2.SuspendLayout();
@@ -187,8 +201,8 @@ namespace TemuKJD.KJDForms.AdminForms
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
- this.splitContainer1.Size = new System.Drawing.Size(1350, 611);
- this.splitContainer1.SplitterDistance = 130;
+ this.splitContainer1.Size = new System.Drawing.Size(1484, 611);
+ this.splitContainer1.SplitterDistance = 140;
this.splitContainer1.TabIndex = 11;
//
// ucGroupBoxEx1
@@ -198,10 +212,21 @@ namespace TemuKJD.KJDForms.AdminForms
| System.Windows.Forms.AnchorStyles.Right)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
+ this.ucGroupBoxEx1.Controls.Add(this.btnRestoreFilterParams);
+ this.ucGroupBoxEx1.Controls.Add(this.btnSaveFilterParams);
+ this.ucGroupBoxEx1.Controls.Add(this.txtPrice2);
+ this.ucGroupBoxEx1.Controls.Add(this.label16);
+ this.ucGroupBoxEx1.Controls.Add(this.txtPrice1);
+ this.ucGroupBoxEx1.Controls.Add(this.label14);
+ this.ucGroupBoxEx1.Controls.Add(this.cmbSymbol);
+ this.ucGroupBoxEx1.Controls.Add(this.label13);
+ this.ucGroupBoxEx1.Controls.Add(this.dgvExtCode);
+ this.ucGroupBoxEx1.Controls.Add(this.pnlMutliCancelWithTitleWrong);
this.ucGroupBoxEx1.Controls.Add(this.btnResetExtCode);
this.ucGroupBoxEx1.Controls.Add(this.txtExtCode);
this.ucGroupBoxEx1.Controls.Add(this.label12);
this.ucGroupBoxEx1.Controls.Add(this.numJudgeWeight);
+ this.ucGroupBoxEx1.Controls.Add(this.btnMutliCancel);
this.ucGroupBoxEx1.Controls.Add(this.numJudgeLen);
this.ucGroupBoxEx1.Controls.Add(this.label8);
this.ucGroupBoxEx1.Controls.Add(this.btnRestoreSizeAndNumber);
@@ -210,6 +235,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.ucGroupBoxEx1.Controls.Add(this.numWeight1);
this.ucGroupBoxEx1.Controls.Add(this.numHeight1);
this.ucGroupBoxEx1.Controls.Add(this.numWidth1);
+ this.ucGroupBoxEx1.Controls.Add(this.btnMutliOk);
this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime);
this.ucGroupBoxEx1.Controls.Add(this.dtpEndTime);
this.ucGroupBoxEx1.Controls.Add(this.numLen2);
@@ -222,7 +248,6 @@ namespace TemuKJD.KJDForms.AdminForms
this.ucGroupBoxEx1.Controls.Add(this.label15);
this.ucGroupBoxEx1.Controls.Add(this.btnRestoreProdName);
this.ucGroupBoxEx1.Controls.Add(this.txtSkcId);
- this.ucGroupBoxEx1.Controls.Add(this.chkSearchAllShop);
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
this.ucGroupBoxEx1.Controls.Add(this.btnSearchPrice);
this.ucGroupBoxEx1.Controls.Add(this.label5);
@@ -235,27 +260,219 @@ namespace TemuKJD.KJDForms.AdminForms
this.ucGroupBoxEx1.Controls.Add(this.label3);
this.ucGroupBoxEx1.Controls.Add(this.label7);
this.ucGroupBoxEx1.Controls.Add(this.pnlDetailOperate1);
- this.ucGroupBoxEx1.Controls.Add(this.pnlDetailOperate2);
- this.ucGroupBoxEx1.Controls.Add(this.chkFilter);
+ this.ucGroupBoxEx1.Controls.Add(this.chkFilterTitle);
this.ucGroupBoxEx1.Controls.Add(this.label18);
this.ucGroupBoxEx1.Controls.Add(this.label20);
this.ucGroupBoxEx1.Controls.Add(this.label9);
this.ucGroupBoxEx1.Controls.Add(this.label11);
- this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
+ this.ucGroupBoxEx1.Controls.Add(this.chkSearchAllShop);
+ this.ucGroupBoxEx1.Controls.Add(this.ucCheckBox1);
+ this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
- this.ucGroupBoxEx1.Size = new System.Drawing.Size(1345, 130);
+ this.ucGroupBoxEx1.Size = new System.Drawing.Size(1480, 140);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "参数设置";
//
+ // btnRestoreFilterParams
+ //
+ this.btnRestoreFilterParams.CanvasColor = System.Drawing.SystemColors.Control;
+ this.btnRestoreFilterParams.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnRestoreFilterParams.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnRestoreFilterParams.Location = new System.Drawing.Point(823, 110);
+ this.btnRestoreFilterParams.Name = "btnRestoreFilterParams";
+ this.btnRestoreFilterParams.Size = new System.Drawing.Size(86, 23);
+ this.btnRestoreFilterParams.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnRestoreFilterParams.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnRestoreFilterParams.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnRestoreFilterParams.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.btnRestoreFilterParams.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnRestoreFilterParams.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.btnRestoreFilterParams.Style.GradientAngle = 90;
+ this.btnRestoreFilterParams.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnRestoreFilterParams.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnRestoreFilterParams.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnRestoreFilterParams.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnRestoreFilterParams.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnRestoreFilterParams.TabIndex = 1036;
+ this.btnRestoreFilterParams.Text = "还原选中配置";
+ this.btnRestoreFilterParams.Click += new System.EventHandler(this.btnRestoreFilterParams_Click);
+ //
+ // btnSaveFilterParams
+ //
+ this.btnSaveFilterParams.CanvasColor = System.Drawing.SystemColors.Control;
+ this.btnSaveFilterParams.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnSaveFilterParams.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnSaveFilterParams.Location = new System.Drawing.Point(823, 86);
+ this.btnSaveFilterParams.Name = "btnSaveFilterParams";
+ this.btnSaveFilterParams.Size = new System.Drawing.Size(86, 23);
+ this.btnSaveFilterParams.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSaveFilterParams.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnSaveFilterParams.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.btnSaveFilterParams.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.btnSaveFilterParams.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSaveFilterParams.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.btnSaveFilterParams.Style.GradientAngle = 90;
+ this.btnSaveFilterParams.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSaveFilterParams.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnSaveFilterParams.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSaveFilterParams.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSaveFilterParams.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.btnSaveFilterParams.TabIndex = 1032;
+ this.btnSaveFilterParams.Text = "保存选中配置";
+ this.btnSaveFilterParams.Click += new System.EventHandler(this.btnSaveFilterParams_Click);
+ //
+ // txtPrice2
+ //
+ this.txtPrice2.Location = new System.Drawing.Point(859, 62);
+ this.txtPrice2.Name = "txtPrice2";
+ this.txtPrice2.Size = new System.Drawing.Size(50, 23);
+ this.txtPrice2.TabIndex = 1028;
+ this.txtPrice2.Visible = false;
+ //
+ // label16
+ //
+ this.label16.AutoSize = true;
+ this.label16.Location = new System.Drawing.Point(822, 65);
+ this.label16.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label16.Name = "label16";
+ this.label16.Size = new System.Drawing.Size(39, 17);
+ this.label16.TabIndex = 1027;
+ this.label16.Text = "价格2";
+ this.label16.Visible = false;
+ //
+ // txtPrice1
+ //
+ this.txtPrice1.Location = new System.Drawing.Point(859, 38);
+ this.txtPrice1.Name = "txtPrice1";
+ this.txtPrice1.Size = new System.Drawing.Size(50, 23);
+ this.txtPrice1.TabIndex = 1026;
+ //
+ // label14
+ //
+ this.label14.AutoSize = true;
+ this.label14.Location = new System.Drawing.Point(822, 41);
+ this.label14.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label14.Name = "label14";
+ this.label14.Size = new System.Drawing.Size(39, 17);
+ this.label14.TabIndex = 1025;
+ this.label14.Text = "价格1";
+ //
+ // cmbSymbol
+ //
+ this.cmbSymbol.Font = new System.Drawing.Font("Times New Roman", 9F);
+ this.cmbSymbol.FormattingEnabled = true;
+ this.cmbSymbol.Items.AddRange(new object[] {
+ "",
+ "≥",
+ "≤",
+ "≥ ≤",
+ "≤ ≥"});
+ this.cmbSymbol.Location = new System.Drawing.Point(859, 14);
+ this.cmbSymbol.Name = "cmbSymbol";
+ this.cmbSymbol.Size = new System.Drawing.Size(50, 23);
+ this.cmbSymbol.TabIndex = 1023;
+ this.cmbSymbol.TextChanged += new System.EventHandler(this.cmbSymbol_TextChanged);
+ //
+ // label13
+ //
+ this.label13.AutoSize = true;
+ this.label13.Location = new System.Drawing.Point(826, 17);
+ this.label13.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label13.Name = "label13";
+ this.label13.Size = new System.Drawing.Size(32, 17);
+ this.label13.TabIndex = 1024;
+ this.label13.Text = "符号";
+ //
+ // dgvExtCode
+ //
+ this.dgvExtCode.AllowUserToAddRows = false;
+ this.dgvExtCode.AllowUserToDeleteRows = false;
+ dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
+ this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+ | System.Windows.Forms.AnchorStyles.Left)));
+ this.dgvExtCode.AutoRowNumber = false;
+ this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+ this.dgvExtCode.BackgroundColor = System.Drawing.Color.White;
+ this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
+ this.colSelectExtCode,
+ this.colFilterExtCode,
+ this.colFilterRule});
+ this.dgvExtCode.Location = new System.Drawing.Point(527, 14);
+ this.dgvExtCode.Name = "dgvExtCode";
+ this.dgvExtCode.ReadOnly = true;
+ this.dgvExtCode.RowHeadersVisible = false;
+ this.dgvExtCode.RowHeadersWidth = 24;
+ this.dgvExtCode.RowTemplate.Height = 23;
+ this.dgvExtCode.Size = new System.Drawing.Size(290, 119);
+ this.dgvExtCode.TabIndex = 989;
+ this.dgvExtCode.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvExtCode_CellContentClick);
+ //
+ // colSelectExtCode
+ //
+ this.colSelectExtCode.FillWeight = 18F;
+ this.colSelectExtCode.HeaderText = "选";
+ this.colSelectExtCode.Name = "colSelectExtCode";
+ this.colSelectExtCode.ReadOnly = true;
+ this.colSelectExtCode.Resizable = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSelectExtCode.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
+ //
+ // colFilterExtCode
+ //
+ this.colFilterExtCode.HeaderText = "货号";
+ this.colFilterExtCode.Name = "colFilterExtCode";
+ this.colFilterExtCode.ReadOnly = true;
+ //
+ // colFilterRule
+ //
+ this.colFilterRule.FillWeight = 65F;
+ this.colFilterRule.HeaderText = "过滤规则";
+ this.colFilterRule.Name = "colFilterRule";
+ this.colFilterRule.ReadOnly = true;
+ //
+ // pnlMutliCancelWithTitleWrong
+ //
+ this.pnlMutliCancelWithTitleWrong.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.pnlMutliCancelWithTitleWrong.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.pnlMutliCancelWithTitleWrong.DisabledBackColor = System.Drawing.Color.Empty;
+ this.pnlMutliCancelWithTitleWrong.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.pnlMutliCancelWithTitleWrong.Location = new System.Drawing.Point(1363, 81);
+ this.pnlMutliCancelWithTitleWrong.Name = "pnlMutliCancelWithTitleWrong";
+ this.pnlMutliCancelWithTitleWrong.Size = new System.Drawing.Size(90, 23);
+ this.pnlMutliCancelWithTitleWrong.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlMutliCancelWithTitleWrong.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlMutliCancelWithTitleWrong.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlMutliCancelWithTitleWrong.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.pnlMutliCancelWithTitleWrong.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.pnlMutliCancelWithTitleWrong.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.pnlMutliCancelWithTitleWrong.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.pnlMutliCancelWithTitleWrong.Style.GradientAngle = 90;
+ this.pnlMutliCancelWithTitleWrong.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlMutliCancelWithTitleWrong.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.pnlMutliCancelWithTitleWrong.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.pnlMutliCancelWithTitleWrong.TabIndex = 772;
+ this.pnlMutliCancelWithTitleWrong.Text = "批量作废";
+ this.pnlMutliCancelWithTitleWrong.Visible = false;
+ this.pnlMutliCancelWithTitleWrong.Click += new System.EventHandler(this.pnlMutliCancelWithTitleWrong_Click);
+ //
// btnResetExtCode
//
this.btnResetExtCode.CanvasColor = System.Drawing.SystemColors.Control;
this.btnResetExtCode.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnResetExtCode.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnResetExtCode.Location = new System.Drawing.Point(631, 42);
+ this.btnResetExtCode.Location = new System.Drawing.Point(477, 38);
this.btnResetExtCode.Name = "btnResetExtCode";
- this.btnResetExtCode.Size = new System.Drawing.Size(66, 23);
+ this.btnResetExtCode.Size = new System.Drawing.Size(32, 23);
this.btnResetExtCode.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnResetExtCode.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnResetExtCode.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -274,15 +491,15 @@ namespace TemuKJD.KJDForms.AdminForms
//
// txtExtCode
//
- this.txtExtCode.Location = new System.Drawing.Point(446, 42);
+ this.txtExtCode.Location = new System.Drawing.Point(326, 38);
this.txtExtCode.Name = "txtExtCode";
- this.txtExtCode.Size = new System.Drawing.Size(182, 23);
+ this.txtExtCode.Size = new System.Drawing.Size(149, 23);
this.txtExtCode.TabIndex = 953;
//
// label12
//
this.label12.AutoSize = true;
- this.label12.Location = new System.Drawing.Point(412, 45);
+ this.label12.Location = new System.Drawing.Point(292, 42);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(44, 17);
this.label12.TabIndex = 954;
@@ -290,7 +507,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numJudgeWeight
//
- this.numJudgeWeight.Location = new System.Drawing.Point(808, 98);
+ this.numJudgeWeight.Location = new System.Drawing.Point(1078, 107);
this.numJudgeWeight.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numJudgeWeight.Maximum = new decimal(new int[] {
10000,
@@ -306,9 +523,33 @@ namespace TemuKJD.KJDForms.AdminForms
0,
0});
//
+ // btnMutliCancel
+ //
+ this.btnMutliCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnMutliCancel.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnMutliCancel.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnMutliCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnMutliCancel.Location = new System.Drawing.Point(1363, 52);
+ this.btnMutliCancel.Name = "btnMutliCancel";
+ this.btnMutliCancel.Size = new System.Drawing.Size(90, 23);
+ this.btnMutliCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnMutliCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnMutliCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnMutliCancel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnMutliCancel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnMutliCancel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnMutliCancel.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnMutliCancel.Style.GradientAngle = 90;
+ this.btnMutliCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnMutliCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnMutliCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnMutliCancel.TabIndex = 772;
+ this.btnMutliCancel.Text = "批量拒绝报价";
+ this.btnMutliCancel.Click += new System.EventHandler(this.btnMutliCancel_Click);
+ //
// numJudgeLen
//
- this.numJudgeLen.Location = new System.Drawing.Point(737, 98);
+ this.numJudgeLen.Location = new System.Drawing.Point(1002, 107);
this.numJudgeLen.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numJudgeLen.Maximum = new decimal(new int[] {
299,
@@ -316,7 +557,7 @@ namespace TemuKJD.KJDForms.AdminForms
0,
0});
this.numJudgeLen.Name = "numJudgeLen";
- this.numJudgeLen.Size = new System.Drawing.Size(35, 23);
+ this.numJudgeLen.Size = new System.Drawing.Size(40, 23);
this.numJudgeLen.TabIndex = 929;
this.numJudgeLen.Value = new decimal(new int[] {
45,
@@ -327,7 +568,8 @@ namespace TemuKJD.KJDForms.AdminForms
// label8
//
this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(711, 101);
+ this.label8.ForeColor = System.Drawing.Color.Gray;
+ this.label8.Location = new System.Drawing.Point(977, 110);
this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(29, 17);
@@ -340,9 +582,9 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRestoreSizeAndNumber.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRestoreSizeAndNumber.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestoreSizeAndNumber.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRestoreSizeAndNumber.Location = new System.Drawing.Point(863, 70);
+ this.btnRestoreSizeAndNumber.Location = new System.Drawing.Point(1040, 79);
this.btnRestoreSizeAndNumber.Name = "btnRestoreSizeAndNumber";
- this.btnRestoreSizeAndNumber.Size = new System.Drawing.Size(99, 23);
+ this.btnRestoreSizeAndNumber.Size = new System.Drawing.Size(151, 23);
this.btnRestoreSizeAndNumber.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestoreSizeAndNumber.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestoreSizeAndNumber.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -355,12 +597,12 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRestoreSizeAndNumber.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRestoreSizeAndNumber.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRestoreSizeAndNumber.TabIndex = 879;
- this.btnRestoreSizeAndNumber.Text = "还原尺寸与数量";
+ this.btnRestoreSizeAndNumber.Text = "还原商品尺寸与数量";
this.btnRestoreSizeAndNumber.Click += new System.EventHandler(this.btnRestoreSizeAndNumber_Click);
//
// numWeight2
//
- this.numWeight2.Location = new System.Drawing.Point(789, 70);
+ this.numWeight2.Location = new System.Drawing.Point(988, 79);
this.numWeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWeight2.Maximum = new decimal(new int[] {
10000,
@@ -368,7 +610,7 @@ namespace TemuKJD.KJDForms.AdminForms
0,
0});
this.numWeight2.Name = "numWeight2";
- this.numWeight2.Size = new System.Drawing.Size(55, 23);
+ this.numWeight2.Size = new System.Drawing.Size(50, 23);
this.numWeight2.TabIndex = 683;
this.numWeight2.Value = new decimal(new int[] {
300,
@@ -378,7 +620,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numHeight2
//
- this.numHeight2.Location = new System.Drawing.Point(928, 42);
+ this.numHeight2.Location = new System.Drawing.Point(1151, 51);
this.numHeight2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numHeight2.Maximum = new decimal(new int[] {
299,
@@ -396,7 +638,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numWeight1
//
- this.numWeight1.Location = new System.Drawing.Point(737, 70);
+ this.numWeight1.Location = new System.Drawing.Point(939, 79);
this.numWeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWeight1.Maximum = new decimal(new int[] {
99999,
@@ -404,7 +646,7 @@ namespace TemuKJD.KJDForms.AdminForms
0,
0});
this.numWeight1.Name = "numWeight1";
- this.numWeight1.Size = new System.Drawing.Size(53, 23);
+ this.numWeight1.Size = new System.Drawing.Size(50, 23);
this.numWeight1.TabIndex = 682;
this.numWeight1.Value = new decimal(new int[] {
200,
@@ -414,7 +656,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numHeight1
//
- this.numHeight1.Location = new System.Drawing.Point(894, 42);
+ this.numHeight1.Location = new System.Drawing.Point(1117, 51);
this.numHeight1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numHeight1.Maximum = new decimal(new int[] {
299,
@@ -432,7 +674,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numWidth1
//
- this.numWidth1.Location = new System.Drawing.Point(805, 42);
+ this.numWidth1.Location = new System.Drawing.Point(1028, 51);
this.numWidth1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWidth1.Maximum = new decimal(new int[] {
299,
@@ -448,12 +690,36 @@ namespace TemuKJD.KJDForms.AdminForms
0,
0});
//
+ // btnMutliOk
+ //
+ this.btnMutliOk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.btnMutliOk.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnMutliOk.DisabledBackColor = System.Drawing.Color.Empty;
+ this.btnMutliOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnMutliOk.Location = new System.Drawing.Point(1363, 23);
+ this.btnMutliOk.Name = "btnMutliOk";
+ this.btnMutliOk.Size = new System.Drawing.Size(90, 23);
+ this.btnMutliOk.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnMutliOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnMutliOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnMutliOk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
+ this.btnMutliOk.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
+ this.btnMutliOk.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
+ this.btnMutliOk.Style.ForeColor.Color = System.Drawing.Color.White;
+ this.btnMutliOk.Style.GradientAngle = 90;
+ this.btnMutliOk.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.btnMutliOk.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnMutliOk.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
+ this.btnMutliOk.TabIndex = 768;
+ this.btnMutliOk.Text = "批量同意报价";
+ this.btnMutliOk.Click += new System.EventHandler(this.btnMutliOk_Click);
+ //
// chkSearchTime
//
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkSearchTime.Location = new System.Drawing.Point(407, 74);
+ this.chkSearchTime.Location = new System.Drawing.Point(287, 68);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(15, 14);
this.chkSearchTime.TabIndex = 827;
@@ -461,14 +727,14 @@ namespace TemuKJD.KJDForms.AdminForms
//
// dtpEndTime
//
- this.dtpEndTime.Location = new System.Drawing.Point(561, 70);
+ this.dtpEndTime.Location = new System.Drawing.Point(303, 86);
this.dtpEndTime.Name = "dtpEndTime";
- this.dtpEndTime.Size = new System.Drawing.Size(136, 23);
+ this.dtpEndTime.Size = new System.Drawing.Size(206, 23);
this.dtpEndTime.TabIndex = 826;
//
// numLen2
//
- this.numLen2.Location = new System.Drawing.Point(750, 42);
+ this.numLen2.Location = new System.Drawing.Point(973, 51);
this.numLen2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numLen2.Maximum = new decimal(new int[] {
299,
@@ -486,14 +752,14 @@ namespace TemuKJD.KJDForms.AdminForms
//
// dtpStartTime
//
- this.dtpStartTime.Location = new System.Drawing.Point(423, 70);
+ this.dtpStartTime.Location = new System.Drawing.Point(303, 62);
this.dtpStartTime.Name = "dtpStartTime";
- this.dtpStartTime.Size = new System.Drawing.Size(136, 23);
+ this.dtpStartTime.Size = new System.Drawing.Size(206, 23);
this.dtpStartTime.TabIndex = 825;
//
// numWidth2
//
- this.numWidth2.Location = new System.Drawing.Point(839, 42);
+ this.numWidth2.Location = new System.Drawing.Point(1062, 51);
this.numWidth2.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numWidth2.Maximum = new decimal(new int[] {
299,
@@ -512,7 +778,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label19
//
this.label19.AutoSize = true;
- this.label19.Location = new System.Drawing.Point(878, 45);
+ this.label19.Location = new System.Drawing.Point(1101, 54);
this.label19.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label19.Name = "label19";
this.label19.Size = new System.Drawing.Size(20, 17);
@@ -524,9 +790,9 @@ namespace TemuKJD.KJDForms.AdminForms
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(631, 98);
+ this.btnStop.Location = new System.Drawing.Point(453, 110);
this.btnStop.Name = "btnStop";
- this.btnStop.Size = new System.Drawing.Size(66, 23);
+ this.btnStop.Size = new System.Drawing.Size(56, 23);
this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -545,7 +811,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
// numLen1
//
- this.numLen1.Location = new System.Drawing.Point(716, 42);
+ this.numLen1.Location = new System.Drawing.Point(939, 51);
this.numLen1.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
this.numLen1.Maximum = new decimal(new int[] {
299,
@@ -567,9 +833,9 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnSearchPrice2.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearchPrice2.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearchPrice2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearchPrice2.Location = new System.Drawing.Point(516, 98);
+ this.btnSearchPrice2.Location = new System.Drawing.Point(357, 110);
this.btnSearchPrice2.Name = "btnSearchPrice2";
- this.btnSearchPrice2.Size = new System.Drawing.Size(112, 23);
+ this.btnSearchPrice2.Size = new System.Drawing.Size(94, 23);
this.btnSearchPrice2.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSearchPrice2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSearchPrice2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -588,7 +854,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label15
//
this.label15.AutoSize = true;
- this.label15.Location = new System.Drawing.Point(700, 45);
+ this.label15.Location = new System.Drawing.Point(922, 54);
this.label15.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label15.Name = "label15";
this.label15.Size = new System.Drawing.Size(20, 17);
@@ -601,7 +867,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRestoreProdName.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRestoreProdName.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestoreProdName.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRestoreProdName.Location = new System.Drawing.Point(863, 14);
+ this.btnRestoreProdName.Location = new System.Drawing.Point(1086, 17);
this.btnRestoreProdName.Name = "btnRestoreProdName";
this.btnRestoreProdName.Size = new System.Drawing.Size(99, 23);
this.btnRestoreProdName.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -621,29 +887,19 @@ namespace TemuKJD.KJDForms.AdminForms
//
// txtSkcId
//
- this.txtSkcId.Location = new System.Drawing.Point(446, 14);
+ this.txtSkcId.Location = new System.Drawing.Point(326, 14);
this.txtSkcId.Name = "txtSkcId";
- this.txtSkcId.Size = new System.Drawing.Size(251, 23);
+ this.txtSkcId.Size = new System.Drawing.Size(183, 23);
this.txtSkcId.TabIndex = 733;
//
- // chkSearchAllShop
- //
- this.chkSearchAllShop.AutoSize = true;
- this.chkSearchAllShop.Location = new System.Drawing.Point(250, 63);
- this.chkSearchAllShop.Name = "chkSearchAllShop";
- this.chkSearchAllShop.Size = new System.Drawing.Size(147, 21);
- this.chkSearchAllShop.TabIndex = 710;
- this.chkSearchAllShop.Text = "二级超管查询所有店铺";
- this.chkSearchAllShop.UseVisualStyleBackColor = true;
- //
// btnEmpty
//
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(349, 88);
+ this.btnEmpty.Location = new System.Drawing.Point(220, 86);
this.btnEmpty.Name = "btnEmpty";
- this.btnEmpty.Size = new System.Drawing.Size(40, 23);
+ this.btnEmpty.Size = new System.Drawing.Size(36, 23);
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)))));
@@ -666,9 +922,9 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearchPrice.Location = new System.Drawing.Point(407, 98);
+ this.btnSearchPrice.Location = new System.Drawing.Point(287, 110);
this.btnSearchPrice.Name = "btnSearchPrice";
- this.btnSearchPrice.Size = new System.Drawing.Size(106, 23);
+ this.btnSearchPrice.Size = new System.Drawing.Size(68, 23);
this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSearchPrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSearchPrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -686,16 +942,17 @@ namespace TemuKJD.KJDForms.AdminForms
//
// label5
//
- this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label5.Location = new System.Drawing.Point(247, 26);
+ this.label5.AutoSize = true;
+ this.label5.ForeColor = System.Drawing.Color.Gray;
+ this.label5.Location = new System.Drawing.Point(19, 114);
this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(142, 36);
+ this.label5.Size = new System.Drawing.Size(236, 17);
this.label5.TabIndex = 685;
- this.label5.Text = "注：可使用逗号分隔，一次查询多个店铺";
+ this.label5.Text = "注：使用逗号分隔查询条件，一次查询多店";
//
// txtNotes
//
- this.txtNotes.Location = new System.Drawing.Point(61, 88);
+ this.txtNotes.Location = new System.Drawing.Point(73, 62);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(183, 23);
this.txtNotes.TabIndex = 382;
@@ -703,7 +960,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label4
//
this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(4, 91);
+ this.label4.Location = new System.Drawing.Point(16, 65);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 383;
@@ -715,9 +972,9 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRefreshShop.Location = new System.Drawing.Point(246, 88);
+ this.btnRefreshShop.Location = new System.Drawing.Point(160, 86);
this.btnRefreshShop.Name = "btnRefreshShop";
- this.btnRefreshShop.Size = new System.Drawing.Size(100, 23);
+ this.btnRefreshShop.Size = new System.Drawing.Size(58, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -730,19 +987,19 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
- this.btnRefreshShop.Text = "刷新/查询店铺";
+ this.btnRefreshShop.Text = "查询店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// txtShopName
//
- this.txtShopName.Location = new System.Drawing.Point(61, 58);
+ this.txtShopName.Location = new System.Drawing.Point(73, 38);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(183, 23);
this.txtShopName.TabIndex = 380;
//
// txtShopId
//
- this.txtShopId.Location = new System.Drawing.Point(61, 27);
+ this.txtShopId.Location = new System.Drawing.Point(73, 14);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(183, 23);
this.txtShopId.TabIndex = 378;
@@ -750,7 +1007,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label2
//
this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(17, 30);
+ this.label2.Location = new System.Drawing.Point(29, 17);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(55, 17);
this.label2.TabIndex = 379;
@@ -759,7 +1016,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label3
//
this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(16, 61);
+ this.label3.Location = new System.Drawing.Point(28, 41);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(56, 17);
this.label3.TabIndex = 381;
@@ -768,7 +1025,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label7
//
this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(404, 17);
+ this.label7.Location = new System.Drawing.Point(284, 17);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(52, 17);
this.label7.TabIndex = 734;
@@ -781,11 +1038,9 @@ namespace TemuKJD.KJDForms.AdminForms
this.pnlDetailOperate1.Controls.Add(this.txtPriceDown);
this.pnlDetailOperate1.Controls.Add(this.label1);
this.pnlDetailOperate1.Controls.Add(this.label6);
- this.pnlDetailOperate1.Controls.Add(this.btnMutliCancel);
- this.pnlDetailOperate1.Controls.Add(this.btnMutliOk);
- this.pnlDetailOperate1.Location = new System.Drawing.Point(972, 21);
+ this.pnlDetailOperate1.Location = new System.Drawing.Point(1203, 20);
this.pnlDetailOperate1.Name = "pnlDetailOperate1";
- this.pnlDetailOperate1.Size = new System.Drawing.Size(365, 76);
+ this.pnlDetailOperate1.Size = new System.Drawing.Size(154, 107);
this.pnlDetailOperate1.TabIndex = 855;
//
// btnRePrice
@@ -794,7 +1049,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnRePrice.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRePrice.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRePrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnRePrice.Location = new System.Drawing.Point(164, 20);
+ this.btnRePrice.Location = new System.Drawing.Point(7, 31);
this.btnRePrice.Name = "btnRePrice";
this.btnRePrice.Size = new System.Drawing.Size(90, 23);
this.btnRePrice.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -815,7 +1070,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label10
//
this.label10.AutoSize = true;
- this.label10.Location = new System.Drawing.Point(4, 23);
+ this.label10.Location = new System.Drawing.Point(4, 5);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(32, 17);
this.label10.TabIndex = 680;
@@ -823,10 +1078,10 @@ namespace TemuKJD.KJDForms.AdminForms
//
// txtPriceDown
//
- this.txtPriceDown.Location = new System.Drawing.Point(36, 20);
+ this.txtPriceDown.Location = new System.Drawing.Point(36, 2);
this.txtPriceDown.Margin = new System.Windows.Forms.Padding(0);
this.txtPriceDown.Name = "txtPriceDown";
- this.txtPriceDown.Size = new System.Drawing.Size(48, 23);
+ this.txtPriceDown.Size = new System.Drawing.Size(35, 23);
this.txtPriceDown.TabIndex = 679;
this.txtPriceDown.Text = "0.1";
//
@@ -834,117 +1089,36 @@ namespace TemuKJD.KJDForms.AdminForms
//
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
- this.label1.Location = new System.Drawing.Point(4, 48);
+ this.label1.Location = new System.Drawing.Point(4, 59);
this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(223, 17);
+ this.label1.Size = new System.Drawing.Size(123, 34);
this.label1.TabIndex = 684;
- this.label1.Text = "注：再次报价价格 = 原价 - 次数 × 降价";
+ this.label1.Text = "注：再次报价价格\r\n= 原价 - 次数 × 降价";
//
// label6
//
this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(87, 23);
+ this.label6.Location = new System.Drawing.Point(73, 5);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(80, 17);
this.label6.TabIndex = 723;
this.label6.Text = "元（人民币）";
//
- // btnMutliCancel
+ // chkFilterTitle
//
- this.btnMutliCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnMutliCancel.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnMutliCancel.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnMutliCancel.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnMutliCancel.Location = new System.Drawing.Point(270, 49);
- this.btnMutliCancel.Name = "btnMutliCancel";
- this.btnMutliCancel.Size = new System.Drawing.Size(90, 23);
- this.btnMutliCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnMutliCancel.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnMutliCancel.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnMutliCancel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnMutliCancel.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnMutliCancel.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnMutliCancel.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnMutliCancel.Style.GradientAngle = 90;
- this.btnMutliCancel.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnMutliCancel.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnMutliCancel.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnMutliCancel.TabIndex = 772;
- this.btnMutliCancel.Text = "批量拒绝报价";
- this.btnMutliCancel.Click += new System.EventHandler(this.btnMutliCancel_Click);
- //
- // btnMutliOk
- //
- this.btnMutliOk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnMutliOk.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnMutliOk.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnMutliOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnMutliOk.Location = new System.Drawing.Point(270, 20);
- this.btnMutliOk.Name = "btnMutliOk";
- this.btnMutliOk.Size = new System.Drawing.Size(90, 23);
- this.btnMutliOk.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnMutliOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnMutliOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnMutliOk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.btnMutliOk.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.btnMutliOk.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.btnMutliOk.Style.ForeColor.Color = System.Drawing.Color.White;
- this.btnMutliOk.Style.GradientAngle = 90;
- this.btnMutliOk.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnMutliOk.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnMutliOk.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.btnMutliOk.TabIndex = 768;
- this.btnMutliOk.Text = "批量同意报价";
- this.btnMutliOk.Click += new System.EventHandler(this.btnMutliOk_Click);
- //
- // pnlDetailOperate2
- //
- this.pnlDetailOperate2.Controls.Add(this.pnlMutliCancelWithTitleWrong);
- this.pnlDetailOperate2.Location = new System.Drawing.Point(972, 81);
- this.pnlDetailOperate2.Name = "pnlDetailOperate2";
- this.pnlDetailOperate2.Size = new System.Drawing.Size(365, 75);
- this.pnlDetailOperate2.TabIndex = 856;
- this.pnlDetailOperate2.Visible = false;
- //
- // pnlMutliCancelWithTitleWrong
- //
- this.pnlMutliCancelWithTitleWrong.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.pnlMutliCancelWithTitleWrong.Cursor = System.Windows.Forms.Cursors.Hand;
- this.pnlMutliCancelWithTitleWrong.DisabledBackColor = System.Drawing.Color.Empty;
- this.pnlMutliCancelWithTitleWrong.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.pnlMutliCancelWithTitleWrong.Location = new System.Drawing.Point(270, 18);
- this.pnlMutliCancelWithTitleWrong.Name = "pnlMutliCancelWithTitleWrong";
- this.pnlMutliCancelWithTitleWrong.Size = new System.Drawing.Size(90, 23);
- this.pnlMutliCancelWithTitleWrong.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlMutliCancelWithTitleWrong.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlMutliCancelWithTitleWrong.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlMutliCancelWithTitleWrong.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
- this.pnlMutliCancelWithTitleWrong.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
- this.pnlMutliCancelWithTitleWrong.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
- this.pnlMutliCancelWithTitleWrong.Style.ForeColor.Color = System.Drawing.Color.White;
- this.pnlMutliCancelWithTitleWrong.Style.GradientAngle = 90;
- this.pnlMutliCancelWithTitleWrong.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlMutliCancelWithTitleWrong.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.pnlMutliCancelWithTitleWrong.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
- this.pnlMutliCancelWithTitleWrong.TabIndex = 772;
- this.pnlMutliCancelWithTitleWrong.Text = "批量作废";
- this.pnlMutliCancelWithTitleWrong.Click += new System.EventHandler(this.pnlMutliCancelWithTitleWrong_Click);
- //
- // chkFilter
- //
- this.chkFilter.AutoSize = true;
- this.chkFilter.Location = new System.Drawing.Point(711, 15);
- this.chkFilter.Name = "chkFilter";
- this.chkFilter.Size = new System.Drawing.Size(159, 21);
- this.chkFilter.TabIndex = 857;
- this.chkFilter.Text = "列表仅显示含头尾词标题";
- this.chkFilter.UseVisualStyleBackColor = true;
- this.chkFilter.CheckedChanged += new System.EventHandler(this.chkFilter_CheckedChanged);
+ this.chkFilterTitle.AutoSize = true;
+ this.chkFilterTitle.Location = new System.Drawing.Point(934, 18);
+ this.chkFilterTitle.Name = "chkFilterTitle";
+ this.chkFilterTitle.Size = new System.Drawing.Size(159, 21);
+ this.chkFilterTitle.TabIndex = 857;
+ this.chkFilterTitle.Text = "列表仅显示含头尾词标题";
+ this.chkFilterTitle.UseVisualStyleBackColor = true;
+ this.chkFilterTitle.CheckedChanged += new System.EventHandler(this.chkFilterTitle_CheckedChanged);
//
// label18
//
this.label18.AutoSize = true;
- this.label18.Location = new System.Drawing.Point(789, 45);
+ this.label18.Location = new System.Drawing.Point(1012, 54);
this.label18.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label18.Name = "label18";
this.label18.Size = new System.Drawing.Size(20, 17);
@@ -954,7 +1128,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label20
//
this.label20.AutoSize = true;
- this.label20.Location = new System.Drawing.Point(721, 73);
+ this.label20.Location = new System.Drawing.Point(922, 82);
this.label20.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label20.Name = "label20";
this.label20.Size = new System.Drawing.Size(20, 17);
@@ -964,7 +1138,8 @@ namespace TemuKJD.KJDForms.AdminForms
// label9
//
this.label9.AutoSize = true;
- this.label9.Location = new System.Drawing.Point(770, 101);
+ this.label9.ForeColor = System.Drawing.Color.Gray;
+ this.label9.Location = new System.Drawing.Point(1041, 110);
this.label9.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(41, 17);
@@ -974,12 +1149,34 @@ namespace TemuKJD.KJDForms.AdminForms
// label11
//
this.label11.AutoSize = true;
- this.label11.Location = new System.Drawing.Point(857, 101);
+ this.label11.ForeColor = System.Drawing.Color.Gray;
+ this.label11.Location = new System.Drawing.Point(1126, 110);
this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
this.label11.Name = "label11";
- this.label11.Size = new System.Drawing.Size(92, 17);
+ this.label11.Size = new System.Drawing.Size(72, 17);
this.label11.TabIndex = 932;
- this.label11.Text = "需要还原并标红";
+ this.label11.Text = "需还原 标红";
+ //
+ // chkSearchAllShop
+ //
+ this.chkSearchAllShop.AutoSize = true;
+ this.chkSearchAllShop.Location = new System.Drawing.Point(19, 87);
+ this.chkSearchAllShop.Name = "chkSearchAllShop";
+ this.chkSearchAllShop.Size = new System.Drawing.Size(147, 21);
+ this.chkSearchAllShop.TabIndex = 710;
+ this.chkSearchAllShop.Text = "二级超管查询所有店铺";
+ this.chkSearchAllShop.UseVisualStyleBackColor = true;
+ //
+ // ucCheckBox1
+ //
+ this.ucCheckBox1.AutoSize = true;
+ this.ucCheckBox1.Location = new System.Drawing.Point(925, 108);
+ this.ucCheckBox1.Name = "ucCheckBox1";
+ this.ucCheckBox1.Size = new System.Drawing.Size(63, 21);
+ this.ucCheckBox1.TabIndex = 1076;
+ this.ucCheckBox1.Text = "仅显示";
+ this.ucCheckBox1.UseVisualStyleBackColor = true;
+ this.ucCheckBox1.CheckedChanged += new System.EventHandler(this.chkFilterSize_CheckedChanged);
//
// splitContainer3
//
@@ -996,8 +1193,8 @@ namespace TemuKJD.KJDForms.AdminForms
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
- this.splitContainer3.Size = new System.Drawing.Size(1350, 477);
- this.splitContainer3.SplitterDistance = 447;
+ this.splitContainer3.Size = new System.Drawing.Size(1484, 467);
+ this.splitContainer3.SplitterDistance = 437;
this.splitContainer3.TabIndex = 1;
//
// splitContainer2
@@ -1021,7 +1218,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.splitContainer2.Panel2.Controls.Add(this.btnClear);
this.splitContainer2.Panel2.Controls.Add(this.dgvPriceCheck);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
- this.splitContainer2.Size = new System.Drawing.Size(1350, 447);
+ this.splitContainer2.Size = new System.Drawing.Size(1484, 437);
this.splitContainer2.SplitterDistance = 280;
this.splitContainer2.TabIndex = 0;
//
@@ -1029,7 +1226,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
this.pbShopLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbShopLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbShopLoading.Location = new System.Drawing.Point(115, 198);
+ this.pbShopLoading.Location = new System.Drawing.Point(115, 193);
this.pbShopLoading.Name = "pbShopLoading";
this.pbShopLoading.Size = new System.Drawing.Size(50, 50);
this.pbShopLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1041,18 +1238,19 @@ namespace TemuKJD.KJDForms.AdminForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
+ this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1070,7 +1268,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.dgvShop.ReadOnly = true;
this.dgvShop.RowHeadersWidth = 25;
this.dgvShop.RowTemplate.Height = 23;
- this.dgvShop.Size = new System.Drawing.Size(276, 447);
+ this.dgvShop.Size = new System.Drawing.Size(276, 437);
this.dgvShop.TabIndex = 6;
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
//
@@ -1155,7 +1353,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.pnlSpecDetail.Controls.Add(this.btnClose);
this.pnlSpecDetail.Location = new System.Drawing.Point(113, 58);
this.pnlSpecDetail.Name = "pnlSpecDetail";
- this.pnlSpecDetail.Size = new System.Drawing.Size(837, 134);
+ this.pnlSpecDetail.Size = new System.Drawing.Size(971, 124);
this.pnlSpecDetail.TabIndex = 682;
this.pnlSpecDetail.Visible = false;
//
@@ -1168,7 +1366,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.textBox1.Multiline = true;
this.textBox1.Name = "textBox1";
this.textBox1.ScrollBars = System.Windows.Forms.ScrollBars.Both;
- this.textBox1.Size = new System.Drawing.Size(778, 75);
+ this.textBox1.Size = new System.Drawing.Size(912, 65);
this.textBox1.TabIndex = 690;
//
// btnClose
@@ -1178,7 +1376,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnClose.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnClose.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClose.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClose.Location = new System.Drawing.Point(748, 98);
+ this.btnClose.Location = new System.Drawing.Point(882, 88);
this.btnClose.Name = "btnClose";
this.btnClose.Size = new System.Drawing.Size(58, 23);
this.btnClose.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1200,7 +1398,7 @@ namespace TemuKJD.KJDForms.AdminForms
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
- this.pbLoading.Location = new System.Drawing.Point(492, 198);
+ this.pbLoading.Location = new System.Drawing.Point(559, 193);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -1214,7 +1412,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control;
this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty;
- this.panelEx1.Location = new System.Drawing.Point(801, 383);
+ this.panelEx1.Location = new System.Drawing.Point(935, 373);
this.panelEx1.Name = "panelEx1";
this.panelEx1.Size = new System.Drawing.Size(115, 21);
this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1240,7 +1438,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnClear.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnClear.DisabledBackColor = System.Drawing.Color.Empty;
this.btnClear.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnClear.Location = new System.Drawing.Point(692, 383);
+ this.btnClear.Location = new System.Drawing.Point(826, 373);
this.btnClear.Name = "btnClear";
this.btnClear.Size = new System.Drawing.Size(90, 21);
this.btnClear.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -1263,18 +1461,19 @@ namespace TemuKJD.KJDForms.AdminForms
//
this.dgvPriceCheck.AllowUserToAddRows = false;
this.dgvPriceCheck.AllowUserToDeleteRows = false;
- dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvPriceCheck.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+ this.dgvPriceCheck.AutoRowNumber = true;
this.dgvPriceCheck.BackgroundColor = System.Drawing.Color.White;
this.dgvPriceCheck.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvPriceCheck.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
this.dgvPriceCheck.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvPriceCheck.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1305,14 +1504,13 @@ namespace TemuKJD.KJDForms.AdminForms
this.dgvPriceCheck.ReadOnly = true;
this.dgvPriceCheck.RowHeadersWidth = 36;
this.dgvPriceCheck.RowTemplate.Height = 23;
- this.dgvPriceCheck.Size = new System.Drawing.Size(1062, 447);
+ this.dgvPriceCheck.Size = new System.Drawing.Size(1196, 437);
this.dgvPriceCheck.TabIndex = 187;
this.dgvPriceCheck.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvCheckPrice_CellContentClick);
this.dgvPriceCheck.CellMouseDown += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvPriceCheck_CellMouseDown);
this.dgvPriceCheck.CellMouseEnter += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvPriceCheck_CellMouseEnter);
this.dgvPriceCheck.CellMouseUp += new System.Windows.Forms.DataGridViewCellMouseEventHandler(this.dgvPriceCheck_CellMouseUp);
this.dgvPriceCheck.RowStateChanged += new System.Windows.Forms.DataGridViewRowStateChangedEventHandler(this.dgvPriceCheck_RowStateChanged);
- this.dgvPriceCheck.Scroll += new System.Windows.Forms.ScrollEventHandler(this.dgvPriceCheck_Scroll);
this.dgvPriceCheck.MouseUp += new System.Windows.Forms.MouseEventHandler(this.dgvPriceCheck_MouseUp);
//
// colCheck
@@ -1388,8 +1586,8 @@ namespace TemuKJD.KJDForms.AdminForms
//
// colProdName
//
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProdName.DefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProdName.DefaultCellStyle = dataGridViewCellStyle7;
this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true;
@@ -1397,8 +1595,8 @@ namespace TemuKJD.KJDForms.AdminForms
//
// colSkuName
//
- dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colSkuName.DefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSkuName.DefaultCellStyle = dataGridViewCellStyle8;
this.colSkuName.HeaderText = "规格名称";
this.colSkuName.Name = "colSkuName";
this.colSkuName.ReadOnly = true;
@@ -1448,8 +1646,8 @@ namespace TemuKJD.KJDForms.AdminForms
//
// colCreatTime
//
- dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle14;
+ dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle9;
this.colCreatTime.HeaderText = "创建时间";
this.colCreatTime.Name = "colCreatTime";
this.colCreatTime.ReadOnly = true;
@@ -1503,7 +1701,7 @@ namespace TemuKJD.KJDForms.AdminForms
// splitContainer4.Panel2
//
this.splitContainer4.Panel2.Controls.Add(this.statusBar);
- this.splitContainer4.Size = new System.Drawing.Size(1350, 26);
+ this.splitContainer4.Size = new System.Drawing.Size(1484, 26);
this.splitContainer4.SplitterDistance = 282;
this.splitContainer4.TabIndex = 3;
//
@@ -1529,13 +1727,13 @@ namespace TemuKJD.KJDForms.AdminForms
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(1064, 26);
+ this.statusBar.Size = new System.Drawing.Size(1198, 26);
this.statusBar.TabIndex = 2;
//
// AdminProductPriceCheckForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(1350, 611);
+ this.ClientSize = new System.Drawing.Size(1484, 611);
this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.KeyPreview = true;
@@ -1551,6 +1749,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.splitContainer1.ResumeLayout(false);
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.dgvExtCode)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numJudgeWeight)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numJudgeLen)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.numWeight2)).EndInit();
@@ -1563,7 +1762,6 @@ namespace TemuKJD.KJDForms.AdminForms
((System.ComponentModel.ISupportInitialize)(this.numLen1)).EndInit();
this.pnlDetailOperate1.ResumeLayout(false);
this.pnlDetailOperate1.PerformLayout();
- this.pnlDetailOperate2.ResumeLayout(false);
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
@@ -1636,9 +1834,8 @@ namespace TemuKJD.KJDForms.AdminForms
private System.Windows.Forms.DateTimePicker dtpStartTime;
private UserComponent.UcCheckBox chkSearchTime;
private System.Windows.Forms.Panel pnlDetailOperate1;
- private System.Windows.Forms.Panel pnlDetailOperate2;
private DevComponents.DotNetBar.PanelEx pnlMutliCancelWithTitleWrong;
- private UserComponent.UcCheckBox chkFilter;
+ private UserComponent.UcCheckBox chkFilterTitle;
private DevComponents.DotNetBar.PanelEx btnRestoreSizeAndNumber;
private System.Windows.Forms.NumericUpDown numHeight2;
private System.Windows.Forms.NumericUpDown numHeight1;
@@ -1686,5 +1883,18 @@ namespace TemuKJD.KJDForms.AdminForms
private System.Windows.Forms.Label label12;
private DevComponents.DotNetBar.PanelEx btnResetExtCode;
private System.Windows.Forms.TextBox txtSkcId;
+ private UserComponent.DataGridViewEx dgvExtCode;
+ private DevComponents.DotNetBar.PanelEx btnSaveFilterParams;
+ private System.Windows.Forms.TextBox txtPrice2;
+ private System.Windows.Forms.Label label16;
+ private System.Windows.Forms.TextBox txtPrice1;
+ private System.Windows.Forms.Label label14;
+ private System.Windows.Forms.ComboBox cmbSymbol;
+ private System.Windows.Forms.Label label13;
+ private DevComponents.DotNetBar.PanelEx btnRestoreFilterParams;
+ private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode;
+ private System.Windows.Forms.DataGridViewTextBoxColumn colFilterRule;
+ private UserComponent.UcCheckBox ucCheckBox1;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs
index cdd85c4..79be242 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.cs
@@ -25,6 +25,7 @@ namespace TemuKJD.KJDForms.AdminForms
public partial class AdminProductPriceCheckForm : Form
{
PriceCheckConfig priceCheckConfig = null;
+ List lstPriceCheckFilterConfig = new List();
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
public List lstAdminShopInfo { get; set; } = new List();
public List lstCheckPriceInfo = new List();
@@ -36,9 +37,14 @@ namespace TemuKJD.KJDForms.AdminForms
private void AdminProductPriceCheckForm_Load(object sender, EventArgs e)
{
+ lstPriceCheckFilterConfig = NaiBa.Util.Helper.ConfigHelper.LoadConfig>("price_check_filter_config");
+ if (lstPriceCheckFilterConfig == null)
+ lstPriceCheckFilterConfig = new List();
+
this.dgvShop.AddSelectorColumn("colSelect");
this.dgvPriceCheck.AddSelectorColumn("colCheck");
this.dgvPriceCheck.AddMergeColumnHeader(new List() { "colOk", "colCancel" }, "同意/拒绝报价");
+ this.dgvPriceCheck.AddImgColumn("colProductSkcPic", "colImgUrl");
this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7);
@@ -259,13 +265,13 @@ namespace TemuKJD.KJDForms.AdminForms
{
case "规格名称":
{
- var PriceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
- if (PriceInfo != null)
+ var priceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
+ if (priceInfo != null)
{
this.pnlSpecDetail.Visible = true;
string skuName = "";
- var prodSkuList = PriceInfo.skcList.FirstOrDefault().skuList;
+ var prodSkuList = priceInfo.skcList.FirstOrDefault().skuList;
if (prodSkuList != null)
{
foreach (var sku in prodSkuList)
@@ -509,7 +515,9 @@ namespace TemuKJD.KJDForms.AdminForms
private void btnSearchPrice_Click(object sender, EventArgs e)
{
this.pnlDetailOperate1.Visible = true;
- this.pnlDetailOperate2.Visible = false;
+ this.btnMutliOk.Visible = true;
+ this.btnMutliCancel.Visible = true;
+ this.pnlMutliCancelWithTitleWrong.Visible = false;
this.dgvPriceCheck.Columns["colOk"].Visible = true;
this.dgvPriceCheck.Columns["colCancel"].Visible = true;
this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = false;
@@ -518,9 +526,11 @@ namespace TemuKJD.KJDForms.AdminForms
private void btnSearchPrice2_Click(object sender, EventArgs e)
{
- this.pnlDetailOperate2.Location = this.pnlDetailOperate1.Location;
this.pnlDetailOperate1.Visible = false;
- this.pnlDetailOperate2.Visible = true;
+ this.btnMutliOk.Visible = false;
+ this.btnMutliCancel.Visible = false;
+ this.pnlMutliCancelWithTitleWrong.Visible = true;
+ this.pnlMutliCancelWithTitleWrong.Location = btnMutliOk.Location;
this.dgvPriceCheck.Columns["colOk"].Visible = false;
this.dgvPriceCheck.Columns["colCancel"].Visible = false;
this.dgvPriceCheck.Columns["colCancelWithTitleWrong"].Visible = true;
@@ -546,7 +556,7 @@ namespace TemuKJD.KJDForms.AdminForms
}
}
- this.chkFilter.Checked = false;
+ this.chkFilterTitle.Checked = false;
this.dgvPriceCheck.Rows.Clear();
this.lstCheckPriceInfo.Clear();
this.pbLoading.Visible = true;
@@ -605,7 +615,7 @@ namespace TemuKJD.KJDForms.AdminForms
if (jArr == null)
jArr = new JArray();
- List extCodeLst = new List();
+ List extCodeTmpLst = new List();
List checkPriceInfoTmpLst = new List();
foreach (var item in jArr)
{
@@ -613,12 +623,12 @@ namespace TemuKJD.KJDForms.AdminForms
TemuForChainProductInfo priceInfo = JsonHelper.DeserializeJsonToObject(jStr);
lstCheckPriceInfo.Add(priceInfo);
checkPriceInfoTmpLst.Add(priceInfo);
- extCodeLst.Add(priceInfo.skcList.FirstOrDefault()?.extCode);
+ extCodeTmpLst.Add(priceInfo.skcList.FirstOrDefault()?.extCode);
}
List extCodePriceList = new List();
try
{
- extCodePriceList = GetServerExtCodePriceLst(extCodeLst.Distinct().ToList());
+ extCodePriceList = GetServerExtCodePriceLst(extCodeTmpLst.Distinct().ToList());
}
catch (Exception ex)
{
@@ -686,7 +696,7 @@ namespace TemuKJD.KJDForms.AdminForms
//else
// suggestSupplyPrice += "¥";
- suggestSupplyPrice = (reviewInfo.suggestSupplyPrice / 100.0).ToString() + "¥";
+ suggestSupplyPrice = "¥" + (reviewInfo.suggestSupplyPrice.ParseToDecimal() / 100).ToString("0.00");
}
var reviewExtCode = priceInfo.skcList.FirstOrDefault()?.extCode;
var extCodePrice = extCodePriceList.FirstOrDefault(p => reviewExtCode == p.ext_code);
@@ -700,17 +710,15 @@ namespace TemuKJD.KJDForms.AdminForms
priceInfo.supplierId,
priceInfo.supplierName,
imgUrl,
- defaultBitmap,
+ DataGridViewExtension.defaultBitmap,
priceInfo.productId,
priceInfo.skcList.FirstOrDefault()?.skcId,
priceInfo.productName,
skuName,
reviewExtCode,
- extCodePrice == null ? "-" : (extCodePrice.original_price / 100.0).ParseToString(),
- // sku不同价的会被分成多个review，priceInfo此时为价格范围
- reviewInfo.productSkuList.FirstOrDefault()?.supplierPrice, //priceInfo.supplierPrice
- suggestSupplyPrice,//核价
- //reviewInfo.suggestSupplyPrice == null ? "-" : reviewInfo.suggestSupplyPrice.ParseToString(),
+ extCodePrice?.original_price / 100m, //extCodePrice == null ? "-" : (extCodePrice.original_price / 100m).ParseToString(),
+ reviewInfo.supplyPrice / 100m, //reviewInfo.productSkuList.FirstOrDefault()?.supplierPrice, //priceInfo.supplierPrice // sku不同价的会被分成多个review，priceInfo此时为价格范围
+ reviewInfo.suggestSupplyPrice / 100m, //suggestSupplyPrice.ParseToDecimal(),//核价 //reviewInfo.suggestSupplyPrice == null ? "-" : reviewInfo.suggestSupplyPrice.ParseToString(),
"", //新报价
reviewInfo.times, // 修改报价次数
BaseClass.StampToDateTime((priceInfo.skcList.FirstOrDefault()?.statusTime.createdTime.ParseToLong() / 1000).ParseToInt()).ToString("yy/MM/dd HH:mm:ss"),
@@ -720,21 +728,47 @@ namespace TemuKJD.KJDForms.AdminForms
""
); ;
dgvPriceCheck.Rows[rowId].Height = 60;
- if (chkFilter.Checked && !CheckContainsWords(priceInfo.productName))
- {
- dgvPriceCheck.Rows[rowId].Visible = false;
- }
- if (checkRestoreSizeAndNumber(priceInfo))
+ //if (dgvPriceCheck.Rows[rowId].Cells["colExtCodePrice"].Value.ParseToString().IsNullOrEmpty())
+ // dgvPriceCheck.Rows[rowId].Cells["colExtCodePrice"].Value = "-";
+ if (CheckRestoreTitleWords(priceInfo.productName))
{
dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = Color.Red;
}
else
{
dgvPriceCheck.Rows[rowId].Cells["colProdName"].Style.ForeColor = dgvPriceCheck.DefaultCellStyle.ForeColor;
+ if (chkFilterTitle.Checked)
+ dgvPriceCheck.Rows[rowId].Visible = false;
+ }
+ if (checkRestoreSizeAndNumber(priceInfo))
+ {
+ dgvPriceCheck.Rows[rowId].Cells["colSkuName"].Style.ForeColor = Color.Red;
+ }
+ else
+ {
+ dgvPriceCheck.Rows[rowId].Cells["colSkuName"].Style.ForeColor = dgvPriceCheck.DefaultCellStyle.ForeColor;
+ }
+
+ if (totalProdIndex % 2 == 1)
+ dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
+ else
+ dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
+
+ var extCodeLst = this.dgvPriceCheck.Rows.Cast()
+ .Select(r => r.Cells["colExtCode"].Value.ParseToString())
+ .Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
+ this.dgvExtCode.Rows.Clear();
+ foreach (var ext in extCodeLst)
+ {
+ var filterConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == ext);
+ var pos = this.dgvExtCode.Rows.Add(
+ false,
+ ext,
+ filterConfig == null ? "" : GetConfigDesStr(filterConfig.Symbol, filterConfig.Price1, filterConfig.Price2)
+ );
}
}));
}
- this.ShowDgvImg();
}
}
catch (Exception ex)
@@ -895,60 +929,6 @@ namespace TemuKJD.KJDForms.AdminForms
return HttpResponseBLL.PostResponse2(shop, url, body, referer);
}
- Bitmap defaultBitmap = new Bitmap(80, 80);
- void ShowDgvImg()
- {
- Task.Run(() =>
- {
- foreach (DataGridViewRow row in this.dgvPriceCheck.Rows)
- {
- if (row.Index > 0 && row.Cells["colProductSkcPic"].Displayed == false)
- {
- try
- {
- Invoke(new Action(() =>
- {
- row.Cells["colProductSkcPic"].Value = defaultBitmap;
- }));
- }
- catch
- {
- }
- continue;
- }
-
- if (row.Cells["colProductSkcPic"].Value != null && row.Cells["colProductSkcPic"].Value != defaultBitmap)
- continue;
-
- Image image = null;
- string imgUrl = row.Cells["colImgUrl"]?.Value.ParseToString();
- string getImgError = "";
- if (!string.IsNullOrWhiteSpace(imgUrl))
- image = GetHtml.GetUrlImg(imgUrl, out getImgError);
- if (!string.IsNullOrEmpty(getImgError))
- //BaseMsgForm.ShowError("图片加载失败 " + getImgError);
- image = TemuKJD.Properties.Resources.errpic;
-
- try
- {
- Invoke(new Action(() =>
- {
- if (dgvPriceCheck.Rows.Contains(row))
- row.Cells["colProductSkcPic"].Value = image;
- }));
- }
- catch
- {
- }
- }
- });
- }
-
- private void dgvPriceCheck_Scroll(object sender, ScrollEventArgs e)
- {
- this.ShowDgvImg();
- }
-
private void btnRestoreProdName_Click(object sender, EventArgs e)
{
var products = this.dgvPriceCheck.Rows.Cast().Where(r => r.Cells["colCheck"].Value.ParseToBool() == true)
@@ -982,7 +962,7 @@ namespace TemuKJD.KJDForms.AdminForms
}
var pName = price.productName;
- if (CheckContainsWords(pName))
+ if (CheckRestoreTitleWords(pName))
{
}
else
@@ -1261,31 +1241,9 @@ namespace TemuKJD.KJDForms.AdminForms
});
}
- private void chkFilter_CheckedChanged(object sender, EventArgs e)
+ private void chkFilterTitle_CheckedChanged(object sender, EventArgs e)
{
- if (chkFilter.Checked == false)
- {
- foreach (DataGridViewRow row in dgvPriceCheck.Rows)
- {
- row.Visible = true;
- }
- }
- else
- {
- foreach (DataGridViewRow row in dgvPriceCheck.Rows)
- {
- var pName = row.Cells["colProdName"].Value.ParseToString();
-
- if (CheckContainsWords(pName))
- {
- }
- else
- {
- row.Cells["colCheck"].Value = false;
- row.Visible = false;
- }
- }
- }
+ FilterRows();
}
bool MouseLeftButtonDown = false;
@@ -1377,7 +1335,7 @@ namespace TemuKJD.KJDForms.AdminForms
}
}
- bool CheckContainsWords(string filterProdName)
+ bool CheckRestoreTitleWords(string filterProdName)
{
return filterProdName != RestoreProductName(filterProdName);
}
@@ -1744,6 +1702,208 @@ namespace TemuKJD.KJDForms.AdminForms
{
this.txtExtCode.Text = this.txtSkcId.Text = "";
}
+
+ private void dgvExtCode_CellContentClick(object sender, DataGridViewCellEventArgs e)
+ {
+ if (e.ColumnIndex < 0 || e.RowIndex < 0)
+ return;
+
+ string headerText = dgvExtCode.Columns[e.ColumnIndex].HeaderText;
+ var row = dgvExtCode.Rows[e.RowIndex];
+ switch (headerText)
+ {
+ case "":
+ case "选":
+ case "货号":
+ row.Cells["colSelectExtCode"].Value = !row.Cells["colSelectExtCode"].Value.ParseToBool();
+ FilterRows();
+ break;
+ }
+ }
+
+ void FilterRows()
+ {
+ var filterExtCodeLst = dgvExtCode.Rows.Cast()
+ .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
+ .Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
+ foreach (DataGridViewRow row in dgvPriceCheck.Rows)
+ {
+ row.Visible = true;
+ row.Cells["colCheck"].Value = false;
+ //continue;
+
+ var prodId = row.Cells["colProductId"].Value.ParseToString();
+ var rowExtCode = row.Cells["colExtCode"].Value.ParseToString();
+ var rowAdjustPrice = row.Cells["colAdjustPrice"].Value.ParseToDecimal();
+ // 过滤价格
+ // 只有有选中数据时才过滤，全不选时不过滤
+ if (filterExtCodeLst != null && filterExtCodeLst.Count > 0)
+ {
+ var filterExtCode = filterExtCodeLst.FirstOrDefault(e => e == rowExtCode);
+ var filterExtCodeConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == rowExtCode);
+ if (string.IsNullOrWhiteSpace(filterExtCode))
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ }
+ else if (filterExtCodeConfig != null)
+ {
+ if (filterExtCodeConfig.Symbol == "≥" && rowAdjustPrice < filterExtCodeConfig.Price1)
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ }
+ if (filterExtCodeConfig.Symbol == "≤" && rowAdjustPrice > filterExtCodeConfig.Price1)
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ }
+ if (filterExtCodeConfig.Symbol.StartsWith("≤") && filterExtCodeConfig.Symbol.EndsWith("≥") &&
+ rowAdjustPrice > filterExtCodeConfig.Price1 && rowAdjustPrice < filterExtCodeConfig.Price2)
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ }
+ if (filterExtCodeConfig.Symbol.StartsWith("≥") && filterExtCodeConfig.Symbol.EndsWith("≤") &&
+ (rowAdjustPrice < filterExtCodeConfig.Price1 || rowAdjustPrice > filterExtCodeConfig.Price2))
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ }
+ }
+ }
+
+ // 过滤保留未还原的标题
+ if (chkFilterTitle.Checked)
+ {
+ var pName = row.Cells["colProdName"].Value.ParseToString();
+ if (!CheckRestoreTitleWords(pName))
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ }
+ else
+ {
+ }
+ }
+ if (ucCheckBox1.Checked)
+ {
+ var priceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
+ if (priceInfo != null)
+ {
+ if (!checkRestoreSizeAndNumber(priceInfo))
+ {
+ row.Cells["colCheck"].Value = false;
+ row.Visible = false;
+ }
+ else
+ {
+ }
+ }
+ }
+ }
+ }
+
+ private void btnSaveFilterParams_Click(object sender, EventArgs e)
+ {
+ var rows = this.dgvExtCode.Rows.Cast()
+ .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true).ToList();
+ var extCodeLst = rows.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
+
+ if (extCodeLst.Count == 0)
+ {
+ BaseMsgForm.ShowError("请查询商品后在左边列表选择货号！");
+ return;
+ }
+
+ decimal price1 = txtPrice1.Text.ParseToDecimal();
+ decimal price2 = txtPrice2.Text.ParseToDecimal();
+ if ((cmbSymbol.Text == "≤ ≥" || cmbSymbol.Text == "≥ ≤") && price2 < price1)
+ {
+ BaseMsgForm.ShowError("高价格不能小于低价格");
+ return;
+ }
+
+ foreach (var extCode in extCodeLst)
+ {
+ lstPriceCheckFilterConfig.RemoveAll(p => p.ExtCode == extCode);
+ var priceParam = new PriceCheckFilterConfig()
+ {
+ ExtCode = extCode,
+ Symbol = cmbSymbol.Text,
+ Price1 = txtPrice1.Text.Trim().ParseToDecimal(),
+ Price2 = txtPrice2.Text.Trim().ParseToDecimal(),
+ };
+ lstPriceCheckFilterConfig.Add(priceParam);
+ }
+ NaiBa.Util.Helper.ConfigHelper.SaveConfig("price_check_filter_config", lstPriceCheckFilterConfig);
+ BaseMsgForm.ShowInfo("选中货号的价格过滤配置已保存！");
+ foreach (var row in rows)
+ {
+ row.Cells["colFilterRule"].Value = GetConfigDesStr(cmbSymbol.Text.Trim(), txtPrice1.Text.Trim().ParseToDecimal(), txtPrice2.Text.Trim().ParseToDecimal());
+ }
+
+ FilterRows();
+ }
+
+ string GetConfigDesStr(string symbol, decimal price1, decimal price2)
+ {
+ if (symbol == "≤")
+ return "≤" + price1;
+ else if (symbol == "≥ ≤")
+ return "≥" + price1 + " 且 ≤" + price2;
+ else if (symbol == "≤ ≥")
+ return "≤" + price1 + " 或 ≥" + price2;
+ return "≥" + price1.ToString();
+ }
+
+ private void btnRestoreFilterParams_Click(object sender, EventArgs e)
+ {
+ var rows = this.dgvExtCode.Rows.Cast()
+ .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true).ToList();
+ var extCodeLst = rows.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
+
+ if (extCodeLst.Count == 0)
+ {
+ BaseMsgForm.ShowError("请查询商品后在左边列表选择货号！");
+ return;
+ }
+
+ if (BaseMsgForm.ShowConfirm("确定要清除选中货号的价格过滤配置吗？", "提示").DialogResult == DialogResult.OK)
+ {
+ foreach (var extCode in extCodeLst)
+ {
+ lstPriceCheckFilterConfig.RemoveAll(p => p.ExtCode == extCode);
+ }
+ NaiBa.Util.Helper.ConfigHelper.SaveConfig("price_check_filter_config", lstPriceCheckFilterConfig);
+ BaseMsgForm.ShowInfo("选中货号的价格过滤配置已清除！");
+ foreach (var row in rows)
+ {
+ row.Cells["colFilterRule"].Value = "";
+ }
+ }
+
+ FilterRows();
+ }
+
+ private void cmbSymbol_TextChanged(object sender, EventArgs e)
+ {
+ if (cmbSymbol.Text == "≤ ≥" || cmbSymbol.Text == "≥ ≤")
+ {
+ txtPrice2.Visible = true;
+ label16.Visible = true;
+ }
+ else
+ {
+ txtPrice2.Visible = false;
+ label16.Visible = false;
+ }
+ }
+
+ private void chkFilterSize_CheckedChanged(object sender, EventArgs e)
+ {
+ FilterRows();
+ }
}
public class PriceCheckConfig
@@ -1757,4 +1917,12 @@ namespace TemuKJD.KJDForms.AdminForms
public string PriceDown { get; set; } = "0.1";
public bool SearchAllShop { get; set; } = true;
}
+
+ public class PriceCheckFilterConfig
+ {
+ public string ExtCode { get; set; }
+ public string Symbol { get; set; }
+ public decimal Price1 { get; set; }
+ public decimal Price2 { get; set; }
+ }
}
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx
index a23f6f6..6e0fb6b 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx
+++ b/TEMUKJD/KJDForms/AdminForms/AdminProductPriceCheckForm.resx
@@ -117,6 +117,15 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ True
+
+
+ True
+
+
+ True
+
True
diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs
index d7a208f..c041459 100644
--- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.Designer.cs
@@ -30,19 +30,19 @@ namespace TemuKJD.KJDForms.ProductForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
- System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
- 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 dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = 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 dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnRestoreJitParams = new DevComponents.DotNetBar.PanelEx();
@@ -98,9 +98,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbShopLoading = new System.Windows.Forms.PictureBox();
this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.txtBatchExtCode = new System.Windows.Forms.TextBox();
- this.label1 = new System.Windows.Forms.Label();
- this.btnCancelJit = new DevComponents.DotNetBar.PanelEx();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -241,9 +238,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx1.Controls.Add(this.chkBatchStock);
this.ucGroupBoxEx1.Controls.Add(this.chkBatchJit);
this.ucGroupBoxEx1.Controls.Add(this.chkFilterJit);
- this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
+ this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
- this.ucGroupBoxEx1.Size = new System.Drawing.Size(1579, 140);
+ this.ucGroupBoxEx1.Size = new System.Drawing.Size(1580, 140);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "参数设置";
@@ -253,9 +250,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRestoreJitParams.CanvasColor = System.Drawing.SystemColors.Control;
this.btnRestoreJitParams.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestoreJitParams.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnRestoreJitParams.Location = new System.Drawing.Point(1400, 103);
+ this.btnRestoreJitParams.Location = new System.Drawing.Point(1341, 92);
this.btnRestoreJitParams.Name = "btnRestoreJitParams";
- this.btnRestoreJitParams.Size = new System.Drawing.Size(60, 23);
+ this.btnRestoreJitParams.Size = new System.Drawing.Size(57, 35);
this.btnRestoreJitParams.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestoreJitParams.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnRestoreJitParams.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -269,7 +266,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRestoreJitParams.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestoreJitParams.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnRestoreJitParams.TabIndex = 1303;
- this.btnRestoreJitParams.Text = "重置选中";
+ this.btnRestoreJitParams.Text = "清除选中\r\n货号配置";
this.btnRestoreJitParams.Click += new System.EventHandler(this.btnRestoreJitParams_Click);
//
// btnSaveExtCodeJitConfig
@@ -277,9 +274,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSaveExtCodeJitConfig.CanvasColor = System.Drawing.SystemColors.Control;
this.btnSaveExtCodeJitConfig.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSaveExtCodeJitConfig.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnSaveExtCodeJitConfig.Location = new System.Drawing.Point(1283, 103);
+ this.btnSaveExtCodeJitConfig.Location = new System.Drawing.Point(1282, 92);
this.btnSaveExtCodeJitConfig.Name = "btnSaveExtCodeJitConfig";
- this.btnSaveExtCodeJitConfig.Size = new System.Drawing.Size(115, 23);
+ this.btnSaveExtCodeJitConfig.Size = new System.Drawing.Size(57, 35);
this.btnSaveExtCodeJitConfig.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSaveExtCodeJitConfig.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnSaveExtCodeJitConfig.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -293,7 +290,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSaveExtCodeJitConfig.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSaveExtCodeJitConfig.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnSaveExtCodeJitConfig.TabIndex = 1299;
- this.btnSaveExtCodeJitConfig.Text = "存配置到选中货号";
+ this.btnSaveExtCodeJitConfig.Text = "保存选中\r\n货号配置\r\n";
this.btnSaveExtCodeJitConfig.Click += new System.EventHandler(this.btnSaveExtCodeJitConfig_Click);
//
// line3
@@ -311,7 +308,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.line2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.line2.Location = new System.Drawing.Point(1414, 21);
this.line2.Name = "line2";
- this.line2.Size = new System.Drawing.Size(11, 59);
+ this.line2.Size = new System.Drawing.Size(11, 104);
this.line2.TabIndex = 1264;
this.line2.Text = "line2";
this.line2.VerticalLine = true;
@@ -330,7 +327,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.chkFilterNotJit.AutoSize = true;
this.chkFilterNotJit.ForeColor = System.Drawing.Color.Green;
- this.chkFilterNotJit.Location = new System.Drawing.Point(1282, 70);
+ this.chkFilterNotJit.Location = new System.Drawing.Point(1282, 66);
this.chkFilterNotJit.Name = "chkFilterNotJit";
this.chkFilterNotJit.Size = new System.Drawing.Size(127, 21);
this.chkFilterNotJit.TabIndex = 1232;
@@ -366,22 +363,22 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvExtCode.AllowUserToAddRows = false;
this.dgvExtCode.AllowUserToDeleteRows = false;
- dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
- this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
+ dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
+ this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25;
this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.dgvExtCode.AutoRowNumber = false;
this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvExtCode.BackgroundColor = System.Drawing.Color.White;
this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
+ dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26;
this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelectExtCode,
this.colFilterExtCode,
@@ -434,7 +431,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control;
this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnCancel.Location = new System.Drawing.Point(1470, 103);
+ this.btnCancel.Location = new System.Drawing.Point(1471, 104);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(92, 23);
this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -483,7 +480,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnAddRealPic.CanvasColor = System.Drawing.SystemColors.Control;
this.btnAddRealPic.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnAddRealPic.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnAddRealPic.Location = new System.Drawing.Point(1022, 103);
+ this.btnAddRealPic.Location = new System.Drawing.Point(1024, 104);
this.btnAddRealPic.Name = "btnAddRealPic";
this.btnAddRealPic.Size = new System.Drawing.Size(37, 23);
this.btnAddRealPic.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -550,7 +547,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtBatchStock
//
- this.txtBatchStock.Location = new System.Drawing.Point(1188, 103);
+ this.txtBatchStock.Location = new System.Drawing.Point(1188, 104);
this.txtBatchStock.Name = "txtBatchStock";
this.txtBatchStock.Size = new System.Drawing.Size(80, 23);
this.txtBatchStock.TabIndex = 1054;
@@ -567,7 +564,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtBatchIdentifyCode
//
- this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 103);
+ this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 104);
this.txtBatchIdentifyCode.Name = "txtBatchIdentifyCode";
this.txtBatchIdentifyCode.Size = new System.Drawing.Size(87, 23);
this.txtBatchIdentifyCode.TabIndex = 1048;
@@ -835,7 +832,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchIdentifyCode.AutoSize = true;
this.chkBatchIdentifyCode.Checked = true;
this.chkBatchIdentifyCode.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkBatchIdentifyCode.Location = new System.Drawing.Point(903, 81);
+ this.chkBatchIdentifyCode.Location = new System.Drawing.Point(903, 82);
this.chkBatchIdentifyCode.Name = "chkBatchIdentifyCode";
this.chkBatchIdentifyCode.Size = new System.Drawing.Size(99, 21);
this.chkBatchIdentifyCode.TabIndex = 1111;
@@ -871,7 +868,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchStock.AutoSize = true;
this.chkBatchStock.Checked = true;
this.chkBatchStock.CheckState = System.Windows.Forms.CheckState.Checked;
- this.chkBatchStock.Location = new System.Drawing.Point(1188, 81);
+ this.chkBatchStock.Location = new System.Drawing.Point(1188, 82);
this.chkBatchStock.Name = "chkBatchStock";
this.chkBatchStock.Size = new System.Drawing.Size(87, 21);
this.chkBatchStock.TabIndex = 1114;
@@ -894,7 +891,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.chkFilterJit.AutoSize = true;
this.chkFilterJit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.chkFilterJit.Location = new System.Drawing.Point(1282, 47);
+ this.chkFilterJit.Location = new System.Drawing.Point(1282, 45);
this.chkFilterJit.Name = "chkFilterJit";
this.chkFilterJit.Size = new System.Drawing.Size(127, 21);
this.chkFilterJit.TabIndex = 1231;
@@ -932,9 +929,6 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
this.splitContainer2.Panel1.Controls.Add(this.chkSearchAllShop);
- this.splitContainer2.Panel1.Controls.Add(this.txtBatchExtCode);
- this.splitContainer2.Panel1.Controls.Add(this.label1);
- this.splitContainer2.Panel1.Controls.Add(this.btnCancelJit);
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
//
@@ -971,67 +965,23 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkSearchAllShop.UseVisualStyleBackColor = true;
this.chkSearchAllShop.Visible = false;
//
- // txtBatchExtCode
- //
- this.txtBatchExtCode.Location = new System.Drawing.Point(22, 88);
- this.txtBatchExtCode.Multiline = true;
- this.txtBatchExtCode.Name = "txtBatchExtCode";
- this.txtBatchExtCode.Size = new System.Drawing.Size(156, 104);
- this.txtBatchExtCode.TabIndex = 1043;
- this.txtBatchExtCode.Visible = false;
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(19, 68);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(68, 17);
- this.label1.TabIndex = 1044;
- this.label1.Text = "查询货号：";
- this.label1.Visible = false;
- //
- // btnCancelJit
- //
- this.btnCancelJit.CanvasColor = System.Drawing.SystemColors.Control;
- this.btnCancelJit.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.btnCancelJit.DisabledBackColor = System.Drawing.Color.Empty;
- this.btnCancelJit.Location = new System.Drawing.Point(22, 198);
- this.btnCancelJit.Name = "btnCancelJit";
- this.btnCancelJit.Size = new System.Drawing.Size(106, 21);
- this.btnCancelJit.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.btnCancelJit.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.btnCancelJit.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.btnCancelJit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.btnCancelJit.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnCancelJit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.btnCancelJit.Style.GradientAngle = 90;
- this.btnCancelJit.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
- this.btnCancelJit.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.btnCancelJit.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnCancelJit.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnCancelJit.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.btnCancelJit.TabIndex = 1144;
- this.btnCancelJit.Text = "停止操作";
- this.btnCancelJit.Visible = false;
- this.btnCancelJit.Click += new System.EventHandler(this.btnCancelJit_Click);
- //
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
- dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
- this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
+ dataGridViewCellStyle14.BackColor = System.Drawing.Color.WhiteSmoke;
+ this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
+ dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+ dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
+ dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
+ dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+ dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+ dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+ this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1191,19 +1141,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvOpenJit.AllowUserToAddRows = false;
this.dgvOpenJit.AllowUserToDeleteRows = false;
- dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
- this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
+ dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
+ this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16;
this.dgvOpenJit.AutoRowNumber = true;
this.dgvOpenJit.BackgroundColor = System.Drawing.Color.White;
this.dgvOpenJit.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
- dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
- dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
- dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
- dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
- dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
- this.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
+ 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.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
this.dgvOpenJit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvOpenJit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1270,8 +1220,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colSupplierName
//
- dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle7;
+ dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle18;
this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName";
this.colSupplierName.ReadOnly = true;
@@ -1311,8 +1261,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colProdName
//
- dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colProdName.DefaultCellStyle = dataGridViewCellStyle8;
+ dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colProdName.DefaultCellStyle = dataGridViewCellStyle19;
this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true;
@@ -1320,8 +1270,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colSkuName
//
- dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colSkuName.DefaultCellStyle = dataGridViewCellStyle9;
+ dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colSkuName.DefaultCellStyle = dataGridViewCellStyle20;
this.colSkuName.HeaderText = "规格名称";
this.colSkuName.Name = "colSkuName";
this.colSkuName.ReadOnly = true;
@@ -1329,8 +1279,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colExtCode
//
- dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colExtCode.DefaultCellStyle = dataGridViewCellStyle10;
+ dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colExtCode.DefaultCellStyle = dataGridViewCellStyle21;
this.colExtCode.HeaderText = "货号";
this.colExtCode.Name = "colExtCode";
this.colExtCode.ReadOnly = true;
@@ -1353,8 +1303,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colCreatTime
//
- dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle11;
+ dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle22;
this.colCreatTime.HeaderText = "创建时间";
this.colCreatTime.Name = "colCreatTime";
this.colCreatTime.ReadOnly = true;
@@ -1370,8 +1320,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colCompliance
//
- dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colCompliance.DefaultCellStyle = dataGridViewCellStyle12;
+ dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colCompliance.DefaultCellStyle = dataGridViewCellStyle23;
this.colCompliance.HeaderText = "合规信息";
this.colCompliance.Name = "colCompliance";
this.colCompliance.ReadOnly = true;
@@ -1404,8 +1354,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colRecevieArea
//
- dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
- this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle13;
+ dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+ this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle24;
this.colRecevieArea.HeaderText = "期望到货";
this.colRecevieArea.Name = "colRecevieArea";
this.colRecevieArea.ReadOnly = true;
@@ -1577,10 +1527,8 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.TextBox textBox1;
private DevComponents.DotNetBar.PanelEx btnClose;
private DevComponents.DotNetBar.PanelEx btnSearch1;
- private System.Windows.Forms.TextBox txtBatchExtCode;
private System.Windows.Forms.TextBox txtBatchPriceMax;
private System.Windows.Forms.TextBox txtBatchPriceMin;
- private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtBatchIdentifyCode;
private System.Windows.Forms.PictureBox pbBatchRealPicture;
private DevComponents.DotNetBar.PanelEx btnBatchJit;
@@ -1597,7 +1545,6 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.Label label6;
private UserComponent.DataGridViewEx dgvExtCode;
private DevComponents.DotNetBar.PanelEx btnSetReceiveArea;
- private DevComponents.DotNetBar.PanelEx btnCancelJit;
private UserComponent.UcCheckBox chkFilterJit;
private DevComponents.DotNetBar.PanelEx btnCancel;
private UserComponent.UcCheckBox chkFilterNotJit;
diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs
index 7a11381..d0342a5 100644
--- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs
+++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.cs
@@ -454,7 +454,6 @@ namespace TemuKJD.KJDForms.ProductForms
column.Visible = true;
}
- lstFilterExtCode.Clear();
dgvExtCode.Rows.Clear();
this.dgvOpenJit.Rows.Clear();
this.lstChainProdInfo.Clear();
@@ -655,10 +654,8 @@ namespace TemuKJD.KJDForms.ProductForms
}
}
- int num = 0;
foreach (var chainProdInfo in chainProductTmpLst)
{
- num++;
if (cancellationTokenSource.IsCancellationRequested)
break;
@@ -764,7 +761,7 @@ namespace TemuKJD.KJDForms.ProductForms
""
);
dgvOpenJit.Rows[rowId].Height = 60;
- if (num % 2 == 1)
+ if (totalProdIndex % 2 == 1)
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
else
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
@@ -792,13 +789,6 @@ namespace TemuKJD.KJDForms.ProductForms
var extCodeLst = this.dgvOpenJit.Rows.Cast()
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
- foreach (var ext in extCodeLst)
- {
- if (!this.txtBatchExtCode.Text.Split(new string[] { }, StringSplitOptions.RemoveEmptyEntries).Contains(ext))
- {
- this.txtBatchExtCode.Text += ext + "\r\n";
- }
- }
this.dgvExtCode.Rows.Clear();
foreach (var ext in extCodeLst)
@@ -1896,12 +1886,8 @@ Content-Disposition: form-data; name=""upload_sign""
cancellationTokenSource.Cancel();
}
- List lstFilterExtCode = new List();
private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e)
{
- lstFilterExtCode = dgvExtCode.Rows.Cast()
- .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
- .Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
FilterRows();
}
@@ -1918,9 +1904,6 @@ Content-Disposition: form-data; name=""upload_sign""
case "选":
case "货号":
row.Cells["colSelectExtCode"].Value = !row.Cells["colSelectExtCode"].Value.ParseToBool();
- lstFilterExtCode = dgvExtCode.Rows.Cast()
- .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
- .Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
FilterRows();
break;
case "JIT配置":
@@ -1930,7 +1913,7 @@ Content-Disposition: form-data; name=""upload_sign""
var jitParam = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == extCode);
if (jitParam == null)
{
- BaseMsgForm.ShowError("配置已删除");
+ BaseMsgForm.ShowError("配置不存在");
}
else
{
@@ -1969,13 +1952,16 @@ Content-Disposition: form-data; name=""upload_sign""
void FilterRows()
{
+ var filterExtCodeLst = dgvExtCode.Rows.Cast()
+ .Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
+ .Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
foreach (DataGridViewRow row in dgvOpenJit.Rows)
{
row.Visible = true;
row.Cells["colCheck"].Value = false;
- if (lstFilterExtCode != null && lstFilterExtCode.Count > 0)
+ if (filterExtCodeLst != null && filterExtCodeLst.Count > 0)
{
- if (lstFilterExtCode.Contains(row.Cells["colExtCode"].Value.ParseToString()))
+ if (filterExtCodeLst.Contains(row.Cells["colExtCode"].Value.ParseToString()))
{
row.Cells["colCheck"].Value = true;
row.Visible = true;
@@ -2040,7 +2026,6 @@ Content-Disposition: form-data; name=""upload_sign""
column.Visible = false;
}
- lstFilterExtCode.Clear();
dgvExtCode.Rows.Clear();
this.dgvOpenJit.Rows.Clear();
this.pbLoading.Visible = true;
@@ -2236,22 +2221,15 @@ Content-Disposition: form-data; name=""upload_sign""
BaseMsgForm.ShowInfo(sRst);
this.statusBar.lblTaskStatus.Text = sRst;
- var extCodeLst = this.dgvOpenJit.Rows.Cast()
- .Select(r => r.Cells["colExtCode"].Value.ParseToString())
- .Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
- foreach (var ext in extCodeLst)
- {
- if (!this.txtBatchExtCode.Text.Split(new string[] { }, StringSplitOptions.RemoveEmptyEntries).Contains(ext))
- {
- this.txtBatchExtCode.Text += ext + "\r\n";
- }
- }
+ //var extCodeLst = this.dgvOpenJit.Rows.Cast()
+ // .Select(r => r.Cells["colExtCode"].Value.ParseToString())
+ // .Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
- this.dgvExtCode.Rows.Clear();
- foreach (var ext in extCodeLst)
- {
- this.dgvExtCode.Rows.Add(false, ext);
- }
+ //this.dgvExtCode.Rows.Clear();
+ //foreach (var ext in extCodeLst)
+ //{
+ // this.dgvExtCode.Rows.Add(false, ext);
+ //}
}));
}, cancellationTokenSource.Token);
}
@@ -2325,15 +2303,18 @@ Content-Disposition: form-data; name=""upload_sign""
return;
}
- foreach (var extCode in extCodeLst)
+ if (BaseMsgForm.ShowConfirm("确定要清除选中货号的JIT配置吗？", "提示").DialogResult == DialogResult.OK)
{
- lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
- }
- NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
- BaseMsgForm.ShowInfo("选中货号的JIT配置已重置！");
- foreach (var row in rows)
- {
- row.Cells["colJitConfig"].Value = "未设置";
+ foreach (var extCode in extCodeLst)
+ {
+ lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
+ }
+ NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
+ BaseMsgForm.ShowInfo("选中货号的JIT配置已清除！");
+ foreach (var row in rows)
+ {
+ row.Cells["colJitConfig"].Value = "未设置";
+ }
}
}
}
diff --git a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx
index f81761e..95dc9d3 100644
--- a/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx
+++ b/TEMUKJD/KJDForms/ProductForms/TemuJitForm.resx
@@ -117,15 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- True
-
-
- True
-
-
- True
-
True
@@ -213,4 +204,13 @@
True
+
+ True
+
+
+ True
+
+
+ True
+
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
index 8edfba2..d33a411 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
@@ -1126,7 +1126,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
string originProductName = dbProd.product_name;
string joinText = "，";
//如果有裂变词并且勾选了英文标题，则删除中文标题全部使用英文裂变词组成新的标题并写入英文标题
- if (chkEnglishProdName.Checked && dbProd.fission_words.Length > 10 && CountChineseCharacters(dbProd.fission_words) < 10)
+ if (chkEnglishProdName.Checked && dbProd.fission_words.Length > 10 && CountChineseCharacters(dbProd.fission_words) <= 0)
{
originProductName = "";
joinText = ", ";
@@ -2075,7 +2075,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//{
//}
- //英文标题
+ //翻译英文标题
if (chkEnglishProdName.Checked)
{
#region 调用百度翻译翻译英文标题 暂时作废
@@ -2120,20 +2120,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//}
#endregion
- if (CountChineseCharacters(prodParam.productName) > 2)
- {
- Invoke(new Action(() =>
- {
- this.pnlError.Visible = true;
- this.lblError.Text = "标题内含有中文，跳过英文标题设置";
- }));
- Task.Run(() =>
- {
- Thread.Sleep(5000);
- this.pnlError.Visible = false;
- });
- }
- else
+ if (1 == 1)
{
prodParam.productI18nReqs = new List();
productI18nParam productI18nEn = new productI18nParam
@@ -2141,7 +2128,25 @@ namespace TemuKJD.KJDForms.ProductSelectForms
language = "en",
productName = prodParam.productName,
};
- prodParam.productI18nReqs.Add(productI18nEn);
+ if (CountChineseCharacters(productI18nEn.productName) > 0)
+ {
+ productI18nEn.productName = productI18nEn.productName.Replace(headWords, "").Replace(endWords, "");
+ }
+ if (CountChineseCharacters(productI18nEn.productName) > 0)
+ {
+ Invoke(new Action(() =>
+ {
+ this.pnlError.Visible = true;
+ this.lblError.Text = "标题内含有中文，跳过英文标题设置";
+ }));
+ Task.Run(() =>
+ {
+ Thread.Sleep(5000);
+ this.pnlError.Visible = false;
+ });
+ }
+ else
+ prodParam.productI18nReqs.Add(productI18nEn);
}
}
diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
index 4ef5ee2..b16dbe6 100644
--- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
@@ -872,53 +872,56 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
break;
}
+ var change_cat_id = selectProd.change_cat_id.Split('>').LastOrDefault();
+ if (!string.IsNullOrEmpty(change_cat_id) && change_cat_id != catId.ParseToString())
+ catId = change_cat_id.ParseToLong();
var html = AddDraft(shop, catId.ToString());
- if (html.Contains("不合法的类目") && catLevel > 1)
- {
- catId = catIdDic[catLevel - 1];
+ //if (html.Contains("不合法的类目") && catLevel > 1)
+ //{
+ // catId = catIdDic[catLevel - 1];
- //string catSearchStr = prodInfo.productName;
- //int index = catSearchStr.IndexOf("PCS ");
- //if (index > 0 && index < 5)
- // catSearchStr = catSearchStr.Substring(index + 4).Trim();
+ // //string catSearchStr = prodInfo.productName;
+ // //int index = catSearchStr.IndexOf("PCS ");
+ // //if (index > 0 && index < 5)
+ // // catSearchStr = catSearchStr.Substring(index + 4).Trim();
- var changeCatName = selectProd.change_cat_name;
- var changeCatId = selectProd.change_cat_id;
- if (!string.IsNullOrWhiteSpace(changeCatName) && !string.IsNullOrWhiteSpace(changeCatId))
- {
- var changeCatNameList = selectProd.change_cat_name.Split('>').ToList();
- var changeCatIdList = selectProd.change_cat_id.Split('>').ToList();
- while (changeCatNameList.Count < 10)
- changeCatNameList.Add("");
- while (changeCatIdList.Count < 10)
- changeCatIdList.Add("0");
- try
- {
- prodParam.cat1Id = catIdDic[1] = changeCatIdList[0].ParseToLong();
- prodParam.cat2Id = catIdDic[2] = changeCatIdList[1].ParseToLong();
- prodParam.cat3Id = catIdDic[3] = changeCatIdList[2].ParseToLong();
- prodParam.cat4Id = catIdDic[4] = changeCatIdList[3].ParseToLong();
- prodParam.cat5Id = catIdDic[5] = changeCatIdList[4].ParseToLong();
- prodParam.cat6Id = catIdDic[6] = changeCatIdList[5].ParseToLong();
- prodParam.cat7Id = catIdDic[7] = changeCatIdList[6].ParseToLong();
- prodParam.cat8Id = catIdDic[8] = changeCatIdList[7].ParseToLong();
- prodParam.cat9Id = catIdDic[9] = changeCatIdList[8].ParseToLong();
- prodParam.cat10Id = catIdDic[10] = changeCatIdList[9].ParseToLong();
- for (int i = 10; i >= 1; i--)
- {
- catLevel = i;
- catId = catIdDic[catLevel];
- if (catId > 0)
- break;
- }
- }
- catch (Exception ex)
- {
- catId = catIdDic[catLevel - 1];
- }
- }
- html = AddDraft(shop, catId.ToString());
- }
+ // var changeCatName = selectProd.change_cat_name;
+ // var changeCatId = selectProd.change_cat_id;
+ // if (!string.IsNullOrWhiteSpace(changeCatName) && !string.IsNullOrWhiteSpace(changeCatId))
+ // {
+ // var changeCatNameList = selectProd.change_cat_name.Split('>').ToList();
+ // var changeCatIdList = selectProd.change_cat_id.Split('>').ToList();
+ // while (changeCatNameList.Count < 10)
+ // changeCatNameList.Add("");
+ // while (changeCatIdList.Count < 10)
+ // changeCatIdList.Add("0");
+ // try
+ // {
+ // prodParam.cat1Id = catIdDic[1] = changeCatIdList[0].ParseToLong();
+ // prodParam.cat2Id = catIdDic[2] = changeCatIdList[1].ParseToLong();
+ // prodParam.cat3Id = catIdDic[3] = changeCatIdList[2].ParseToLong();
+ // prodParam.cat4Id = catIdDic[4] = changeCatIdList[3].ParseToLong();
+ // prodParam.cat5Id = catIdDic[5] = changeCatIdList[4].ParseToLong();
+ // prodParam.cat6Id = catIdDic[6] = changeCatIdList[5].ParseToLong();
+ // prodParam.cat7Id = catIdDic[7] = changeCatIdList[6].ParseToLong();
+ // prodParam.cat8Id = catIdDic[8] = changeCatIdList[7].ParseToLong();
+ // prodParam.cat9Id = catIdDic[9] = changeCatIdList[8].ParseToLong();
+ // prodParam.cat10Id = catIdDic[10] = changeCatIdList[9].ParseToLong();
+ // for (int i = 10; i >= 1; i--)
+ // {
+ // catLevel = i;
+ // catId = catIdDic[catLevel];
+ // if (catId > 0)
+ // break;
+ // }
+ // }
+ // catch (Exception ex)
+ // {
+ // catId = catIdDic[catLevel - 1];
+ // }
+ // }
+ // html = AddDraft(shop, catId.ToString());
+ //}
if (html.Contains("\"success\":true"))
prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId");
@@ -936,31 +939,31 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
if (dbProd.cat_id != catId.ParseToString())
{
- //var catRst = GetCatPathList(shop, prodParam.productDraftId.ParseToString(), catId.ParseToString());
- //if (catRst.Contains("\"success\":true"))
- //{
- // var regex = BaseRegex.GetMatchRegex(ref catRst, "\\\"catId\\\":\\d{1,10}");
- // if (regex.Count > 0)
- // {
- // var cats = regex.Cast().Select(m => m.Value.ParseToString().Replace("\"catId\":", "").ParseToLong()).ToList();
- // if (!cats.Any(c => c <= 0))
- // {
- // while (cats.Count < 10)
- // cats.Add(0);
+ var catRst = GetCatPathList(shop, prodParam.productDraftId.ParseToString(), catId.ParseToString());
+ if (catRst.Contains("\"success\":true"))
+ {
+ var regex = BaseRegex.GetMatchRegex(ref catRst, "\\\"catId\\\":\\d{1,10}");
+ if (regex.Count > 0)
+ {
+ var cats = regex.Cast().Select(m => m.Value.ParseToString().Replace("\"catId\":", "").ParseToLong()).ToList();
+ if (!cats.Any(c => c <= 0))
+ {
+ while (cats.Count < 10)
+ cats.Add(0);
- // prodParam.cat1Id = cats[0];
- // prodParam.cat2Id = cats[1];
- // prodParam.cat3Id = cats[2];
- // prodParam.cat4Id = cats[3];
- // prodParam.cat5Id = cats[4];
- // prodParam.cat6Id = cats[5];
- // prodParam.cat7Id = cats[6];
- // prodParam.cat8Id = cats[7];
- // prodParam.cat9Id = cats[8];
- // prodParam.cat10Id = cats[9];
- // }
- // }
- //}
+ prodParam.cat1Id = cats[0];
+ prodParam.cat2Id = cats[1];
+ prodParam.cat3Id = cats[2];
+ prodParam.cat4Id = cats[3];
+ prodParam.cat5Id = cats[4];
+ prodParam.cat6Id = cats[5];
+ prodParam.cat7Id = cats[6];
+ prodParam.cat8Id = cats[7];
+ prodParam.cat9Id = cats[8];
+ prodParam.cat10Id = cats[9];
+ }
+ }
+ }
}
prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
@@ -1625,6 +1628,14 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
return HttpResponseBLL.PostResponse2(shop, url, body, refere);
}
+ private string GetCatPathList(ShopLoginInfo shop, string draftId, string catId)
+ {
+ string url = "https://agentseller.temu.com/anniston-agent-seller/category/path/list";
+ string refere = "https://agentseller.temu.com/goods/edit?productDraftId=" + draftId + "&from=productDraftList";
+ string body = @"{""catIds"":[" + catId + @"],""showCatEnName"":true}";
+ return HttpResponseBLL.PostResponse2(shop, url, body, refere);
+ }
+
private string CreateSizeSpec(ShopLoginInfo shop, string draftId, TemuSizeSpecParam sizeParam)
{
//string url = "https://seller.kuajingmaihuo.com/bg-anniston-mms/sizespec/createSizeSpec";