1Jit相关功能 50% 2 其他部分优化修改

This commit is contained in:
wule committed 2025-11-26 18:27:21 +08:00
1 parent 4d5ea741d7
commit e77914bafc
49 files changed
+2576 -419

No files matched your search

@@ -30,9 +30,10 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductEditNotesForm));
this.panel2 = new System.Windows.Forms.Panel();
this.label9 = new System.Windows.Forms.Label();
this.txtGroup = new System.Windows.Forms.TextBox();
this.btnAuto = new DevComponents.DotNetBar.PanelEx();
this.pnlRestore = new DevComponents.DotNetBar.PanelEx();
this.btnSkuAi = new TemuKJD.UserControls.ButtonEx();
this.label7 = new System.Windows.Forms.Label();
this.txtFissionWords = new DevComponents.DotNetBar.Controls.TextBoxX();
this.txtEndWords = new System.Windows.Forms.TextBox();
@@ -50,9 +51,10 @@
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.label8 = new System.Windows.Forms.Label();
this.txtNotes = new DevComponents.DotNetBar.Controls.TextBoxX();
this.btnOk = new TemuKJD.UserControls.ButtonEx();
this.txtGroup = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.label10 = new System.Windows.Forms.Label();
this.txtCostPrice = new System.Windows.Forms.TextBox();
this.btnOk = new DevComponents.DotNetBar.PanelEx();
this.btnSkuAi = new DevComponents.DotNetBar.PanelEx();
this.panel2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
this.SuspendLayout();
@@ -60,11 +62,14 @@
// panel2
//
this.panel2.BackColor = System.Drawing.Color.White;
this.panel2.Controls.Add(this.btnSkuAi);
this.panel2.Controls.Add(this.btnOk);
this.panel2.Controls.Add(this.txtCostPrice);
this.panel2.Controls.Add(this.label10);
this.panel2.Controls.Add(this.label9);
this.panel2.Controls.Add(this.txtGroup);
this.panel2.Controls.Add(this.btnAuto);
this.panel2.Controls.Add(this.pnlRestore);
this.panel2.Controls.Add(this.btnSkuAi);
this.panel2.Controls.Add(this.label7);
this.panel2.Controls.Add(this.txtFissionWords);
this.panel2.Controls.Add(this.txtEndWords);
@@ -82,13 +87,28 @@
this.panel2.Controls.Add(this.pictureBox1);
this.panel2.Controls.Add(this.label8);
this.panel2.Controls.Add(this.txtNotes);
this.panel2.Controls.Add(this.btnOk);
this.panel2.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel2.Location = new System.Drawing.Point(1, 33);
this.panel2.Name = "panel2";
this.panel2.Size = new System.Drawing.Size(464, 686);
this.panel2.TabIndex = 1;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(31, 333);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(56, 17);
this.label9.TabIndex = 447;
this.label9.Text = " 分组";
//
// txtGroup
//
this.txtGroup.Location = new System.Drawing.Point(90, 330);
this.txtGroup.Name = "txtGroup";
this.txtGroup.Size = new System.Drawing.Size(136, 23);
this.txtGroup.TabIndex = 446;
//
// btnAuto
//
this.btnAuto.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -138,23 +158,6 @@
this.pnlRestore.Text = "还原";
this.pnlRestore.Click += new System.EventHandler(this.pnlRestore_Click);
//
// btnSkuAi
//
this.btnSkuAi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnSkuAi.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSkuAi.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSkuAi.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSkuAi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSkuAi.ForeColor = System.Drawing.Color.White;
this.btnSkuAi.Location = new System.Drawing.Point(90, 640);
this.btnSkuAi.Margin = new System.Windows.Forms.Padding(2);
this.btnSkuAi.Name = "btnSkuAi";
this.btnSkuAi.Size = new System.Drawing.Size(77, 26);
this.btnSkuAi.TabIndex = 404;
this.btnSkuAi.Text = "SKU AI图";
this.btnSkuAi.UseVisualStyleBackColor = false;
this.btnSkuAi.Click += new System.EventHandler(this.btnSkuAi_Click);
//
// label7
//
this.label7.AutoSize = true;
@@ -256,7 +259,7 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.txtExtCode.Location = new System.Drawing.Point(90, 246);
this.txtExtCode.Name = "txtExtCode";
this.txtExtCode.Size = new System.Drawing.Size(337, 23);
this.txtExtCode.Size = new System.Drawing.Size(336, 23);
this.txtExtCode.TabIndex = 394;
//
// label4
@@ -337,38 +340,71 @@
this.txtNotes.Size = new System.Drawing.Size(337, 47);
this.txtNotes.TabIndex = 385;
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(233, 333);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(56, 17);
this.label10.TabIndex = 454;
this.label10.Text = " 成本价";
//
// txtCostPrice
//
this.txtCostPrice.Location = new System.Drawing.Point(291, 330);
this.txtCostPrice.Name = "txtCostPrice";
this.txtCostPrice.Size = new System.Drawing.Size(136, 23);
this.txtCostPrice.TabIndex = 455;
//
// btnOk
//
this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnOk.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnOk.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnOk.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnOk.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnOk.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOk.DisabledBackColor = System.Drawing.Color.Empty;
this.btnOk.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOk.ForeColor = System.Drawing.Color.White;
this.btnOk.Location = new System.Drawing.Point(372, 640);
this.btnOk.Margin = new System.Windows.Forms.Padding(2);
this.btnOk.Name = "btnOk";
this.btnOk.Size = new System.Drawing.Size(55, 26);
this.btnOk.TabIndex = 372;
this.btnOk.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnOk.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnOk.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnOk.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnOk.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnOk.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnOk.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnOk.Style.GradientAngle = 90;
this.btnOk.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnOk.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnOk.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnOk.TabIndex = 459;
this.btnOk.Text = "提交";
this.btnOk.UseVisualStyleBackColor = false;
this.btnOk.Click += new System.EventHandler(this.btnOk_Click);
//
// txtGroup
// btnSkuAi
//
this.txtGroup.Location = new System.Drawing.Point(90, 330);
this.txtGroup.Name = "txtGroup";
this.txtGroup.Size = new System.Drawing.Size(337, 23);
this.txtGroup.TabIndex = 446;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(31, 333);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(56, 17);
this.label9.TabIndex = 447;
this.label9.Text = " 分组";
this.btnSkuAi.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnSkuAi.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSkuAi.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSkuAi.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSkuAi.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSkuAi.Location = new System.Drawing.Point(90, 640);
this.btnSkuAi.Name = "btnSkuAi";
this.btnSkuAi.Size = new System.Drawing.Size(77, 26);
this.btnSkuAi.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSkuAi.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSkuAi.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSkuAi.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnSkuAi.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnSkuAi.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnSkuAi.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnSkuAi.Style.GradientAngle = 90;
this.btnSkuAi.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnSkuAi.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnSkuAi.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnSkuAi.TabIndex = 463;
this.btnSkuAi.Text = "SKU AI图";
this.btnSkuAi.Click += new System.EventHandler(this.btnSkuAi_Click);
//
// DbProductEditNotesForm
//
@@ -392,7 +428,6 @@
#endregion
private System.Windows.Forms.Panel panel2;
private UserControls.ButtonEx btnOk;
private System.Windows.Forms.Label label8;
private DevComponents.DotNetBar.Controls.TextBoxX txtNotes;
private System.Windows.Forms.Label label3;
@@ -410,10 +445,13 @@
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtHeadWords;
private System.Windows.Forms.Label label5;
private UserControls.ButtonEx btnSkuAi;
private DevComponents.DotNetBar.PanelEx pnlRestore;
private DevComponents.DotNetBar.PanelEx btnAuto;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.TextBox txtGroup;
private System.Windows.Forms.TextBox txtCostPrice;
private System.Windows.Forms.Label label10;
private DevComponents.DotNetBar.PanelEx btnSkuAi;
private DevComponents.DotNetBar.PanelEx btnOk;
}
}
@@ -13,6 +13,7 @@ using System.Windows.Forms;
using AllBase;
using Work;
using TemuKJD.ToolForms;
using NaiBa.Util.Extension;
namespace TemuKJD.KJDForms.ProductSelectForms
{
@@ -43,21 +44,31 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//this.txtEndWords.Text = string.IsNullOrWhiteSpace(dbProd.end_words) ? "适合不同的搭配风格" : dbProd.end_words;
this.txtHeadWords.Text = dbProd.head_words;
this.txtEndWords.Text = dbProd.end_words;
this.txtCostPrice.Text = dbProd.cost_price;
}
}
private void btnOk_Click(object sender, EventArgs e)
{
if (!string.IsNullOrEmpty(this.txtCostPrice.Text.Trim()) && this.txtCostPrice.Text.Trim().ParseToDecimal() == 0)
{
BaseMsgForm.ShowError("请输入正确的成本价,必须大于0,整数或者两位以内小数。");
return;
}
//var url = BaseClass.BuildObjString("product/mdy_product_notes");
var url = BaseClass.BuildObjString("product/mdy_db_product");
var data = UserLogin.GetSignaturex() +
"&db_id=" + dbProd.id + "&notes=" + this.txtNotes.Text.Trim();
data += "&group=" + this.txtGroup.Text.Trim();
data += "&product_name=" + this.txtProductName.Text.Trim();
data += "&product_name=" + this.txtProductName.Text.Trim();
data += "&ext_code=" + this.txtExtCode.Text.Trim();
data += "&fission_words=" + this.txtFissionWords.Text.Trim();
data += "&head_words=" + this.txtHeadWords.Text.Trim();
data += "&end_words=" + this.txtEndWords.Text.Trim();
if (!string.IsNullOrEmpty(this.txtCostPrice.Text.Trim()))
data += "&cost_price=" + this.txtCostPrice.Text.Trim();
var html = GetHtml.PostUtf8(url, data);
if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200"))
html = GetHtml.PostUtf8(url, data);
+140 -126
View File
@@ -38,6 +38,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
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.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DbProductListForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.btnBatchSelect = new DevComponents.DotNetBar.PanelEx();
@@ -68,6 +69,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.lblProdName = new System.Windows.Forms.Label();
this.numCount = new System.Windows.Forms.NumericUpDown();
this.dgvSelectShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSubUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.btnCancel = new DevComponents.DotNetBar.PanelEx();
this.btnAddToSelectDb = new DevComponents.DotNetBar.PanelEx();
this.btnGetShop = new DevComponents.DotNetBar.PanelEx();
@@ -78,34 +85,29 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.dgvDbProduct = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.col_db_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.col_product_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colMainImg = new System.Windows.Forms.DataGridViewImageColumn();
this.col_spu_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.col_skc_id = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colImgUrl = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colMainImg = new System.Windows.Forms.DataGridViewImageColumn();
this.col_product_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.col_cat_name = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.col_ext_code = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colAddTimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSelectTotalCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colCostPrice = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colProdGetType = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.col_notes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colGroup = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.col_notes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colHeadWords = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colEndWords = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colFissionWords = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colAddTime = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colAddTimes = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSelectTotalCount = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSelectProd = new System.Windows.Forms.DataGridViewLinkColumn();
this.col_edit = new System.Windows.Forms.DataGridViewLinkColumn();
this.col_delete = new System.Windows.Forms.DataGridViewLinkColumn();
this.col_select_product = new System.Windows.Forms.DataGridViewLinkColumn();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colSubUserName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopId = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopName = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.colShopNotes = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -238,7 +240,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
// cmbGroup
//
this.cmbGroup.FormattingEnabled = true;
this.cmbGroup.Location = new System.Drawing.Point(361, 37);
this.cmbGroup.Location = new System.Drawing.Point(520, 37);
this.cmbGroup.Name = "cmbGroup";
this.cmbGroup.Size = new System.Drawing.Size(121, 25);
this.cmbGroup.TabIndex = 500;
@@ -246,7 +248,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
// lblGroup
//
this.lblGroup.AutoSize = true;
this.lblGroup.Location = new System.Drawing.Point(327, 41);
this.lblGroup.Location = new System.Drawing.Point(486, 41);
this.lblGroup.Name = "lblGroup";
this.lblGroup.Size = new System.Drawing.Size(44, 17);
this.lblGroup.TabIndex = 499;
@@ -282,7 +284,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.cmbSort.Items.AddRange(new object[] {
"入库时间",
"认领总数"});
this.cmbSort.Location = new System.Drawing.Point(520, 37);
this.cmbSort.Location = new System.Drawing.Point(361, 37);
this.cmbSort.Name = "cmbSort";
this.cmbSort.Size = new System.Drawing.Size(121, 25);
this.cmbSort.TabIndex = 448;
@@ -370,7 +372,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(486, 41);
this.label6.Location = new System.Drawing.Point(327, 41);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(44, 17);
this.label6.TabIndex = 449;
@@ -541,6 +543,50 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.dgvSelectShop.TabIndex = 504;
this.dgvSelectShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvSelectShop_CellContentClick);
//
// colCheck
//
this.colCheck.HeaderText = "选择";
this.colCheck.MinimumWidth = 6;
this.colCheck.Name = "colCheck";
this.colCheck.ReadOnly = true;
this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colCheck.Width = 30;
//
// colUserName
//
this.colUserName.HeaderText = "用户名称";
this.colUserName.MinimumWidth = 6;
this.colUserName.Name = "colUserName";
this.colUserName.ReadOnly = true;
this.colUserName.Width = 90;
//
// colSubUserName
//
this.colSubUserName.HeaderText = "子账户名称";
this.colSubUserName.Name = "colSubUserName";
this.colSubUserName.ReadOnly = true;
this.colSubUserName.Visible = false;
this.colSubUserName.Width = 150;
//
// colShopId
//
this.colShopId.HeaderText = "店铺Id";
this.colShopId.Name = "colShopId";
this.colShopId.ReadOnly = true;
//
// colShopName
//
this.colShopName.HeaderText = "店铺名称";
this.colShopName.Name = "colShopName";
this.colShopName.ReadOnly = true;
//
// colShopNotes
//
this.colShopNotes.HeaderText = "店铺备注";
this.colShopNotes.Name = "colShopNotes";
this.colShopNotes.ReadOnly = true;
//
// btnCancel
//
this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control;
@@ -667,22 +713,23 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.dgvDbProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
this.col_db_id,
this.col_product_name,
this.colImgUrl,
this.colMainImg,
this.col_spu_id,
this.col_skc_id,
this.colImgUrl,
this.colMainImg,
this.col_product_name,
this.col_cat_name,
this.col_ext_code,
this.colAddTimes,
this.colSelectTotalCount,
this.colCostPrice,
this.colProdGetType,
this.col_notes,
this.colGroup,
this.col_notes,
this.colHeadWords,
this.colEndWords,
this.colFissionWords,
this.colAddTime,
this.colAddTimes,
this.colSelectTotalCount,
this.colSelectProd,
this.col_edit,
this.col_delete,
@@ -713,14 +760,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.col_db_id.ReadOnly = true;
this.col_db_id.Visible = false;
//
// col_product_name
// col_spu_id
//
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.col_product_name.DefaultCellStyle = dataGridViewCellStyle5;
this.col_product_name.FillWeight = 160F;
this.col_product_name.HeaderText = "标题";
this.col_product_name.Name = "col_product_name";
this.col_product_name.ReadOnly = true;
this.col_spu_id.FillWeight = 90F;
this.col_spu_id.HeaderText = "SPU Id";
this.col_spu_id.Name = "col_spu_id";
this.col_spu_id.ReadOnly = true;
//
// col_skc_id
//
this.col_skc_id.FillWeight = 90F;
this.col_skc_id.HeaderText = "SKC Id";
this.col_skc_id.Name = "col_skc_id";
this.col_skc_id.ReadOnly = true;
//
// colImgUrl
//
@@ -739,19 +791,14 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.colMainImg.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colMainImg.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
//
// col_spu_id
// col_product_name
//
this.col_spu_id.FillWeight = 90F;
this.col_spu_id.HeaderText = "SPU Id";
this.col_spu_id.Name = "col_spu_id";
this.col_spu_id.ReadOnly = true;
//
// col_skc_id
//
this.col_skc_id.FillWeight = 90F;
this.col_skc_id.HeaderText = "SKC Id";
this.col_skc_id.Name = "col_skc_id";
this.col_skc_id.ReadOnly = true;
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.col_product_name.DefaultCellStyle = dataGridViewCellStyle5;
this.col_product_name.FillWeight = 150F;
this.col_product_name.HeaderText = "标题";
this.col_product_name.Name = "col_product_name";
this.col_product_name.ReadOnly = true;
//
// col_cat_name
//
@@ -765,19 +812,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.col_ext_code.Name = "col_ext_code";
this.col_ext_code.ReadOnly = true;
//
// colAddTimes
// colCostPrice
//
this.colAddTimes.FillWeight = 52F;
this.colAddTimes.HeaderText = "单店认领次数";
this.colAddTimes.Name = "colAddTimes";
this.colAddTimes.ReadOnly = true;
//
// colSelectTotalCount
//
this.colSelectTotalCount.FillWeight = 52F;
this.colSelectTotalCount.HeaderText = "认领总数";
this.colSelectTotalCount.Name = "colSelectTotalCount";
this.colSelectTotalCount.ReadOnly = true;
this.colCostPrice.FillWeight = 50F;
this.colCostPrice.HeaderText = "成本价";
this.colCostPrice.Name = "colCostPrice";
this.colCostPrice.ReadOnly = true;
//
// colProdGetType
//
@@ -786,6 +826,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.colProdGetType.Name = "colProdGetType";
this.colProdGetType.ReadOnly = true;
//
// colGroup
//
this.colGroup.FillWeight = 58F;
this.colGroup.HeaderText = "分组";
this.colGroup.Name = "colGroup";
this.colGroup.ReadOnly = true;
//
// col_notes
//
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
@@ -795,13 +842,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.col_notes.Name = "col_notes";
this.col_notes.ReadOnly = true;
//
// colGroup
//
this.colGroup.FillWeight = 58F;
this.colGroup.HeaderText = "分组";
this.colGroup.Name = "colGroup";
this.colGroup.ReadOnly = true;
//
// colHeadWords
//
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
@@ -831,10 +871,27 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//
// colAddTime
//
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colAddTime.DefaultCellStyle = dataGridViewCellStyle10;
this.colAddTime.FillWeight = 60F;
this.colAddTime.HeaderText = "入库时间";
this.colAddTime.Name = "colAddTime";
this.colAddTime.ReadOnly = true;
//
// colAddTimes
//
this.colAddTimes.FillWeight = 52F;
this.colAddTimes.HeaderText = "单店认领次数";
this.colAddTimes.Name = "colAddTimes";
this.colAddTimes.ReadOnly = true;
//
// colSelectTotalCount
//
this.colSelectTotalCount.FillWeight = 52F;
this.colSelectTotalCount.HeaderText = "认领总数";
this.colSelectTotalCount.Name = "colSelectTotalCount";
this.colSelectTotalCount.ReadOnly = true;
//
// colSelectProd
//
this.colSelectProd.FillWeight = 60F;
@@ -894,50 +951,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.statusBar.Size = new System.Drawing.Size(1278, 25);
this.statusBar.TabIndex = 5;
//
// colCheck
//
this.colCheck.HeaderText = "选择";
this.colCheck.MinimumWidth = 6;
this.colCheck.Name = "colCheck";
this.colCheck.ReadOnly = true;
this.colCheck.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colCheck.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colCheck.Width = 30;
//
// colUserName
//
this.colUserName.HeaderText = "用户名称";
this.colUserName.MinimumWidth = 6;
this.colUserName.Name = "colUserName";
this.colUserName.ReadOnly = true;
this.colUserName.Width = 90;
//
// colSubUserName
//
this.colSubUserName.HeaderText = "子账户名称";
this.colSubUserName.Name = "colSubUserName";
this.colSubUserName.ReadOnly = true;
this.colSubUserName.Visible = false;
this.colSubUserName.Width = 150;
//
// colShopId
//
this.colShopId.HeaderText = "店铺Id";
this.colShopId.Name = "colShopId";
this.colShopId.ReadOnly = true;
//
// colShopName
//
this.colShopName.HeaderText = "店铺名称";
this.colShopName.Name = "colShopName";
this.colShopName.ReadOnly = true;
//
// colShopNotes
//
this.colShopNotes.HeaderText = "店铺备注";
this.colShopNotes.Name = "colShopNotes";
this.colShopNotes.ReadOnly = true;
//
// DbProductListForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1006,28 +1019,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private System.Windows.Forms.NumericUpDown numCount;
private System.Windows.Forms.Label lblProdName;
private System.Windows.Forms.Label lblGroup;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id;
private System.Windows.Forms.DataGridViewTextBoxColumn col_product_name;
private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
private System.Windows.Forms.DataGridViewImageColumn colMainImg;
private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id;
private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id;
private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name;
private System.Windows.Forms.DataGridViewTextBoxColumn col_ext_code;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTimes;
private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount;
private System.Windows.Forms.DataGridViewTextBoxColumn colProdGetType;
private System.Windows.Forms.DataGridViewTextBoxColumn col_notes;
private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords;
private System.Windows.Forms.DataGridViewTextBoxColumn colEndWords;
private System.Windows.Forms.DataGridViewTextBoxColumn colFissionWords;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
private System.Windows.Forms.DataGridViewLinkColumn colSelectProd;
private System.Windows.Forms.DataGridViewLinkColumn col_edit;
private System.Windows.Forms.DataGridViewLinkColumn col_delete;
private System.Windows.Forms.DataGridViewLinkColumn col_select_product;
private System.Windows.Forms.ComboBox cmbGroup;
private System.Windows.Forms.ListBox lbxProdName;
private DevComponents.DotNetBar.PanelEx btnBatchSelect;
@@ -1039,5 +1030,28 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private System.Windows.Forms.DataGridViewTextBoxColumn colShopId;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopName;
private System.Windows.Forms.DataGridViewTextBoxColumn colShopNotes;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelect;
private System.Windows.Forms.DataGridViewTextBoxColumn col_db_id;
private System.Windows.Forms.DataGridViewTextBoxColumn col_spu_id;
private System.Windows.Forms.DataGridViewTextBoxColumn col_skc_id;
private System.Windows.Forms.DataGridViewTextBoxColumn colImgUrl;
private System.Windows.Forms.DataGridViewImageColumn colMainImg;
private System.Windows.Forms.DataGridViewTextBoxColumn col_product_name;
private System.Windows.Forms.DataGridViewTextBoxColumn col_cat_name;
private System.Windows.Forms.DataGridViewTextBoxColumn col_ext_code;
private System.Windows.Forms.DataGridViewTextBoxColumn colCostPrice;
private System.Windows.Forms.DataGridViewTextBoxColumn colProdGetType;
private System.Windows.Forms.DataGridViewTextBoxColumn colGroup;
private System.Windows.Forms.DataGridViewTextBoxColumn col_notes;
private System.Windows.Forms.DataGridViewTextBoxColumn colHeadWords;
private System.Windows.Forms.DataGridViewTextBoxColumn colEndWords;
private System.Windows.Forms.DataGridViewTextBoxColumn colFissionWords;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTime;
private System.Windows.Forms.DataGridViewTextBoxColumn colAddTimes;
private System.Windows.Forms.DataGridViewTextBoxColumn colSelectTotalCount;
private System.Windows.Forms.DataGridViewLinkColumn colSelectProd;
private System.Windows.Forms.DataGridViewLinkColumn col_edit;
private System.Windows.Forms.DataGridViewLinkColumn col_delete;
private System.Windows.Forms.DataGridViewLinkColumn col_select_product;
}
}
@@ -1,4 +1,5 @@
using AllBase;
using AllBase.Helper;
using AllBase.Model.Result;
using AllBase.Model.Result.TemuResult;
using NaiBa.Util.Extension;
@@ -29,6 +30,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
ShopLoginInfo shop = null; // 单店认领
List<ShopLoginInfo> lstAdminShopInfo = new List<ShopLoginInfo>(); // 服务端直传店铺列表
List<KJDDBProduct> lstTemuDbProduct = new List<KJDDBProduct>();
public bool IsAdmin { get; set; } = false;
public bool IsClientJit { get; set; } = false;
public DbProductListForm()
{
@@ -43,41 +46,46 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private void ProductListForm_Load(object sender, EventArgs e)
{
this.dgvDbProduct.Columns["col_delete"].Visible = false;
this.dgvDbProduct.Columns["col_edit"].Visible = false;
this.dgvDbProduct.Columns["colHeadWords"].Visible = false;
this.dgvDbProduct.Columns["colEndWords"].Visible = false;
this.dgvDbProduct.Columns["colFissionWords"].Visible = false;
this.dgvDbProduct.Columns["colSelectProd"].Visible = false;
this.dgvDbProduct.Columns["colProdGetType"].Visible = false;
this.dgvDbProduct.Columns["colGroup"].Visible = false;
this.dgvDbProduct.Columns["colCostPrice"].Visible = false;
this.lblGroup.Visible = false;
this.cmbGroup.Visible = false;
this.btnImportHtml.Visible = false;
this.btnBatchSelect.Visible = false;
if (BaseClass.SaLevel == 1 && shop == null) // 一级管理员且不是选品状态
{
this.dgvDbProduct.Columns["col_delete"].Visible = true;
this.dgvDbProduct.Columns["col_edit"].Visible = true;
this.dgvDbProduct.Columns["colHeadWords"].Visible = true;
this.dgvDbProduct.Columns["colEndWords"].Visible = true;
this.dgvDbProduct.Columns["colFissionWords"].Visible = true;
this.dgvDbProduct.Columns["colSelectProd"].Visible = true;
this.dgvDbProduct.Columns["colProdGetType"].Visible = true;
this.dgvDbProduct.Columns["colGroup"].Visible = true;
//this.dgvDbProduct.Columns["col_notes"].Visible = true;
//this.lblNotes.Visible = true;
//this.txtNotes.Visible = true;
this.lblGroup.Visible = true;
this.cmbGroup.Visible = true;
this.btnImportHtml.Visible = true;
this.btnBatchSelect.Visible = true;
this.dgvDbProduct.Columns["col_delete"].Visible = true; // 删除
this.dgvDbProduct.Columns["col_edit"].Visible = true; // 编辑
this.dgvDbProduct.Columns["colHeadWords"].Visible = true; // 头词
this.dgvDbProduct.Columns["colEndWords"].Visible = true; // 尾词
this.dgvDbProduct.Columns["colFissionWords"].Visible = true; // 分裂词
this.dgvDbProduct.Columns["colSelectProd"].Visible = true; // 商品直传(不经过客户选品)
this.dgvDbProduct.Columns["colProdGetType"].Visible = true; // 采集来源 母店采集 前端直采
this.dgvDbProduct.Columns["colGroup"].Visible = true; // 分组
this.dgvDbProduct.Columns["colCostPrice"].Visible = true; // 成本价
this.lblGroup.Visible = true; // 分组
this.cmbGroup.Visible = true; // 分组
this.btnImportHtml.Visible = true; // 导入前端直采商品
this.btnBatchSelect.Visible = true; // 批量直传
}
else
else if (BaseClass.SaLevel > 1 && shop == null)
{
this.dgvDbProduct.Columns["col_delete"].Visible = false;
this.dgvDbProduct.Columns["col_edit"].Visible = false;
this.dgvDbProduct.Columns["colHeadWords"].Visible = false;
this.dgvDbProduct.Columns["colEndWords"].Visible = false;
this.dgvDbProduct.Columns["colFissionWords"].Visible = false;
this.dgvDbProduct.Columns["colSelectProd"].Visible = false;
this.dgvDbProduct.Columns["colProdGetType"].Visible = false;
this.dgvDbProduct.Columns["colGroup"].Visible = false;
//this.dgvDbProduct.Columns["col_notes"].Visible = false;
//this.lblNotes.Visible = false;
//this.txtNotes.Visible = false;
this.lblGroup.Visible = false;
this.cmbGroup.Visible = false;
this.btnImportHtml.Visible = false;
this.btnBatchSelect.Visible = false;
this.dgvDbProduct.Columns["colHeadWords"].Visible = true; // 头词
this.dgvDbProduct.Columns["colEndWords"].Visible = true; // 尾词
this.dgvDbProduct.Columns["colFissionWords"].Visible = true; // 分裂词
this.dgvDbProduct.Columns["colProdGetType"].Visible = true; // 采集来源 母店采集 前端直采
this.dgvDbProduct.Columns["colGroup"].Visible = true; // 分组
this.dgvDbProduct.Columns["colCostPrice"].Visible = true; // 成本价
this.lblGroup.Visible = true; // 分组
this.cmbGroup.Visible = true; // 分组
}
btnSelect.Visible = false;
@@ -156,22 +164,23 @@ namespace TemuKJD.KJDForms.ProductSelectForms
int rowIndex = this.dgvDbProduct.Rows.Add(
false,
prod.id,
prod.product_name,
prod?.main_img?.Replace("https://", "http://").Replace("img.kwcdn.com", "img.cdnfe.com"),
DataGridViewExtension.defaultBitmap, // prod.main_img,
prod.spu_id,
prod.skc_id,
prod?.main_img?.Replace("https://", "http://").Replace("img.kwcdn.com", "img.cdnfe.com"),
DataGridViewExtension.defaultBitmap, // prod.main_img,
prod.product_name,
prod.cat_name,
prod.ext_code,
prod.select_count,
prod.select_total_count,
prod.cost_price,
prod.product_get_type == 0 ? "母店采集" : "前端直采",
prod.notes,
prod.group,
prod.notes,
prod.head_words,
prod.end_words,
prod.fission_words,
prod.add_time,
prod.add_time.ToString("yy/MM/dd HH:mm:ss"),
prod.select_count,
prod.select_total_count,
"商品直传",
"编辑",
"删除",
@@ -255,7 +264,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
data += "&get_select_count=true";
data += "&select_shop_id=" + shop.ShopId;
}
else if (BaseClass.SaLevel == 1) // 店铺非空管理状态允许查看后台采集和前端采集的所有商品
else if (BaseClass.SaLevel > 0) // 店铺非空管理状态允许查看后台采集和前端采集的所有商品
{
data += "&product_get_type=all";
}
@@ -1141,16 +1150,51 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private void btnGetShop_Click(object sender, EventArgs e)
{
if (IsClientJit)
{
GetShop();
}
else
{
GetServerShop();
}
}
void GetShop()
{
this.pbLoading.Visible = true;
this.dgvSelectShop.Rows.Clear();
var list = GlobalConfig.ShopLoginList.Where(s => s.ShopId.Contains(txtShopId.Text.Trim()) && s.ShopAccount.Contains(txtShopName.Text.Trim())).Take(10).ToList();
foreach (var shop in lstAdminShopInfo)
{
Invoke(new Action(() =>
{
int rowIndex = this.dgvSelectShop.Rows.Add(
false,
shop.UserName,
shop.SubUserName,
shop.ShopId,
shop.ShopAccount,
shop.Notes);
if (rowIndex == 0)
{
this.dgvSelectShop.Rows[rowIndex].Cells["colCheck"].Value = true;
}
}));
}
}
void GetServerShop()
{
this.pbLoading.Visible = true;
this.dgvSelectShop.Rows.Clear();
this.lstAdminShopInfo.Clear();
Task.Run(() =>
{
int pageCount;
var list = AdminForms.AdminShopListForm.Instance.AdminGetServerShopLst(out pageCount, "", "", "",
var list = AdminForms.AdminShopListForm.Instance.AdminGetServerShopLst(out pageCount, "", "", "",
txtShopId.Text.Trim(), txtShopName.Text.Trim(), 1, 10);
lstAdminShopInfo.AddRange(list);
this.ucSplitPage1.TotalPage = pageCount;
foreach (var shop in lstAdminShopInfo)
{
@@ -141,7 +141,10 @@
<metadata name="col_db_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="col_product_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="col_spu_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="col_skc_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colImgUrl.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -150,10 +153,7 @@
<metadata name="colMainImg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="col_spu_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="col_skc_id.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="col_product_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="col_cat_name.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -162,19 +162,16 @@
<metadata name="col_ext_code.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colAddTimes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelectTotalCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="colCostPrice.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colProdGetType.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="col_notes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="colGroup.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colGroup.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<metadata name="col_notes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colHeadWords.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -189,6 +186,12 @@
<metadata name="colAddTime.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colAddTimes.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelectTotalCount.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelectProd.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -2167,9 +2167,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
language = "en",
productName = prodParam.productName,
};
if (CountChineseCharacters(productI18nEn.productName) > 0)
if (CountChineseCharacters(productI18nEn.productName) > 0 && !string.IsNullOrEmpty(headWords))
{
productI18nEn.productName = productI18nEn.productName.Replace(headWords, "").Replace(endWords, "");
productI18nEn.productName = productI18nEn.productName.Replace(headWords, "");
}
if (CountChineseCharacters(productI18nEn.productName) > 0 && !string.IsNullOrEmpty(endWords))
{
productI18nEn.productName = productI18nEn.productName.Replace(endWords, "");
}
if (CountChineseCharacters(productI18nEn.productName) > 0)
{
@@ -2181,7 +2185,10 @@ namespace TemuKJD.KJDForms.ProductSelectForms
Task.Run(() =>
{
Thread.Sleep(5000);
this.pnlError.Visible = false;
Invoke(new Action(() =>
{
this.pnlError.Visible = false;
}));
});
}
else