上传百货相关逻辑
This commit is contained in:
1 parent
16aae6cc86
commit
552b067134
6 files changed
+857
-400
No files matched your search
+49
-49
@@ -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)));
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
// 标题部分打乱
|
||||
|
||||
Reference in new issue
Block a user