1库存上传可以修改类目, 2修复选品上传标题内有中文导致无法上传问题 3商品核价过滤优化

This commit is contained in:
wule committed 2025-11-21 18:46:14 +08:00
1 parent 55d4a27d90
commit a23020725a
10 files changed
+945 -606

No files matched your search

+74 -127
View File
@@ -30,19 +30,19 @@ namespace TemuKJD.KJDForms.ProductForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle25 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle26 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle16 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle17 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle18 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle19 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle20 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle21 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle22 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle23 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle24 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnRestoreJitParams = new DevComponents.DotNetBar.PanelEx();
@@ -98,9 +98,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbShopLoading = new System.Windows.Forms.PictureBox();
this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.txtBatchExtCode = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label();
this.btnCancelJit = new DevComponents.DotNetBar.PanelEx();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colUser = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -241,9 +238,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx1.Controls.Add(this.chkBatchStock);
this.ucGroupBoxEx1.Controls.Add(this.chkBatchJit);
this.ucGroupBoxEx1.Controls.Add(this.chkFilterJit);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(1579, 140);
this.ucGroupBoxEx1.Size = new System.Drawing.Size(1580, 140);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "参数设置";
@@ -253,9 +250,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRestoreJitParams.CanvasColor = System.Drawing.SystemColors.Control;
this.btnRestoreJitParams.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestoreJitParams.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestoreJitParams.Location = new System.Drawing.Point(1400, 103);
this.btnRestoreJitParams.Location = new System.Drawing.Point(1341, 92);
this.btnRestoreJitParams.Name = "btnRestoreJitParams";
this.btnRestoreJitParams.Size = new System.Drawing.Size(60, 23);
this.btnRestoreJitParams.Size = new System.Drawing.Size(57, 35);
this.btnRestoreJitParams.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestoreJitParams.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnRestoreJitParams.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -269,7 +266,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRestoreJitParams.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestoreJitParams.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnRestoreJitParams.TabIndex = 1303;
this.btnRestoreJitParams.Text = "重置选中";
this.btnRestoreJitParams.Text = "清除选中\r\n货号配置";
this.btnRestoreJitParams.Click += new System.EventHandler(this.btnRestoreJitParams_Click);
//
// btnSaveExtCodeJitConfig
@@ -277,9 +274,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSaveExtCodeJitConfig.CanvasColor = System.Drawing.SystemColors.Control;
this.btnSaveExtCodeJitConfig.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSaveExtCodeJitConfig.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSaveExtCodeJitConfig.Location = new System.Drawing.Point(1283, 103);
this.btnSaveExtCodeJitConfig.Location = new System.Drawing.Point(1282, 92);
this.btnSaveExtCodeJitConfig.Name = "btnSaveExtCodeJitConfig";
this.btnSaveExtCodeJitConfig.Size = new System.Drawing.Size(115, 23);
this.btnSaveExtCodeJitConfig.Size = new System.Drawing.Size(57, 35);
this.btnSaveExtCodeJitConfig.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSaveExtCodeJitConfig.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnSaveExtCodeJitConfig.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -293,7 +290,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSaveExtCodeJitConfig.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSaveExtCodeJitConfig.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnSaveExtCodeJitConfig.TabIndex = 1299;
this.btnSaveExtCodeJitConfig.Text = "存配置到选中货号";
this.btnSaveExtCodeJitConfig.Text = "保存选中\r\n货号配置\r\n";
this.btnSaveExtCodeJitConfig.Click += new System.EventHandler(this.btnSaveExtCodeJitConfig_Click);
//
// line3
@@ -311,7 +308,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.line2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.line2.Location = new System.Drawing.Point(1414, 21);
this.line2.Name = "line2";
this.line2.Size = new System.Drawing.Size(11, 59);
this.line2.Size = new System.Drawing.Size(11, 104);
this.line2.TabIndex = 1264;
this.line2.Text = "line2";
this.line2.VerticalLine = true;
@@ -330,7 +327,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.chkFilterNotJit.AutoSize = true;
this.chkFilterNotJit.ForeColor = System.Drawing.Color.Green;
this.chkFilterNotJit.Location = new System.Drawing.Point(1282, 70);
this.chkFilterNotJit.Location = new System.Drawing.Point(1282, 66);
this.chkFilterNotJit.Name = "chkFilterNotJit";
this.chkFilterNotJit.Size = new System.Drawing.Size(127, 21);
this.chkFilterNotJit.TabIndex = 1232;
@@ -366,22 +363,22 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvExtCode.AllowUserToAddRows = false;
this.dgvExtCode.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25;
this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.dgvExtCode.AutoRowNumber = false;
this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvExtCode.BackgroundColor = System.Drawing.Color.White;
this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle26.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle26.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle26.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle26.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle26.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle26.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle26.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle26;
this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelectExtCode,
this.colFilterExtCode,
@@ -434,7 +431,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnCancel.CanvasColor = System.Drawing.SystemColors.Control;
this.btnCancel.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnCancel.DisabledBackColor = System.Drawing.Color.Empty;
this.btnCancel.Location = new System.Drawing.Point(1470, 103);
this.btnCancel.Location = new System.Drawing.Point(1471, 104);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(92, 23);
this.btnCancel.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -483,7 +480,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnAddRealPic.CanvasColor = System.Drawing.SystemColors.Control;
this.btnAddRealPic.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnAddRealPic.DisabledBackColor = System.Drawing.Color.Empty;
this.btnAddRealPic.Location = new System.Drawing.Point(1022, 103);
this.btnAddRealPic.Location = new System.Drawing.Point(1024, 104);
this.btnAddRealPic.Name = "btnAddRealPic";
this.btnAddRealPic.Size = new System.Drawing.Size(37, 23);
this.btnAddRealPic.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -550,7 +547,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtBatchStock
//
this.txtBatchStock.Location = new System.Drawing.Point(1188, 103);
this.txtBatchStock.Location = new System.Drawing.Point(1188, 104);
this.txtBatchStock.Name = "txtBatchStock";
this.txtBatchStock.Size = new System.Drawing.Size(80, 23);
this.txtBatchStock.TabIndex = 1054;
@@ -567,7 +564,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtBatchIdentifyCode
//
this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 103);
this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 104);
this.txtBatchIdentifyCode.Name = "txtBatchIdentifyCode";
this.txtBatchIdentifyCode.Size = new System.Drawing.Size(87, 23);
this.txtBatchIdentifyCode.TabIndex = 1048;
@@ -835,7 +832,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchIdentifyCode.AutoSize = true;
this.chkBatchIdentifyCode.Checked = true;
this.chkBatchIdentifyCode.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkBatchIdentifyCode.Location = new System.Drawing.Point(903, 81);
this.chkBatchIdentifyCode.Location = new System.Drawing.Point(903, 82);
this.chkBatchIdentifyCode.Name = "chkBatchIdentifyCode";
this.chkBatchIdentifyCode.Size = new System.Drawing.Size(99, 21);
this.chkBatchIdentifyCode.TabIndex = 1111;
@@ -871,7 +868,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchStock.AutoSize = true;
this.chkBatchStock.Checked = true;
this.chkBatchStock.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkBatchStock.Location = new System.Drawing.Point(1188, 81);
this.chkBatchStock.Location = new System.Drawing.Point(1188, 82);
this.chkBatchStock.Name = "chkBatchStock";
this.chkBatchStock.Size = new System.Drawing.Size(87, 21);
this.chkBatchStock.TabIndex = 1114;
@@ -894,7 +891,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.chkFilterJit.AutoSize = true;
this.chkFilterJit.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.chkFilterJit.Location = new System.Drawing.Point(1282, 47);
this.chkFilterJit.Location = new System.Drawing.Point(1282, 45);
this.chkFilterJit.Name = "chkFilterJit";
this.chkFilterJit.Size = new System.Drawing.Size(127, 21);
this.chkFilterJit.TabIndex = 1231;
@@ -932,9 +929,6 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.splitContainer2.Panel1.Controls.Add(this.pbShopLoading);
this.splitContainer2.Panel1.Controls.Add(this.chkSearchAllShop);
this.splitContainer2.Panel1.Controls.Add(this.txtBatchExtCode);
this.splitContainer2.Panel1.Controls.Add(this.label1);
this.splitContainer2.Panel1.Controls.Add(this.btnCancelJit);
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
//
@@ -971,67 +965,23 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkSearchAllShop.UseVisualStyleBackColor = true;
this.chkSearchAllShop.Visible = false;
//
// txtBatchExtCode
//
this.txtBatchExtCode.Location = new System.Drawing.Point(22, 88);
this.txtBatchExtCode.Multiline = true;
this.txtBatchExtCode.Name = "txtBatchExtCode";
this.txtBatchExtCode.Size = new System.Drawing.Size(156, 104);
this.txtBatchExtCode.TabIndex = 1043;
this.txtBatchExtCode.Visible = false;
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(19, 68);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 1044;
this.label1.Text = "查询货号:";
this.label1.Visible = false;
//
// btnCancelJit
//
this.btnCancelJit.CanvasColor = System.Drawing.SystemColors.Control;
this.btnCancelJit.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnCancelJit.DisabledBackColor = System.Drawing.Color.Empty;
this.btnCancelJit.Location = new System.Drawing.Point(22, 198);
this.btnCancelJit.Name = "btnCancelJit";
this.btnCancelJit.Size = new System.Drawing.Size(106, 21);
this.btnCancelJit.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnCancelJit.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnCancelJit.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnCancelJit.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnCancelJit.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnCancelJit.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnCancelJit.Style.GradientAngle = 90;
this.btnCancelJit.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnCancelJit.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnCancelJit.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnCancelJit.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnCancelJit.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnCancelJit.TabIndex = 1144;
this.btnCancelJit.Text = "停止操作";
this.btnCancelJit.Visible = false;
this.btnCancelJit.Click += new System.EventHandler(this.btnCancelJit_Click);
//
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle14.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle15.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle15.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle15.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle15.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle15.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle15.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle15;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1191,19 +1141,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvOpenJit.AllowUserToAddRows = false;
this.dgvOpenJit.AllowUserToDeleteRows = false;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16;
this.dgvOpenJit.AutoRowNumber = true;
this.dgvOpenJit.BackgroundColor = System.Drawing.Color.White;
this.dgvOpenJit.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle6.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle6.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle17.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle17.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle17.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle17.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle17.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle17.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle17.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvOpenJit.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle17;
this.dgvOpenJit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvOpenJit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1270,8 +1220,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colSupplierName
//
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle18;
this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName";
this.colSupplierName.ReadOnly = true;
@@ -1311,8 +1261,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colProdName
//
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle8;
dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle19;
this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true;
@@ -1320,8 +1270,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colSkuName
//
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuName.DefaultCellStyle = dataGridViewCellStyle9;
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuName.DefaultCellStyle = dataGridViewCellStyle20;
this.colSkuName.HeaderText = "规格名称";
this.colSkuName.Name = "colSkuName";
this.colSkuName.ReadOnly = true;
@@ -1329,8 +1279,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colExtCode
//
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colExtCode.DefaultCellStyle = dataGridViewCellStyle10;
dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colExtCode.DefaultCellStyle = dataGridViewCellStyle21;
this.colExtCode.HeaderText = "货号";
this.colExtCode.Name = "colExtCode";
this.colExtCode.ReadOnly = true;
@@ -1353,8 +1303,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colCreatTime
//
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle11;
dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle22;
this.colCreatTime.HeaderText = "创建时间";
this.colCreatTime.Name = "colCreatTime";
this.colCreatTime.ReadOnly = true;
@@ -1370,8 +1320,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colCompliance
//
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCompliance.DefaultCellStyle = dataGridViewCellStyle12;
dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCompliance.DefaultCellStyle = dataGridViewCellStyle23;
this.colCompliance.HeaderText = "合规信息";
this.colCompliance.Name = "colCompliance";
this.colCompliance.ReadOnly = true;
@@ -1404,8 +1354,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colRecevieArea
//
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle24;
this.colRecevieArea.HeaderText = "期望到货";
this.colRecevieArea.Name = "colRecevieArea";
this.colRecevieArea.ReadOnly = true;
@@ -1577,10 +1527,8 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.TextBox textBox1;
private DevComponents.DotNetBar.PanelEx btnClose;
private DevComponents.DotNetBar.PanelEx btnSearch1;
private System.Windows.Forms.TextBox txtBatchExtCode;
private System.Windows.Forms.TextBox txtBatchPriceMax;
private System.Windows.Forms.TextBox txtBatchPriceMin;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.TextBox txtBatchIdentifyCode;
private System.Windows.Forms.PictureBox pbBatchRealPicture;
private DevComponents.DotNetBar.PanelEx btnBatchJit;
@@ -1597,7 +1545,6 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.Label label6;
private UserComponent.DataGridViewEx dgvExtCode;
private DevComponents.DotNetBar.PanelEx btnSetReceiveArea;
private DevComponents.DotNetBar.PanelEx btnCancelJit;
private UserComponent.UcCheckBox chkFilterJit;
private DevComponents.DotNetBar.PanelEx btnCancel;
private UserComponent.UcCheckBox chkFilterNotJit;
+26 -45
View File
@@ -454,7 +454,6 @@ namespace TemuKJD.KJDForms.ProductForms
column.Visible = true;
}
lstFilterExtCode.Clear();
dgvExtCode.Rows.Clear();
this.dgvOpenJit.Rows.Clear();
this.lstChainProdInfo.Clear();
@@ -655,10 +654,8 @@ namespace TemuKJD.KJDForms.ProductForms
}
}
int num = 0;
foreach (var chainProdInfo in chainProductTmpLst)
{
num++;
if (cancellationTokenSource.IsCancellationRequested)
break;
@@ -764,7 +761,7 @@ namespace TemuKJD.KJDForms.ProductForms
""
);
dgvOpenJit.Rows[rowId].Height = 60;
if (num % 2 == 1)
if (totalProdIndex % 2 == 1)
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
else
dgvOpenJit.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
@@ -792,13 +789,6 @@ namespace TemuKJD.KJDForms.ProductForms
var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>()
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
foreach (var ext in extCodeLst)
{
if (!this.txtBatchExtCode.Text.Split(new string[] { }, StringSplitOptions.RemoveEmptyEntries).Contains(ext))
{
this.txtBatchExtCode.Text += ext + "\r\n";
}
}
this.dgvExtCode.Rows.Clear();
foreach (var ext in extCodeLst)
@@ -1896,12 +1886,8 @@ Content-Disposition: form-data; name=""upload_sign""
cancellationTokenSource.Cancel();
}
List<string> lstFilterExtCode = new List<string>();
private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e)
{
lstFilterExtCode = dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
FilterRows();
}
@@ -1918,9 +1904,6 @@ Content-Disposition: form-data; name=""upload_sign""
case "选":
case "货号":
row.Cells["colSelectExtCode"].Value = !row.Cells["colSelectExtCode"].Value.ParseToBool();
lstFilterExtCode = dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
FilterRows();
break;
case "JIT配置":
@@ -1930,7 +1913,7 @@ Content-Disposition: form-data; name=""upload_sign""
var jitParam = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == extCode);
if (jitParam == null)
{
BaseMsgForm.ShowError("配置已删除");
BaseMsgForm.ShowError("配置不存在");
}
else
{
@@ -1969,13 +1952,16 @@ Content-Disposition: form-data; name=""upload_sign""
void FilterRows()
{
var filterExtCodeLst = dgvExtCode.Rows.Cast<DataGridViewRow>()
.Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true)
.Select(r => r.Cells["colFilterExtCode"].Value.ParseToString()).Distinct().ToList();
foreach (DataGridViewRow row in dgvOpenJit.Rows)
{
row.Visible = true;
row.Cells["colCheck"].Value = false;
if (lstFilterExtCode != null && lstFilterExtCode.Count > 0)
if (filterExtCodeLst != null && filterExtCodeLst.Count > 0)
{
if (lstFilterExtCode.Contains(row.Cells["colExtCode"].Value.ParseToString()))
if (filterExtCodeLst.Contains(row.Cells["colExtCode"].Value.ParseToString()))
{
row.Cells["colCheck"].Value = true;
row.Visible = true;
@@ -2040,7 +2026,6 @@ Content-Disposition: form-data; name=""upload_sign""
column.Visible = false;
}
lstFilterExtCode.Clear();
dgvExtCode.Rows.Clear();
this.dgvOpenJit.Rows.Clear();
this.pbLoading.Visible = true;
@@ -2236,22 +2221,15 @@ Content-Disposition: form-data; name=""upload_sign""
BaseMsgForm.ShowInfo(sRst);
this.statusBar.lblTaskStatus.Text = sRst;
var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>()
.Select(r => r.Cells["colExtCode"].Value.ParseToString())
.Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
foreach (var ext in extCodeLst)
{
if (!this.txtBatchExtCode.Text.Split(new string[] { }, StringSplitOptions.RemoveEmptyEntries).Contains(ext))
{
this.txtBatchExtCode.Text += ext + "\r\n";
}
}
//var extCodeLst = this.dgvOpenJit.Rows.Cast<DataGridViewRow>()
// .Select(r => r.Cells["colExtCode"].Value.ParseToString())
// .Where(s => !string.IsNullOrEmpty(s.Trim('-'))).Distinct().ToList();
this.dgvExtCode.Rows.Clear();
foreach (var ext in extCodeLst)
{
this.dgvExtCode.Rows.Add(false, ext);
}
//this.dgvExtCode.Rows.Clear();
//foreach (var ext in extCodeLst)
//{
// this.dgvExtCode.Rows.Add(false, ext);
//}
}));
}, cancellationTokenSource.Token);
}
@@ -2325,15 +2303,18 @@ Content-Disposition: form-data; name=""upload_sign""
return;
}
foreach (var extCode in extCodeLst)
if (BaseMsgForm.ShowConfirm("确定要清除选中货号的JIT配置吗?", "提示").DialogResult == DialogResult.OK)
{
lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
}
NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
BaseMsgForm.ShowInfo("选中货号的JIT配置已重置!");
foreach (var row in rows)
{
row.Cells["colJitConfig"].Value = "未设置";
foreach (var extCode in extCodeLst)
{
lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
}
NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
BaseMsgForm.ShowInfo("选中货号的JIT配置已清除!");
foreach (var row in rows)
{
row.Cells["colJitConfig"].Value = "未设置";
}
}
}
}
@@ -117,15 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="colSelectExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colFilterExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colJitConfig.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelect.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
@@ -213,4 +204,13 @@
<metadata name="colMsg.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colSelectExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colFilterExtCode.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
<metadata name="colJitConfig.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
</metadata>
</root>