diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs
index 2fd8c6f..7ccf6a9 100644
--- a/AllBase/BaseClass.cs
+++ b/AllBase/BaseClass.cs
@@ -27,8 +27,8 @@ namespace AllBase
///
/// 版本ID
///
- public static int VersionCount = 508;
- //public static int VersionCount = 508;
+ public static int VersionCount = 512;
+ //public static int VersionCount = 512;
///
/// 版本号
diff --git a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.Designer.cs b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.Designer.cs
index d6c402b..10bea26 100644
--- a/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.Designer.cs
+++ b/TEMUKJD/KJDForms/AdminForms/AdminShopLoginForm.Designer.cs
@@ -30,6 +30,7 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AdminShopLoginForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+ this.btnReturnPackage = new TemuKJD.UserControls.ButtonEx();
this.btnLoginAgain = new TemuKJD.UserControls.ButtonEx();
this.pnlMultiLogin = new System.Windows.Forms.Panel();
this.cmbMultiCookieName = new DevComponents.DotNetBar.Controls.ComboBoxEx();
@@ -46,7 +47,6 @@
this.chkCloseAfterLogin = new DevComponents.DotNetBar.Controls.CheckBoxX();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.txtAddress = new System.Windows.Forms.TextBox();
- this.btnReturnPackage = new TemuKJD.UserControls.ButtonEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel2.SuspendLayout();
this.splitContainer1.SuspendLayout();
@@ -83,10 +83,28 @@
this.splitContainer1.Panel2.Controls.Add(this.btnReload);
this.splitContainer1.Panel2.Controls.Add(this.chkCloseAfterLogin);
this.splitContainer1.Size = new System.Drawing.Size(1438, 736);
- this.splitContainer1.SplitterDistance = 675;
+ this.splitContainer1.SplitterDistance = 676;
this.splitContainer1.SplitterWidth = 3;
this.splitContainer1.TabIndex = 4;
//
+ // btnReturnPackage
+ //
+ this.btnReturnPackage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnReturnPackage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnReturnPackage.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnReturnPackage.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnReturnPackage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnReturnPackage.ForeColor = System.Drawing.Color.White;
+ this.btnReturnPackage.Location = new System.Drawing.Point(674, 17);
+ this.btnReturnPackage.Margin = new System.Windows.Forms.Padding(2);
+ this.btnReturnPackage.Name = "btnReturnPackage";
+ this.btnReturnPackage.Size = new System.Drawing.Size(136, 25);
+ this.btnReturnPackage.TabIndex = 463;
+ this.btnReturnPackage.Text = "提交退货到库存管理";
+ this.btnReturnPackage.UseVisualStyleBackColor = false;
+ this.btnReturnPackage.Visible = false;
+ this.btnReturnPackage.Click += new System.EventHandler(this.btnReturnPackage_Click);
+ //
// btnLoginAgain
//
this.btnLoginAgain.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -330,23 +348,6 @@
this.txtAddress.TabIndex = 7;
this.txtAddress.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtAddress_KeyDown);
//
- // btnReturnPackage
- //
- this.btnReturnPackage.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
- this.btnReturnPackage.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnReturnPackage.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnReturnPackage.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnReturnPackage.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnReturnPackage.ForeColor = System.Drawing.Color.White;
- this.btnReturnPackage.Location = new System.Drawing.Point(674, 17);
- this.btnReturnPackage.Margin = new System.Windows.Forms.Padding(2);
- this.btnReturnPackage.Name = "btnReturnPackage";
- this.btnReturnPackage.Size = new System.Drawing.Size(136, 25);
- this.btnReturnPackage.TabIndex = 463;
- this.btnReturnPackage.Text = "提交退货到库存管理";
- this.btnReturnPackage.UseVisualStyleBackColor = false;
- this.btnReturnPackage.Click += new System.EventHandler(this.btnReturnPackage_Click);
- //
// AdminShopLoginForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
index 74e46e6..27e74d5 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.Designer.cs
@@ -63,18 +63,18 @@
this.txtSkuHeadText = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.txtSkuEndText = new System.Windows.Forms.TextBox();
+ this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkReFissionAllProdName = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkRandomSkuOrder = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown();
this.label11 = new System.Windows.Forms.Label();
- this.btnSearch = new TemuKJD.UserControls.ButtonEx();
this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.btnSearch = new TemuKJD.UserControls.ButtonEx();
+ this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx();
this.btnAdd = new TemuKJD.UserControls.ButtonEx();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
@@ -206,10 +206,10 @@
this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0);
this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0);
this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1);
- this.tableLayoutPanel1.Controls.Add(this.btnSearch, 19, 0);
this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 16, 0);
- this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 18, 0);
this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 17, 0);
+ this.tableLayoutPanel1.Controls.Add(this.btnSearch, 18, 0);
+ this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 19, 0);
this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 2;
@@ -462,6 +462,18 @@
this.txtSkuEndText.TabIndex = 454;
this.txtSkuEndText.TextChanged += new System.EventHandler(this.txtSkuEndText_TextChanged);
//
+ // chkFission
+ //
+ this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkFission.AutoSize = true;
+ this.chkFission.Location = new System.Drawing.Point(299, 4);
+ this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.chkFission.Name = "chkFission";
+ this.chkFission.Size = new System.Drawing.Size(75, 21);
+ this.chkFission.TabIndex = 475;
+ this.chkFission.Text = "标题重组";
+ this.chkFission.UseVisualStyleBackColor = true;
+ //
// chkHeadWords
//
this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -486,18 +498,6 @@
this.chkEndWords.Text = "标题后缀";
this.chkEndWords.UseVisualStyleBackColor = true;
//
- // chkFission
- //
- this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.chkFission.AutoSize = true;
- this.chkFission.Location = new System.Drawing.Point(299, 4);
- this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.chkFission.Name = "chkFission";
- this.chkFission.Size = new System.Drawing.Size(75, 21);
- this.chkFission.TabIndex = 475;
- this.chkFission.Text = "标题重组";
- this.chkFission.UseVisualStyleBackColor = true;
- //
// chkReFissionAllProdName
//
this.chkReFissionAllProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -568,24 +568,6 @@
this.label11.TabIndex = 471;
this.label11.Text = "元";
//
- // btnSearch
- //
- this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearch.ForeColor = System.Drawing.Color.White;
- this.btnSearch.Location = new System.Drawing.Point(975, 18);
- this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2);
- this.btnSearch.Name = "btnSearch";
- this.tableLayoutPanel1.SetRowSpan(this.btnSearch, 2);
- this.btnSearch.Size = new System.Drawing.Size(56, 24);
- this.btnSearch.TabIndex = 424;
- this.btnSearch.Text = "搜索";
- this.btnSearch.UseVisualStyleBackColor = false;
- this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
- //
// chkNoSubSa
//
this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
@@ -598,13 +580,44 @@
this.chkNoSubSa.Text = "未分配超管";
this.chkNoSubSa.UseVisualStyleBackColor = true;
//
+ // chkShowDel
+ //
+ this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkShowDel.AutoSize = true;
+ this.chkShowDel.Location = new System.Drawing.Point(834, 5);
+ this.chkShowDel.Margin = new System.Windows.Forms.Padding(0);
+ this.chkShowDel.Name = "chkShowDel";
+ this.chkShowDel.Size = new System.Drawing.Size(75, 21);
+ this.chkShowDel.TabIndex = 468;
+ this.chkShowDel.Text = "显示删除";
+ this.chkShowDel.UseVisualStyleBackColor = true;
+ this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
+ //
+ // btnSearch
+ //
+ this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSearch.ForeColor = System.Drawing.Color.White;
+ this.btnSearch.Location = new System.Drawing.Point(915, 18);
+ this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2);
+ this.btnSearch.Name = "btnSearch";
+ this.tableLayoutPanel1.SetRowSpan(this.btnSearch, 2);
+ this.btnSearch.Size = new System.Drawing.Size(56, 24);
+ this.btnSearch.TabIndex = 424;
+ this.btnSearch.Text = "搜索";
+ this.btnSearch.UseVisualStyleBackColor = false;
+ this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+ //
// pnlEmpty
//
this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
- this.pnlEmpty.Location = new System.Drawing.Point(911, 19);
+ this.pnlEmpty.Location = new System.Drawing.Point(975, 19);
this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2);
this.pnlEmpty.Name = "pnlEmpty";
this.tableLayoutPanel1.SetRowSpan(this.pnlEmpty, 2);
@@ -625,19 +638,6 @@
this.pnlEmpty.Text = "清空条件";
this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
//
- // chkShowDel
- //
- this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.chkShowDel.AutoSize = true;
- this.chkShowDel.Location = new System.Drawing.Point(834, 5);
- this.chkShowDel.Margin = new System.Windows.Forms.Padding(0);
- this.chkShowDel.Name = "chkShowDel";
- this.chkShowDel.Size = new System.Drawing.Size(75, 21);
- this.chkShowDel.TabIndex = 468;
- this.chkShowDel.Text = "显示删除";
- this.chkShowDel.UseVisualStyleBackColor = true;
- this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
- //
// btnSetSubSa
//
this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
diff --git a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
index fb6f505..4d0870e 100644
--- a/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductSelectForms/DbProductSelectListManageForm.cs
@@ -46,8 +46,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
btnSetSubSa.Visible = false;
chkNoSubSa.Visible = false;
btnReFission.Visible = false;
+
chkUploadProd.Visible = false; // 直接上传
flowLayoutPanel1.Visible = false; // 一些测试操作项目显示在此处
+ flowLayoutPanel1.Visible = true;
+ chkUploadProd.Visible = true;
if (BaseClass.SaLevel == 1)
{
@@ -56,8 +59,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
btnSetSubSa.Visible = true;
chkNoSubSa.Visible = true;
btnReFission.Visible = true;
- chkUploadProd.Visible = true;
- flowLayoutPanel1.Visible = true;
//chkReFissionAllProdName.Checked = true;
//chkRandomSkuOrder.Checked = true;
@@ -837,6 +838,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
int[] heads = dbProd.head_words.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
.Select(s => s.ParseToInt()).ToArray();
+ if (heads.Length < 2)
+ {
+ if (string.IsNullOrEmpty(GlobalConfig.ProductWords.HeadWords))
+ GlobalConfig.ProductWords.HeadWords = "";
+ heads = GlobalConfig.ProductWords.HeadWords.Split(new string[] { "-", "个" }, StringSplitOptions.RemoveEmptyEntries)
+ .Select(s => s.ParseToInt()).ToArray();
+ }
+
if (heads.Length > 1 && heads[1] > heads[0])
headWords = Randomx.GetId(heads[0], heads[1]) + "个";
}
@@ -845,6 +854,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
if (this.chkEndWords.Checked)
{
endWords = string.IsNullOrEmpty(dbProd.end_words) ? "" : dbProd.end_words;
+
+ if (string.IsNullOrWhiteSpace(endWords))
+ endWords = string.IsNullOrEmpty(GlobalConfig.ProductWords.EndWords) ? "" : GlobalConfig.ProductWords.EndWords;
}
// 标题部分打乱
diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs
index f425e2b..1e6c740 100644
--- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs
+++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.Designer.cs
@@ -40,18 +40,27 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ProductThirdSelectListManageForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.pbFissionSetting = new System.Windows.Forms.PictureBox();
- this.btnReFission = new TemuKJD.UserControls.ButtonEx();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+ this.chkUploadProd = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
+ this.label9 = new System.Windows.Forms.Label();
+ this.txtSkuHeadText = new System.Windows.Forms.TextBox();
+ this.label10 = new System.Windows.Forms.Label();
+ this.txtSkuEndText = new System.Windows.Forms.TextBox();
+ this.chkFission = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkHeadWords = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkEndWords = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkDeleteLowPriceSku = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkRandomSkuOrder = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.chkSkuRandomPrice = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.numSkuRandomPrice = new System.Windows.Forms.NumericUpDown();
+ this.label11 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
- this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.txtShopId = new System.Windows.Forms.TextBox();
- this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
- this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
this.label7 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.label5 = new System.Windows.Forms.Label();
- this.btnSearch = new TemuKJD.UserControls.ButtonEx();
this.txtSKC = new System.Windows.Forms.TextBox();
this.txtSPU = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
@@ -62,6 +71,11 @@
this.label4 = new System.Windows.Forms.Label();
this.txtProdName = new System.Windows.Forms.TextBox();
this.cmbStatus = new System.Windows.Forms.ComboBox();
+ this.chkNoSubSa = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.btnSearch = new TemuKJD.UserControls.ButtonEx();
+ this.chkShowDel = new TemuKJD.UserComponent.UcCheckBox(this.components);
+ this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
+ this.btnReFission = new TemuKJD.UserControls.ButtonEx();
this.btnSetSubSa = new TemuKJD.UserControls.ButtonEx();
this.btnAdd = new TemuKJD.UserControls.ButtonEx();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
@@ -100,6 +114,8 @@
this.splitContainer1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).BeginInit();
this.tableLayoutPanel1.SuspendLayout();
+ this.flowLayoutPanel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).BeginInit();
this.splitContainer2.Panel1.SuspendLayout();
this.splitContainer2.Panel2.SuspendLayout();
@@ -120,8 +136,8 @@
// splitContainer1.Panel1
//
this.splitContainer1.Panel1.Controls.Add(this.pbFissionSetting);
- this.splitContainer1.Panel1.Controls.Add(this.btnReFission);
this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel1);
+ this.splitContainer1.Panel1.Controls.Add(this.btnReFission);
this.splitContainer1.Panel1.Controls.Add(this.btnSetSubSa);
this.splitContainer1.Panel1.Controls.Add(this.btnAdd);
//
@@ -136,7 +152,7 @@
//
this.pbFissionSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.pbFissionSetting.Image = global::TemuKJD.Properties.Resources.齿轮;
- this.pbFissionSetting.Location = new System.Drawing.Point(1129, 20);
+ this.pbFissionSetting.Location = new System.Drawing.Point(1136, 20);
this.pbFissionSetting.Name = "pbFissionSetting";
this.pbFissionSetting.Size = new System.Drawing.Size(24, 24);
this.pbFissionSetting.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
@@ -145,6 +161,475 @@
this.pbFissionSetting.Visible = false;
this.pbFissionSetting.Click += new System.EventHandler(this.pbFissionSetting_Click);
//
+ // tableLayoutPanel1
+ //
+ this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
+ | System.Windows.Forms.AnchorStyles.Right)));
+ this.tableLayoutPanel1.ColumnCount = 21;
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+ this.tableLayoutPanel1.Controls.Add(this.chkUploadProd, 20, 0);
+ this.tableLayoutPanel1.Controls.Add(this.flowLayoutPanel1, 0, 1);
+ this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0);
+ this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0);
+ this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0);
+ this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0);
+ this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 16, 0);
+ this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 17, 0);
+ this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 19, 0);
+ this.tableLayoutPanel1.Controls.Add(this.btnSearch, 18, 0);
+ this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 3);
+ this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+ this.tableLayoutPanel1.RowCount = 2;
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+ this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle());
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(1138, 60);
+ this.tableLayoutPanel1.TabIndex = 469;
+ //
+ // chkUploadProd
+ //
+ this.chkUploadProd.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.chkUploadProd.Location = new System.Drawing.Point(1042, 19);
+ this.chkUploadProd.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.chkUploadProd.Name = "chkUploadProd";
+ this.tableLayoutPanel1.SetRowSpan(this.chkUploadProd, 2);
+ this.chkUploadProd.Size = new System.Drawing.Size(96, 21);
+ this.chkUploadProd.TabIndex = 471;
+ this.chkUploadProd.Text = "上传到未发布";
+ this.chkUploadProd.UseVisualStyleBackColor = true;
+ //
+ // flowLayoutPanel1
+ //
+ this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.tableLayoutPanel1.SetColumnSpan(this.flowLayoutPanel1, 18);
+ this.flowLayoutPanel1.Controls.Add(this.label9);
+ this.flowLayoutPanel1.Controls.Add(this.txtSkuHeadText);
+ this.flowLayoutPanel1.Controls.Add(this.label10);
+ this.flowLayoutPanel1.Controls.Add(this.txtSkuEndText);
+ this.flowLayoutPanel1.Controls.Add(this.chkFission);
+ this.flowLayoutPanel1.Controls.Add(this.chkHeadWords);
+ this.flowLayoutPanel1.Controls.Add(this.chkEndWords);
+ this.flowLayoutPanel1.Controls.Add(this.chkDeleteLowPriceSku);
+ this.flowLayoutPanel1.Controls.Add(this.chkRandomSkuOrder);
+ this.flowLayoutPanel1.Controls.Add(this.chkSkuRandomPrice);
+ this.flowLayoutPanel1.Controls.Add(this.numSkuRandomPrice);
+ this.flowLayoutPanel1.Controls.Add(this.label11);
+ this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 32);
+ this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
+ this.flowLayoutPanel1.Name = "flowLayoutPanel1";
+ this.flowLayoutPanel1.Size = new System.Drawing.Size(914, 28);
+ this.flowLayoutPanel1.TabIndex = 472;
+ //
+ // label9
+ //
+ this.label9.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.label9.AutoSize = true;
+ this.label9.Location = new System.Drawing.Point(3, 6);
+ this.label9.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label9.Name = "label9";
+ this.label9.Size = new System.Drawing.Size(52, 17);
+ this.label9.TabIndex = 450;
+ this.label9.Text = "sku前缀";
+ //
+ // txtSkuHeadText
+ //
+ this.txtSkuHeadText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtSkuHeadText.Location = new System.Drawing.Point(55, 3);
+ this.txtSkuHeadText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSkuHeadText.Name = "txtSkuHeadText";
+ this.txtSkuHeadText.Size = new System.Drawing.Size(91, 23);
+ this.txtSkuHeadText.TabIndex = 452;
+ //
+ // label10
+ //
+ this.label10.Anchor = System.Windows.Forms.AnchorStyles.None;
+ this.label10.AutoSize = true;
+ this.label10.Location = new System.Drawing.Point(149, 6);
+ this.label10.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label10.Name = "label10";
+ this.label10.Size = new System.Drawing.Size(52, 17);
+ this.label10.TabIndex = 453;
+ this.label10.Text = "sku后缀";
+ //
+ // txtSkuEndText
+ //
+ this.txtSkuEndText.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtSkuEndText.Location = new System.Drawing.Point(201, 3);
+ this.txtSkuEndText.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSkuEndText.Name = "txtSkuEndText";
+ this.txtSkuEndText.Size = new System.Drawing.Size(92, 23);
+ this.txtSkuEndText.TabIndex = 454;
+ //
+ // chkFission
+ //
+ this.chkFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkFission.AutoSize = true;
+ this.chkFission.Location = new System.Drawing.Point(299, 4);
+ this.chkFission.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.chkFission.Name = "chkFission";
+ this.chkFission.Size = new System.Drawing.Size(75, 21);
+ this.chkFission.TabIndex = 475;
+ this.chkFission.Text = "标题重组";
+ this.chkFission.UseVisualStyleBackColor = true;
+ //
+ // chkHeadWords
+ //
+ this.chkHeadWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkHeadWords.AutoSize = true;
+ this.chkHeadWords.Location = new System.Drawing.Point(376, 4);
+ this.chkHeadWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+ this.chkHeadWords.Name = "chkHeadWords";
+ this.chkHeadWords.Size = new System.Drawing.Size(75, 21);
+ this.chkHeadWords.TabIndex = 473;
+ this.chkHeadWords.Text = "标题前缀";
+ this.chkHeadWords.UseVisualStyleBackColor = true;
+ //
+ // chkEndWords
+ //
+ this.chkEndWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkEndWords.AutoSize = true;
+ this.chkEndWords.Location = new System.Drawing.Point(453, 4);
+ this.chkEndWords.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+ this.chkEndWords.Name = "chkEndWords";
+ this.chkEndWords.Size = new System.Drawing.Size(75, 21);
+ this.chkEndWords.TabIndex = 474;
+ this.chkEndWords.Text = "标题后缀";
+ this.chkEndWords.UseVisualStyleBackColor = true;
+ //
+ // chkDeleteFirstSku
+ //
+ this.chkDeleteLowPriceSku.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkDeleteLowPriceSku.AutoSize = true;
+ this.chkDeleteLowPriceSku.Enabled = false;
+ this.chkDeleteLowPriceSku.Location = new System.Drawing.Point(530, 4);
+ this.chkDeleteLowPriceSku.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+ this.chkDeleteLowPriceSku.Name = "chkDeleteFirstSku";
+ this.chkDeleteLowPriceSku.Size = new System.Drawing.Size(95, 21);
+ this.chkDeleteLowPriceSku.TabIndex = 472;
+ this.chkDeleteLowPriceSku.Text = "删除低价sku";
+ this.chkDeleteLowPriceSku.UseVisualStyleBackColor = true;
+ //
+ // chkRandomSkuOrder
+ //
+ this.chkRandomSkuOrder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkRandomSkuOrder.AutoSize = true;
+ this.chkRandomSkuOrder.Location = new System.Drawing.Point(627, 4);
+ this.chkRandomSkuOrder.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+ this.chkRandomSkuOrder.Name = "chkRandomSkuOrder";
+ this.chkRandomSkuOrder.Size = new System.Drawing.Size(95, 21);
+ this.chkRandomSkuOrder.TabIndex = 469;
+ this.chkRandomSkuOrder.Text = "sku打乱顺序";
+ this.chkRandomSkuOrder.UseVisualStyleBackColor = true;
+ //
+ // chkSkuRandomPrice
+ //
+ this.chkSkuRandomPrice.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkSkuRandomPrice.AutoSize = true;
+ this.chkSkuRandomPrice.Location = new System.Drawing.Point(724, 4);
+ this.chkSkuRandomPrice.Margin = new System.Windows.Forms.Padding(2, 0, 0, 0);
+ this.chkSkuRandomPrice.Name = "chkSkuRandomPrice";
+ this.chkSkuRandomPrice.Size = new System.Drawing.Size(119, 21);
+ this.chkSkuRandomPrice.TabIndex = 468;
+ this.chkSkuRandomPrice.Text = "sku随机价格变化";
+ this.chkSkuRandomPrice.UseVisualStyleBackColor = true;
+ //
+ // numSkuRandomPrice
+ //
+ this.numSkuRandomPrice.DecimalPlaces = 2;
+ this.numSkuRandomPrice.Increment = new decimal(new int[] {
+ 1,
+ 0,
+ 0,
+ 131072});
+ this.numSkuRandomPrice.Location = new System.Drawing.Point(843, 3);
+ this.numSkuRandomPrice.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+ this.numSkuRandomPrice.Name = "numSkuRandomPrice";
+ this.numSkuRandomPrice.Size = new System.Drawing.Size(44, 23);
+ this.numSkuRandomPrice.TabIndex = 470;
+ this.numSkuRandomPrice.Value = new decimal(new int[] {
+ 20,
+ 0,
+ 0,
+ 65536});
+ //
+ // label11
+ //
+ this.label11.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.label11.AutoSize = true;
+ this.label11.Location = new System.Drawing.Point(893, 6);
+ this.label11.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label11.Name = "label11";
+ this.label11.Size = new System.Drawing.Size(20, 17);
+ this.label11.TabIndex = 471;
+ this.label11.Text = "元";
+ //
+ // label6
+ //
+ this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label6.AutoSize = true;
+ this.label6.Location = new System.Drawing.Point(3, 7);
+ this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
+ this.label6.Name = "label6";
+ this.label6.Size = new System.Drawing.Size(44, 17);
+ this.label6.TabIndex = 449;
+ this.label6.Text = "店铺Id";
+ //
+ // txtShopId
+ //
+ this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtShopId.Location = new System.Drawing.Point(47, 4);
+ this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtShopId.Name = "txtShopId";
+ this.txtShopId.Size = new System.Drawing.Size(48, 23);
+ this.txtShopId.TabIndex = 448;
+ //
+ // label7
+ //
+ this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label7.AutoSize = true;
+ this.label7.Location = new System.Drawing.Point(101, 7);
+ this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label7.Name = "label7";
+ this.label7.Size = new System.Drawing.Size(56, 17);
+ this.label7.TabIndex = 452;
+ this.label7.Text = "店铺名称";
+ //
+ // label8
+ //
+ this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label8.AutoSize = true;
+ this.label8.Location = new System.Drawing.Point(639, 7);
+ this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label8.Name = "label8";
+ this.label8.Size = new System.Drawing.Size(56, 17);
+ this.label8.TabIndex = 458;
+ this.label8.Text = "认领状态";
+ //
+ // txtShopName
+ //
+ this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtShopName.Location = new System.Drawing.Point(157, 4);
+ this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtShopName.Name = "txtShopName";
+ this.txtShopName.Size = new System.Drawing.Size(48, 23);
+ this.txtShopName.TabIndex = 451;
+ //
+ // label5
+ //
+ this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label5.AutoSize = true;
+ this.label5.Location = new System.Drawing.Point(211, 7);
+ this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label5.Name = "label5";
+ this.label5.Size = new System.Drawing.Size(31, 17);
+ this.label5.TabIndex = 435;
+ this.label5.Text = "SPU";
+ //
+ // txtSKC
+ //
+ this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtSKC.Location = new System.Drawing.Point(327, 4);
+ this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSKC.Name = "txtSKC";
+ this.txtSKC.Size = new System.Drawing.Size(48, 23);
+ this.txtSKC.TabIndex = 432;
+ //
+ // txtSPU
+ //
+ this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtSPU.Location = new System.Drawing.Point(242, 4);
+ this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtSPU.Name = "txtSPU";
+ this.txtSPU.Size = new System.Drawing.Size(48, 23);
+ this.txtSPU.TabIndex = 434;
+ //
+ // label1
+ //
+ this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(296, 7);
+ this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(31, 17);
+ this.label1.TabIndex = 433;
+ this.label1.Text = "SKC";
+ //
+ // label2
+ //
+ this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(381, 7);
+ this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(32, 17);
+ this.label2.TabIndex = 426;
+ this.label2.Text = "类目";
+ //
+ // txtCat
+ //
+ this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtCat.Location = new System.Drawing.Point(413, 4);
+ this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtCat.Name = "txtCat";
+ this.txtCat.Size = new System.Drawing.Size(48, 23);
+ this.txtCat.TabIndex = 425;
+ //
+ // txtExtCode
+ //
+ this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtExtCode.Location = new System.Drawing.Point(585, 4);
+ this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtExtCode.Name = "txtExtCode";
+ this.txtExtCode.Size = new System.Drawing.Size(48, 23);
+ this.txtExtCode.TabIndex = 429;
+ //
+ // label3
+ //
+ this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label3.AutoSize = true;
+ this.label3.Location = new System.Drawing.Point(467, 7);
+ this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label3.Name = "label3";
+ this.label3.Size = new System.Drawing.Size(32, 17);
+ this.label3.TabIndex = 428;
+ this.label3.Text = "标题";
+ //
+ // label4
+ //
+ this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.label4.AutoSize = true;
+ this.label4.Location = new System.Drawing.Point(553, 7);
+ this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
+ this.label4.Name = "label4";
+ this.label4.Size = new System.Drawing.Size(32, 17);
+ this.label4.TabIndex = 430;
+ this.label4.Text = "货号";
+ //
+ // txtProdName
+ //
+ this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.txtProdName.Location = new System.Drawing.Point(499, 4);
+ this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
+ this.txtProdName.Name = "txtProdName";
+ this.txtProdName.Size = new System.Drawing.Size(48, 23);
+ this.txtProdName.TabIndex = 427;
+ //
+ // cmbStatus
+ //
+ this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.cmbStatus.FormattingEnabled = true;
+ this.cmbStatus.Items.AddRange(new object[] {
+ "待上传",
+ "已上传",
+ "全部"});
+ this.cmbStatus.Location = new System.Drawing.Point(695, 6);
+ this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+ this.cmbStatus.Name = "cmbStatus";
+ this.cmbStatus.Size = new System.Drawing.Size(48, 25);
+ this.cmbStatus.TabIndex = 459;
+ this.cmbStatus.Text = "待上传";
+ //
+ // chkNoSubSa
+ //
+ this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkNoSubSa.AutoSize = true;
+ this.chkNoSubSa.Location = new System.Drawing.Point(749, 5);
+ this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(6, 3, 0, 3);
+ this.chkNoSubSa.Name = "chkNoSubSa";
+ this.chkNoSubSa.Size = new System.Drawing.Size(87, 21);
+ this.chkNoSubSa.TabIndex = 470;
+ this.chkNoSubSa.Text = "未分配超管";
+ this.chkNoSubSa.UseVisualStyleBackColor = true;
+ //
+ // btnSearch
+ //
+ this.btnSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
+ this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+ this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+ this.btnSearch.ForeColor = System.Drawing.Color.White;
+ this.btnSearch.Location = new System.Drawing.Point(918, 18);
+ this.btnSearch.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
+ this.btnSearch.Name = "btnSearch";
+ this.tableLayoutPanel1.SetRowSpan(this.btnSearch, 2);
+ this.btnSearch.Size = new System.Drawing.Size(56, 24);
+ this.btnSearch.TabIndex = 424;
+ this.btnSearch.Text = "搜索";
+ this.btnSearch.UseVisualStyleBackColor = false;
+ this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+ //
+ // chkShowDel
+ //
+ this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
+ this.chkShowDel.AutoSize = true;
+ this.chkShowDel.Location = new System.Drawing.Point(836, 5);
+ this.chkShowDel.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+ this.chkShowDel.Name = "chkShowDel";
+ this.chkShowDel.Size = new System.Drawing.Size(75, 21);
+ this.chkShowDel.TabIndex = 471;
+ this.chkShowDel.Text = "显示删除";
+ this.chkShowDel.UseVisualStyleBackColor = true;
+ this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
+ //
+ // pnlEmpty
+ //
+ this.pnlEmpty.Anchor = System.Windows.Forms.AnchorStyles.Left;
+ this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
+ this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
+ this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
+ this.pnlEmpty.Location = new System.Drawing.Point(978, 19);
+ this.pnlEmpty.Margin = new System.Windows.Forms.Padding(2);
+ this.pnlEmpty.Name = "pnlEmpty";
+ this.tableLayoutPanel1.SetRowSpan(this.pnlEmpty, 2);
+ this.pnlEmpty.Size = new System.Drawing.Size(56, 22);
+ this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
+ this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
+ this.pnlEmpty.Style.GradientAngle = 90;
+ this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
+ this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
+ this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
+ this.pnlEmpty.TabIndex = 431;
+ this.pnlEmpty.Text = "清空条件";
+ this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
+ //
// btnReFission
//
this.btnReFission.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -163,290 +648,6 @@
this.btnReFission.Visible = false;
this.btnReFission.Click += new System.EventHandler(this.btnReFission_Click);
//
- // tableLayoutPanel1
- //
- this.tableLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
- | System.Windows.Forms.AnchorStyles.Right)));
- this.tableLayoutPanel1.ColumnCount = 20;
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 12.5F));
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
- this.tableLayoutPanel1.Controls.Add(this.label6, 0, 0);
- this.tableLayoutPanel1.Controls.Add(this.chkShowDel, 19, 0);
- this.tableLayoutPanel1.Controls.Add(this.txtShopId, 1, 0);
- this.tableLayoutPanel1.Controls.Add(this.chkNoSubSa, 18, 0);
- this.tableLayoutPanel1.Controls.Add(this.pnlEmpty, 17, 0);
- this.tableLayoutPanel1.Controls.Add(this.label7, 2, 0);
- this.tableLayoutPanel1.Controls.Add(this.label8, 14, 0);
- this.tableLayoutPanel1.Controls.Add(this.txtShopName, 3, 0);
- this.tableLayoutPanel1.Controls.Add(this.label5, 4, 0);
- this.tableLayoutPanel1.Controls.Add(this.btnSearch, 16, 0);
- this.tableLayoutPanel1.Controls.Add(this.txtSKC, 7, 0);
- this.tableLayoutPanel1.Controls.Add(this.txtSPU, 5, 0);
- this.tableLayoutPanel1.Controls.Add(this.label1, 6, 0);
- this.tableLayoutPanel1.Controls.Add(this.label2, 8, 0);
- this.tableLayoutPanel1.Controls.Add(this.txtCat, 9, 0);
- this.tableLayoutPanel1.Controls.Add(this.txtExtCode, 13, 0);
- this.tableLayoutPanel1.Controls.Add(this.label3, 10, 0);
- this.tableLayoutPanel1.Controls.Add(this.label4, 12, 0);
- this.tableLayoutPanel1.Controls.Add(this.txtProdName, 11, 0);
- this.tableLayoutPanel1.Controls.Add(this.cmbStatus, 15, 0);
- this.tableLayoutPanel1.Location = new System.Drawing.Point(3, 17);
- this.tableLayoutPanel1.Name = "tableLayoutPanel1";
- this.tableLayoutPanel1.RowCount = 1;
- this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(1120, 32);
- this.tableLayoutPanel1.TabIndex = 469;
- //
- // label6
- //
- this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label6.AutoSize = true;
- this.label6.Location = new System.Drawing.Point(3, 7);
- this.label6.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
- this.label6.Name = "label6";
- this.label6.Size = new System.Drawing.Size(44, 17);
- this.label6.TabIndex = 449;
- this.label6.Text = "店铺Id";
- //
- // chkShowDel
- //
- this.chkShowDel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.chkShowDel.AutoSize = true;
- this.chkShowDel.Location = new System.Drawing.Point(1042, 5);
- this.chkShowDel.Name = "chkShowDel";
- this.chkShowDel.Size = new System.Drawing.Size(75, 21);
- this.chkShowDel.TabIndex = 471;
- this.chkShowDel.Text = "显示删除";
- this.chkShowDel.UseVisualStyleBackColor = true;
- this.chkShowDel.CheckedChanged += new System.EventHandler(this.chkShowDel_CheckedChanged);
- //
- // txtShopId
- //
- this.txtShopId.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtShopId.Location = new System.Drawing.Point(47, 4);
- this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtShopId.Name = "txtShopId";
- this.txtShopId.Size = new System.Drawing.Size(57, 23);
- this.txtShopId.TabIndex = 448;
- //
- // chkNoSubSa
- //
- this.chkNoSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.chkNoSubSa.AutoSize = true;
- this.chkNoSubSa.Location = new System.Drawing.Point(949, 5);
- this.chkNoSubSa.Margin = new System.Windows.Forms.Padding(8, 3, 3, 3);
- this.chkNoSubSa.Name = "chkNoSubSa";
- this.chkNoSubSa.Size = new System.Drawing.Size(87, 21);
- this.chkNoSubSa.TabIndex = 470;
- this.chkNoSubSa.Text = "未分配超管";
- this.chkNoSubSa.UseVisualStyleBackColor = true;
- //
- // pnlEmpty
- //
- this.pnlEmpty.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.pnlEmpty.CanvasColor = System.Drawing.SystemColors.Control;
- this.pnlEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
- this.pnlEmpty.DisabledBackColor = System.Drawing.Color.Empty;
- this.pnlEmpty.Location = new System.Drawing.Point(882, 5);
- this.pnlEmpty.Name = "pnlEmpty";
- this.pnlEmpty.Size = new System.Drawing.Size(56, 22);
- this.pnlEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
- this.pnlEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
- this.pnlEmpty.Style.GradientAngle = 90;
- this.pnlEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
- this.pnlEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.pnlEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
- this.pnlEmpty.TabIndex = 431;
- this.pnlEmpty.Text = "清空条件";
- this.pnlEmpty.Click += new System.EventHandler(this.pnlEmpty_Click);
- //
- // label7
- //
- this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label7.AutoSize = true;
- this.label7.Location = new System.Drawing.Point(110, 7);
- this.label7.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label7.Name = "label7";
- this.label7.Size = new System.Drawing.Size(56, 17);
- this.label7.TabIndex = 452;
- this.label7.Text = "店铺名称";
- //
- // label8
- //
- this.label8.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label8.AutoSize = true;
- this.label8.Location = new System.Drawing.Point(702, 7);
- this.label8.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label8.Name = "label8";
- this.label8.Size = new System.Drawing.Size(56, 17);
- this.label8.TabIndex = 458;
- this.label8.Text = "认领状态";
- //
- // txtShopName
- //
- this.txtShopName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtShopName.Location = new System.Drawing.Point(166, 4);
- this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtShopName.Name = "txtShopName";
- this.txtShopName.Size = new System.Drawing.Size(57, 23);
- this.txtShopName.TabIndex = 451;
- //
- // label5
- //
- this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label5.AutoSize = true;
- this.label5.Location = new System.Drawing.Point(229, 7);
- this.label5.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label5.Name = "label5";
- this.label5.Size = new System.Drawing.Size(31, 17);
- this.label5.TabIndex = 435;
- this.label5.Text = "SPU";
- //
- // btnSearch
- //
- this.btnSearch.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.btnSearch.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
- this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
- this.btnSearch.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
- this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
- this.btnSearch.ForeColor = System.Drawing.Color.White;
- this.btnSearch.Location = new System.Drawing.Point(821, 4);
- this.btnSearch.Margin = new System.Windows.Forms.Padding(6, 2, 2, 2);
- this.btnSearch.Name = "btnSearch";
- this.btnSearch.Size = new System.Drawing.Size(56, 24);
- this.btnSearch.TabIndex = 424;
- this.btnSearch.Text = "搜索";
- this.btnSearch.UseVisualStyleBackColor = false;
- this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
- //
- // txtSKC
- //
- this.txtSKC.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtSKC.Location = new System.Drawing.Point(354, 4);
- this.txtSKC.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtSKC.Name = "txtSKC";
- this.txtSKC.Size = new System.Drawing.Size(57, 23);
- this.txtSKC.TabIndex = 432;
- //
- // txtSPU
- //
- this.txtSPU.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtSPU.Location = new System.Drawing.Point(260, 4);
- this.txtSPU.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtSPU.Name = "txtSPU";
- this.txtSPU.Size = new System.Drawing.Size(57, 23);
- this.txtSPU.TabIndex = 434;
- //
- // label1
- //
- this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(323, 7);
- this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(31, 17);
- this.label1.TabIndex = 433;
- this.label1.Text = "SKC";
- //
- // label2
- //
- this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(417, 7);
- this.label2.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(32, 17);
- this.label2.TabIndex = 426;
- this.label2.Text = "类目";
- //
- // txtCat
- //
- this.txtCat.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtCat.Location = new System.Drawing.Point(449, 4);
- this.txtCat.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtCat.Name = "txtCat";
- this.txtCat.Size = new System.Drawing.Size(57, 23);
- this.txtCat.TabIndex = 425;
- //
- // txtExtCode
- //
- this.txtExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtExtCode.Location = new System.Drawing.Point(639, 4);
- this.txtExtCode.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtExtCode.Name = "txtExtCode";
- this.txtExtCode.Size = new System.Drawing.Size(57, 23);
- this.txtExtCode.TabIndex = 429;
- //
- // label3
- //
- this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label3.AutoSize = true;
- this.label3.Location = new System.Drawing.Point(512, 7);
- this.label3.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label3.Name = "label3";
- this.label3.Size = new System.Drawing.Size(32, 17);
- this.label3.TabIndex = 428;
- this.label3.Text = "标题";
- //
- // label4
- //
- this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
- this.label4.AutoSize = true;
- this.label4.Location = new System.Drawing.Point(607, 7);
- this.label4.Margin = new System.Windows.Forms.Padding(6, 0, 0, 0);
- this.label4.Name = "label4";
- this.label4.Size = new System.Drawing.Size(32, 17);
- this.label4.TabIndex = 430;
- this.label4.Text = "货号";
- //
- // txtProdName
- //
- this.txtProdName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.txtProdName.Location = new System.Drawing.Point(544, 4);
- this.txtProdName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
- this.txtProdName.Name = "txtProdName";
- this.txtProdName.Size = new System.Drawing.Size(57, 23);
- this.txtProdName.TabIndex = 427;
- //
- // cmbStatus
- //
- this.cmbStatus.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
- this.cmbStatus.FormattingEnabled = true;
- this.cmbStatus.Items.AddRange(new object[] {
- "待上传",
- "已上传",
- "全部"});
- this.cmbStatus.Location = new System.Drawing.Point(758, 6);
- this.cmbStatus.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
- this.cmbStatus.Name = "cmbStatus";
- this.cmbStatus.Size = new System.Drawing.Size(57, 25);
- this.cmbStatus.TabIndex = 459;
- this.cmbStatus.Text = "待上传";
- //
// btnSetSubSa
//
this.btnSetSubSa.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -815,6 +1016,9 @@
((System.ComponentModel.ISupportInitialize)(this.pbFissionSetting)).EndInit();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
+ this.flowLayoutPanel1.ResumeLayout(false);
+ this.flowLayoutPanel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.numSkuRandomPrice)).EndInit();
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
@@ -883,5 +1087,19 @@
private System.Windows.Forms.DataGridViewLinkColumn colEditNotes;
private System.Windows.Forms.DataGridViewLinkColumn ColDelete;
private System.Windows.Forms.DataGridViewTextBoxColumn colOpResult;
+ private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+ private System.Windows.Forms.Label label9;
+ private System.Windows.Forms.TextBox txtSkuHeadText;
+ private System.Windows.Forms.Label label10;
+ private System.Windows.Forms.TextBox txtSkuEndText;
+ private UserComponent.UcCheckBox chkFission;
+ private UserComponent.UcCheckBox chkHeadWords;
+ private UserComponent.UcCheckBox chkEndWords;
+ private UserComponent.UcCheckBox chkDeleteLowPriceSku;
+ private UserComponent.UcCheckBox chkRandomSkuOrder;
+ private UserComponent.UcCheckBox chkSkuRandomPrice;
+ private System.Windows.Forms.NumericUpDown numSkuRandomPrice;
+ private System.Windows.Forms.Label label11;
+ private UserComponent.UcCheckBox chkUploadProd;
}
}
\ No newline at end of file
diff --git a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
index 8179361..457ca44 100644
--- a/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
+++ b/TEMUKJD/KJDForms/ProductThirdSelectForms/ProductThirdSelectListManageForm.cs
@@ -53,6 +53,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
pbFissionSetting.Visible = false;
btnReFission.Visible = false;
+ chkUploadProd.Visible = false; // 直接上传
+ flowLayoutPanel1.Visible = false;
+ flowLayoutPanel1.Visible = true;
+ chkDeleteLowPriceSku.Checked = true;
+ chkUploadProd.Visible = true;
+
if (BaseClass.SaLevel == 1)
{
dgvSelectProduct.Columns["colSubSaNick"].Visible = true;
@@ -603,7 +609,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
var prodDetailJsonReplace2 = Regex.Replace(prodDetailJsonReplace, pattern2, "$1\\$2");
var productDetail = JsonHelper.DeserializeJsonToObject(prodDetailJsonReplace2);
//result = UploadProduct(shop, productDetail, temuDBProd.size_json); //将商品上传至草稿箱
- result = UploadProduct(shop, temuDBProd, prod); //将商品上传至草稿箱
+ result = UploadProduct(shop, temuDBProd, prod, row.Cells["colOpResult"]); //将商品上传至草稿箱
if (result.Contains("登录过期"))
{
@@ -724,18 +730,26 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
}
}
- string UploadProduct(ShopLoginInfo shop, TemuDBProduct dbProd, TemuDBProductSelect selectProd)
+ string UploadProduct(ShopLoginInfo shop, TemuDBProduct dbProd, TemuDBProductSelect selectProd, DataGridViewCell cell)
{
if (shop == null || string.IsNullOrEmpty(shop.ShopId) || shop.LoginStatus != "登录成功" || shop.LoginStatus2 != "国际版在线")
{
return "店铺为空或未登录!";
}
+ if (cell != null)
+ {
+ Invoke(new Action(() =>
+ {
+ cell.Value = "正在初始化上传";
+ }));
+ }
+
var prodInfo = JsonHelper.DeserializeJsonToObject(dbProd.product_json);
var sTemuSizeSpec = dbProd.size_json;
TemuProductParam prodParam = new TemuProductParam();
- prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
- prodParam.carouselImageUrls = prodInfo.carouselImageUrls;
+ prodParam.productDraftId = 0;
+
prodParam.cat1Id = prodInfo.categories.cat1.catId;
prodParam.cat2Id = prodInfo.categories.cat2.catId;
prodParam.cat3Id = prodInfo.categories.cat3.catId;
@@ -746,12 +760,42 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
prodParam.cat8Id = prodInfo.categories.cat8.catId;
prodParam.cat9Id = prodInfo.categories.cat9.catId;
prodParam.cat10Id = prodInfo.categories.cat10.catId;
+
+ long catId = prodParam.cat10Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat9Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat8Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat7Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat6Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat5Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat4Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat3Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat2Id.ParseToLong();
+ if (catId == 0) catId = prodParam.cat1Id.ParseToLong();
+
+ var html = AddDraft(shop, catId.ToString());
+ if (html.Contains("{\"success\":true"))
+ prodParam.productDraftId = BaseRegex.GetLongJson(ref html, "productDraftId");
+ else
+ {
+ var error = BaseRegex.GetStringJson(ref html, "errorMsg");
+ if (string.IsNullOrEmpty(error))
+ error = BaseRegex.GetStringJson(ref html, "error_msg");
+ return "上传失败 " + error;
+ }
+ if (prodParam.productDraftId <= 0)
+ {
+ return "上传失败 " + html;
+ }
+
+ prodParam.carouselImageI18nReqs = prodInfo.carouselImageI18nVOList;
+ prodParam.carouselImageUrls = prodInfo.carouselImageUrls;
+
prodParam.goodsAdvantageLabelTypes = prodInfo.goodsAdvantageLabelVOList != null ?
prodInfo.goodsAdvantageLabelVOList : new List