调整客户端所有页面支持 店铺id 名称 分组 筛选功能

This commit is contained in:
wule committed 2025-11-24 15:55:06 +08:00
1 parent a23020725a
commit ec170f4285
33 files changed
+1571 -799

No files matched your search

+1 -1
View File
@@ -27,7 +27,7 @@ namespace AllBase
/// <summary>
/// 版本ID
/// </summary>
public static int VersionCount = 687;
public static int VersionCount = 689;
//public static int VersionCount = 613;
/// <summary>
+2 -2
View File
@@ -63,12 +63,12 @@ namespace TemuKJD.Extension
checkBox = new CheckBox();
checkBox.Name = "chk" + column.Name;
}
checkBox.Size = new Size(15, 15);
checkBox.Size = new Size(24, 20);
checkBox.BackColor = Color.Transparent;
checkBox.Enabled = true;
// Reset properties
checkBox.Padding = new Padding(0);
checkBox.Padding = new Padding(6,2,0,0);
checkBox.Margin = new Padding(0);
checkBox.Text = "";
+5 -5
View File
@@ -171,11 +171,11 @@
<Compile Include="KJDForms\AdminForms\AdminProductPriceCheckForm.Designer.cs">
<DependentUpon>AdminProductPriceCheckForm.cs</DependentUpon>
</Compile>
<Compile Include="KJDForms\ProductForms\JoinDeliveryFrom.cs">
<Compile Include="KJDForms\ProductForms\JoinDeliveryForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="KJDForms\ProductForms\JoinDeliveryFrom.Designer.cs">
<DependentUpon>JoinDeliveryFrom.cs</DependentUpon>
<Compile Include="KJDForms\ProductForms\JoinDeliveryForm.Designer.cs">
<DependentUpon>JoinDeliveryForm.cs</DependentUpon>
</Compile>
<Compile Include="KJDForms\ProductForms\ProductChangePriceForm.cs">
<SubType>Form</SubType>
@@ -899,8 +899,8 @@
<EmbeddedResource Include="KJDForms\AdminForms\AdminProductPriceCheckForm.resx">
<DependentUpon>AdminProductPriceCheckForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="KJDForms\ProductForms\JoinDeliveryFrom.resx">
<DependentUpon>JoinDeliveryFrom.cs</DependentUpon>
<EmbeddedResource Include="KJDForms\ProductForms\JoinDeliveryForm.resx">
<DependentUpon>JoinDeliveryForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="KJDForms\ProductForms\ProductChangePriceForm.resx">
<DependentUpon>ProductChangePriceForm.cs</DependentUpon>
+1 -1
View File
@@ -26,7 +26,7 @@ namespace TemuKJD.KJDForms.AdminForms
public Lazy<DbProductSelectListManageForm> dbProductSelectListManageForm = new Lazy<DbProductSelectListManageForm>();
public Lazy<ProductThirdSelectListManageForm> productThirdSelectListManageForm = new Lazy<ProductThirdSelectListManageForm>();
public Lazy<AdminProductPriceCheckForm> adminProductPriceCheckForm = new Lazy<AdminProductPriceCheckForm>();
public Lazy<JoinDeliveryFrom> joinDeliveryFrom = new Lazy<JoinDeliveryFrom>();
public Lazy<JoinDeliveryForm> joinDeliveryFrom = new Lazy<JoinDeliveryForm>();
public Lazy<TemuJitForm> jitForm = new Lazy<TemuJitForm>();
public AdminForm()
@@ -103,7 +103,7 @@ namespace TemuKJD.KJDForms.AdminForms
this.label9 = new System.Windows.Forms.Label();
this.label11 = new System.Windows.Forms.Label();
this.chkSearchAllShop = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkFilterSize = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbShopLoading = new System.Windows.Forms.PictureBox();
@@ -236,7 +236,6 @@ namespace TemuKJD.KJDForms.AdminForms
this.ucGroupBoxEx1.Controls.Add(this.numHeight1);
this.ucGroupBoxEx1.Controls.Add(this.numWidth1);
this.ucGroupBoxEx1.Controls.Add(this.btnMutliOk);
this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime);
this.ucGroupBoxEx1.Controls.Add(this.dtpEndTime);
this.ucGroupBoxEx1.Controls.Add(this.numLen2);
this.ucGroupBoxEx1.Controls.Add(this.dtpStartTime);
@@ -266,7 +265,8 @@ namespace TemuKJD.KJDForms.AdminForms
this.ucGroupBoxEx1.Controls.Add(this.label9);
this.ucGroupBoxEx1.Controls.Add(this.label11);
this.ucGroupBoxEx1.Controls.Add(this.chkSearchAllShop);
this.ucGroupBoxEx1.Controls.Add(this.ucCheckBox1);
this.ucGroupBoxEx1.Controls.Add(this.chkFilterSize);
this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(1480, 140);
@@ -499,7 +499,7 @@ namespace TemuKJD.KJDForms.AdminForms
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(292, 42);
this.label12.Location = new System.Drawing.Point(292, 41);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(44, 17);
this.label12.TabIndex = 954;
@@ -719,17 +719,18 @@ namespace TemuKJD.KJDForms.AdminForms
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSearchTime.Location = new System.Drawing.Point(287, 68);
this.chkSearchTime.Location = new System.Drawing.Point(280, 63);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(15, 14);
this.chkSearchTime.Size = new System.Drawing.Size(63, 21);
this.chkSearchTime.TabIndex = 827;
this.chkSearchTime.Text = "日期:";
this.chkSearchTime.UseVisualStyleBackColor = true;
//
// dtpEndTime
//
this.dtpEndTime.Location = new System.Drawing.Point(303, 86);
this.dtpEndTime.Location = new System.Drawing.Point(326, 86);
this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(206, 23);
this.dtpEndTime.Size = new System.Drawing.Size(183, 23);
this.dtpEndTime.TabIndex = 826;
//
// numLen2
@@ -752,9 +753,9 @@ namespace TemuKJD.KJDForms.AdminForms
//
// dtpStartTime
//
this.dtpStartTime.Location = new System.Drawing.Point(303, 62);
this.dtpStartTime.Location = new System.Drawing.Point(326, 62);
this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(206, 23);
this.dtpStartTime.Size = new System.Drawing.Size(183, 23);
this.dtpStartTime.TabIndex = 825;
//
// numWidth2
@@ -922,9 +923,9 @@ namespace TemuKJD.KJDForms.AdminForms
this.btnSearchPrice.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearchPrice.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearchPrice.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearchPrice.Location = new System.Drawing.Point(287, 110);
this.btnSearchPrice.Location = new System.Drawing.Point(280, 110);
this.btnSearchPrice.Name = "btnSearchPrice";
this.btnSearchPrice.Size = new System.Drawing.Size(68, 23);
this.btnSearchPrice.Size = new System.Drawing.Size(75, 23);
this.btnSearchPrice.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSearchPrice.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSearchPrice.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -1167,16 +1168,16 @@ namespace TemuKJD.KJDForms.AdminForms
this.chkSearchAllShop.Text = "二级超管查询所有店铺";
this.chkSearchAllShop.UseVisualStyleBackColor = true;
//
// ucCheckBox1
// chkFilterSize
//
this.ucCheckBox1.AutoSize = true;
this.ucCheckBox1.Location = new System.Drawing.Point(925, 108);
this.ucCheckBox1.Name = "ucCheckBox1";
this.ucCheckBox1.Size = new System.Drawing.Size(63, 21);
this.ucCheckBox1.TabIndex = 1076;
this.ucCheckBox1.Text = "仅显示";
this.ucCheckBox1.UseVisualStyleBackColor = true;
this.ucCheckBox1.CheckedChanged += new System.EventHandler(this.chkFilterSize_CheckedChanged);
this.chkFilterSize.AutoSize = true;
this.chkFilterSize.Location = new System.Drawing.Point(925, 108);
this.chkFilterSize.Name = "chkFilterSize";
this.chkFilterSize.Size = new System.Drawing.Size(63, 21);
this.chkFilterSize.TabIndex = 1076;
this.chkFilterSize.Text = "仅显示";
this.chkFilterSize.UseVisualStyleBackColor = true;
this.chkFilterSize.CheckedChanged += new System.EventHandler(this.chkFilterSize_CheckedChanged);
//
// splitContainer3
//
@@ -1895,6 +1896,6 @@ namespace TemuKJD.KJDForms.AdminForms
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colFilterRule;
private UserComponent.UcCheckBox ucCheckBox1;
private UserComponent.UcCheckBox chkFilterSize;
}
}
@@ -22,7 +22,7 @@ using Work;
namespace TemuKJD.KJDForms.AdminForms
{
public partial class AdminProductPriceCheckForm : Form
public partial class AdminProductPriceCheckForm : BaseForm
{
PriceCheckConfig priceCheckConfig = null;
List<PriceCheckFilterConfig> lstPriceCheckFilterConfig = new List<PriceCheckFilterConfig>();
@@ -45,6 +45,8 @@ namespace TemuKJD.KJDForms.AdminForms
this.dgvPriceCheck.AddSelectorColumn("colCheck");
this.dgvPriceCheck.AddMergeColumnHeader(new List<string>() { "colOk", "colCancel" }, "同意/拒绝报价");
this.dgvPriceCheck.AddImgColumn("colProductSkcPic", "colImgUrl");
var chkSelectExtCode = this.dgvExtCode.AddSelectorColumn("colSelectExtCode");
chkSelectExtCode.CheckedChanged += ChkSelectExtCode_CheckedChanged;
this.dtpEndTime.Value = DateTime.Now.Date.AddDays(1).AddMilliseconds(-1);
this.dtpStartTime.Value = DateTime.Now.Date.AddDays(-7);
@@ -72,6 +74,10 @@ namespace TemuKJD.KJDForms.AdminForms
this.txtPriceDown.TextChanged += Txt_TextChanged;
this.chkSearchAllShop.CheckedChanged += Txt_TextChanged;
}
private void ChkSelectExtCode_CheckedChanged(object sender, EventArgs e)
{
FilterRows();
}
private void Txt_TextChanged(object sender, EventArgs e)
{
@@ -556,9 +562,11 @@ namespace TemuKJD.KJDForms.AdminForms
}
}
this.chkFilterTitle.Checked = false;
this.dgvPriceCheck.Rows.Clear();
this.dgvExtCode.Rows.Clear();
this.lstCheckPriceInfo.Clear();
this.chkFilterTitle.Checked = false;
this.chkFilterSize.Checked = false;
this.pbLoading.Visible = true;
cancellationTokenSource = new CancellationTokenSource();
Task.Run(() =>
@@ -753,20 +761,6 @@ namespace TemuKJD.KJDForms.AdminForms
dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.White;
else
dgvPriceCheck.Rows[rowId].DefaultCellStyle.BackColor = Color.WhiteSmoke;
var extCodeLst = this.dgvPriceCheck.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)
{
var filterConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == ext);
var pos = this.dgvExtCode.Rows.Add(
false,
ext,
filterConfig == null ? "" : GetConfigDesStr(filterConfig.Symbol, filterConfig.Price1, filterConfig.Price2)
);
}
}));
}
}
@@ -781,6 +775,19 @@ namespace TemuKJD.KJDForms.AdminForms
}
Invoke(new Action(() => {
var extCodeLst = this.dgvPriceCheck.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)
{
var filterConfig = lstPriceCheckFilterConfig.FirstOrDefault(c => c.ExtCode == ext);
var pos = this.dgvExtCode.Rows.Add(
false,
ext,
filterConfig == null ? "" : GetConfigDesStr(filterConfig.Symbol, filterConfig.Price1, filterConfig.Price2)
);
}
this.pbLoading.Visible = false;
string sRst = type + " 查询结束!";
if (cancellationTokenSource.IsCancellationRequested)
@@ -1786,7 +1793,7 @@ namespace TemuKJD.KJDForms.AdminForms
{
}
}
if (ucCheckBox1.Checked)
if (chkFilterSize.Checked)
{
var priceInfo = lstCheckPriceInfo.FirstOrDefault(p => p.productId.ParseToString() == prodId);
if (priceInfo != null)
@@ -1,7 +1,7 @@
namespace TemuKJD.KJDForms.ProductForms
{
partial class JoinDeliveryFrom
partial class JoinDeliveryForm
{
/// <summary>
/// Required designer variable.
@@ -30,12 +30,12 @@ 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 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.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnStart = new DevComponents.DotNetBar.PanelEx();
@@ -225,9 +225,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(227, 81);
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(40, 23);
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -241,7 +241,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnEmpty.TabIndex = 701;
this.btnEmpty.Text = "重置";
this.btnEmpty.Text = "重置查询条件";
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
//
// btnRefreshShop
@@ -251,9 +251,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(163, 81);
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(62, 23);
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -266,43 +266,43 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
this.btnRefreshShop.Text = "刷新/查询";
this.btnRefreshShop.Text = "查询/刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(53, 81);
this.txtNotes.Location = new System.Drawing.Point(75, 65);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(105, 23);
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 388;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(19, 84);
this.label4.Location = new System.Drawing.Point(18, 68);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(44, 17);
this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 389;
this.label4.Text = "分组:";
this.label4.Text = "店铺分组:";
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(53, 53);
this.txtShopName.Location = new System.Drawing.Point(75, 40);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(214, 23);
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 386;
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(53, 25);
this.txtShopId.Location = new System.Drawing.Point(75, 15);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(214, 23);
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 384;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(6, 28);
this.label2.Location = new System.Drawing.Point(29, 18);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(57, 17);
this.label2.TabIndex = 385;
@@ -311,11 +311,11 @@ namespace TemuKJD.KJDForms.ProductForms
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(19, 56);
this.label3.Location = new System.Drawing.Point(18, 43);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(44, 17);
this.label3.Size = new System.Drawing.Size(68, 17);
this.label3.TabIndex = 387;
this.label3.Text = "名称:";
this.label3.Text = "店铺名称:";
//
// splitContainer3
//
@@ -389,18 +389,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle19.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle19;
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)))));
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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle20.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle20.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle20.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle20.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle20.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle20.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle20;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -538,18 +539,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvStock.AllowUserToAddRows = false;
this.dgvStock.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle21.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle21;
this.dgvStock.AutoRowNumber = true;
this.dgvStock.BackgroundColor = System.Drawing.Color.White;
this.dgvStock.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.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle22.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle22.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle22.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle22.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle22.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle22.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle22;
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colUpId,
@@ -661,8 +663,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colProdName
//
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle23;
this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true;
@@ -684,8 +686,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colCreateTime
//
dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle6;
dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCreateTime.DefaultCellStyle = dataGridViewCellStyle24;
this.colCreateTime.HeaderText = "备货单创建时间";
this.colCreateTime.Name = "colCreateTime";
this.colCreateTime.ReadOnly = true;
@@ -814,14 +816,14 @@ namespace TemuKJD.KJDForms.ProductForms
this.label1.TabIndex = 432;
this.label1.Text = "重试间隔(秒)";
//
// JoinDeliveryFrom
// JoinDeliveryForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(1478, 616);
this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "JoinDeliveryFrom";
this.Name = "JoinDeliveryForm";
this.Text = "(抢)加入发货台";
this.Load += new System.EventHandler(this.JoinDeliveryFrom_Load);
this.VisibleChanged += new System.EventHandler(this.JoinDeliveryFrom_VisibleChanged);
@@ -23,7 +23,7 @@ using Work;
namespace TemuKJD.KJDForms.ProductForms
{
public partial class JoinDeliveryFrom : Form
public partial class JoinDeliveryForm : BaseForm
{
JoinDeliveryConfig joinDeliveryConfig = null;
public bool IsAdmin = false;
@@ -34,7 +34,7 @@ namespace TemuKJD.KJDForms.ProductForms
/// </summary>
List<TemuStockInfo> lstStockInfo = new List<TemuStockInfo>();
public JoinDeliveryFrom()
public JoinDeliveryForm()
{
InitializeComponent();
}
@@ -223,17 +223,17 @@ namespace TemuKJD.KJDForms.ProductForms
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text))
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => txtShopId.Text.Contains(s.ShopId)).ToList();
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text))
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => txtShopName.Text.Contains(s.ShopAccount)).ToList();
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text))
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => txtNotes.Text.Contains(s.Notes)).ToList();
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
+141 -45
View File
@@ -30,10 +30,10 @@ namespace TemuKJD.KJDForms.ProductForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
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 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();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.txtScale1 = new System.Windows.Forms.TextBox();
@@ -55,6 +55,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pbLoading = new System.Windows.Forms.PictureBox();
this.dgvAdjust = new TemuKJD.UserComponent.DataGridViewEx();
this.colCheck = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colSupplierId = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -77,7 +78,13 @@ namespace TemuKJD.KJDForms.ProductForms
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.pbLoading = new System.Windows.Forms.PictureBox();
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
this.txtNotes = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.label21 = new System.Windows.Forms.Label();
this.txtShopId = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -94,12 +101,12 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer2.Panel2.SuspendLayout();
this.splitContainer2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.dgvAdjust)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).BeginInit();
this.splitContainer4.Panel1.SuspendLayout();
this.splitContainer4.Panel2.SuspendLayout();
this.splitContainer4.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit();
this.SuspendLayout();
//
// splitContainer1
@@ -133,9 +140,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx3.Controls.Add(this.txtScale1);
this.ucGroupBoxEx3.Controls.Add(this.label10);
this.ucGroupBoxEx3.Controls.Add(this.btnStartStockUp);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(417, 2);
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
this.ucGroupBoxEx3.Size = new System.Drawing.Size(826, 120);
this.ucGroupBoxEx3.Size = new System.Drawing.Size(691, 120);
this.ucGroupBoxEx3.TabIndex = 666;
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "拒绝跟价";
@@ -189,7 +196,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx2.Controls.Add(this.chkHasSuccess);
this.ucGroupBoxEx2.Controls.Add(this.btnSearchPrice);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
this.ucGroupBoxEx2.TabIndex = 469;
@@ -238,9 +245,16 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
this.ucGroupBoxEx1.Controls.Add(this.label14);
this.ucGroupBoxEx1.Controls.Add(this.txtShopName);
this.ucGroupBoxEx1.Controls.Add(this.label21);
this.ucGroupBoxEx1.Controls.Add(this.txtShopId);
this.ucGroupBoxEx1.Controls.Add(this.label22);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(144, 120);
this.ucGroupBoxEx1.Size = new System.Drawing.Size(280, 120);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "基础";
@@ -252,9 +266,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(17, 31);
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(110, 24);
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -267,7 +281,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
this.btnRefreshShop.Text = "刷新店铺";
this.btnRefreshShop.Text = "查询/刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// splitContainer3
@@ -314,18 +328,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
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)))));
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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -411,22 +426,35 @@ namespace TemuKJD.KJDForms.ProductForms
this.colMessage.Name = "colMessage";
this.colMessage.ReadOnly = true;
//
// pbLoading
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
this.pbLoading.Location = new System.Drawing.Point(388, 196);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pbLoading.TabIndex = 188;
this.pbLoading.TabStop = false;
this.pbLoading.Visible = false;
//
// dgvAdjust
//
this.dgvAdjust.AllowUserToAddRows = false;
this.dgvAdjust.AllowUserToDeleteRows = false;
dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvAdjust.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvAdjust.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvAdjust.AutoRowNumber = true;
this.dgvAdjust.BackgroundColor = System.Drawing.Color.White;
this.dgvAdjust.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvAdjust.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
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.dgvAdjust.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvAdjust.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvAdjust.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -664,17 +692,77 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnClear.Text = "清空结果";
this.btnClear.Visible = false;
//
// pbLoading
// btnEmpty
//
this.pbLoading.Anchor = System.Windows.Forms.AnchorStyles.None;
this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue;
this.pbLoading.Location = new System.Drawing.Point(388, 196);
this.pbLoading.Name = "pbLoading";
this.pbLoading.Size = new System.Drawing.Size(50, 50);
this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
this.pbLoading.TabIndex = 188;
this.pbLoading.TabStop = false;
this.pbLoading.Visible = false;
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnEmpty.Style.GradientAngle = 90;
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnEmpty.TabIndex = 715;
this.btnEmpty.Text = "重置查询条件";
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(75, 65);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 713;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(18, 68);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(68, 17);
this.label14.TabIndex = 714;
this.label14.Text = "店铺分组:";
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(75, 40);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 711;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(18, 43);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(68, 17);
this.label21.TabIndex = 712;
this.label21.Text = "店铺名称:";
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(75, 15);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 709;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(29, 18);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(57, 17);
this.label22.TabIndex = 710;
this.label22.Text = "店铺ID:";
//
// PriceManageForm
//
@@ -696,6 +784,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx2.ResumeLayout(false);
this.ucGroupBoxEx2.PerformLayout();
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
@@ -705,12 +794,12 @@ namespace TemuKJD.KJDForms.ProductForms
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.dgvShop)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.dgvAdjust)).EndInit();
this.splitContainer4.Panel1.ResumeLayout(false);
this.splitContainer4.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
this.splitContainer4.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit();
this.ResumeLayout(false);
}
@@ -761,5 +850,12 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.PictureBox pbLoading;
private DevComponents.DotNetBar.PanelEx btnEmpty;
private System.Windows.Forms.TextBox txtNotes;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.TextBox txtShopId;
private System.Windows.Forms.Label label22;
}
}
@@ -36,7 +36,7 @@ namespace TemuKJD.KJDForms.ProductForms
{
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
this.dgvAdjust.AddSelectorColumn("colCheck");
@@ -77,16 +77,31 @@ namespace TemuKJD.KJDForms.ProductForms
// 店铺Id
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
=> !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
// 更新被删除的店铺列表
foreach (var row in dgvRowList)
{
dgvShop.Rows.Remove(row);
}
// 绑定其他店铺(含新导入的店铺)
foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
foreach (ShopLoginInfo shopEntity in shopLst)
{
if (!string.IsNullOrEmpty(shopEntity.ShopId))
BindShop(shopEntity, selectIds);
@@ -686,5 +701,10 @@ namespace TemuKJD.KJDForms.ProductForms
{
ShowDgvImg();
}
private void btnEmpty_Click(object sender, EventArgs e)
{
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
}
}
}
+1 -1
View File
@@ -27,7 +27,7 @@ namespace TemuKJD.KJDForms.ProductForms
public Lazy<MarketingActivityForm> marketingActivityForm = new Lazy<MarketingActivityForm>();
public Lazy<PurchasePriceForm> purchasePriceForm = new Lazy<PurchasePriceForm>();
public Lazy<TemuAdsForm> temuAdsForm = new Lazy<TemuAdsForm>();
public Lazy<JoinDeliveryFrom> joinDeliveryFrom = new Lazy<JoinDeliveryFrom>();
public Lazy<JoinDeliveryForm> joinDeliveryFrom = new Lazy<JoinDeliveryForm>();
public Lazy<TemuJitForm> temuJitForm = new Lazy<TemuJitForm>();
public ProductForm()
@@ -21,7 +21,7 @@ using TemuKJD.BLL;
namespace TemuKJD.KJDForms.ProductForms
{
public partial class PurchasePriceForm : Form
public partial class PurchasePriceForm : BaseForm
{
private CheckBox chkSelectAll = null;
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
@@ -37,7 +37,7 @@ namespace TemuKJD.KJDForms.ProductForms
{
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
this.dgvProduct.AddSelectorColumn("colCheck");
+172 -96
View File
@@ -30,11 +30,11 @@ 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();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.txtMaxQualityRate = new System.Windows.Forms.TextBox();
@@ -65,12 +65,17 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucCheckBox1 = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnCancelSubPurchaseOrder = new DevComponents.DotNetBar.PanelEx();
this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.chkHasCreate = new System.Windows.Forms.CheckBox();
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
this.panelEx2 = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
this.txtNotes = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.label21 = new System.Windows.Forms.Label();
this.txtShopId = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.txtPid = new System.Windows.Forms.TextBox();
@@ -79,6 +84,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.label4 = new System.Windows.Forms.Label();
this.txtParentStockid = new System.Windows.Forms.TextBox();
this.btnStop = new DevComponents.DotNetBar.PanelEx();
this.chkHasCreate = new System.Windows.Forms.CheckBox();
this.label1 = new System.Windows.Forms.Label();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
@@ -164,7 +170,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.panel4.SuspendLayout();
this.flowLayoutPanel1.SuspendLayout();
this.ucGroupBoxEx3.SuspendLayout();
this.ucGroupBoxEx2.SuspendLayout();
this.ucGroupBoxEx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).BeginInit();
this.splitContainer3.Panel1.SuspendLayout();
@@ -201,7 +206,6 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx4);
this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx3);
this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx2);
this.splitContainer1.Panel1.Controls.Add(this.ucGroupBoxEx1);
//
// splitContainer1.Panel2
@@ -465,7 +469,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.panelEx3.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx3.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.panelEx3.TabIndex = 664;
this.panelEx3.Text = "停止";
this.panelEx3.Text = "停止读取/备货";
this.panelEx3.Visible = false;
this.panelEx3.Click += new System.EventHandler(this.btnStop_Click);
//
@@ -585,13 +589,14 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx3.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx3.Controls.Add(this.btnCancelSubPurchaseOrder);
this.ucGroupBoxEx3.Controls.Add(this.btnSearch);
this.ucGroupBoxEx3.Controls.Add(this.panelEx2);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
this.ucGroupBoxEx3.Size = new System.Drawing.Size(135, 120);
this.ucGroupBoxEx3.TabIndex = 665;
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "取消待创建";
this.ucGroupBoxEx3.Text = "读取/取消待创建";
//
// btnCancelSubPurchaseOrder
//
@@ -599,7 +604,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnCancelSubPurchaseOrder.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCancelSubPurchaseOrder.DisabledBackColor = System.Drawing.Color.Empty;
this.btnCancelSubPurchaseOrder.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancelSubPurchaseOrder.Location = new System.Drawing.Point(32, 32);
this.btnCancelSubPurchaseOrder.Location = new System.Drawing.Point(32, 54);
this.btnCancelSubPurchaseOrder.Name = "btnCancelSubPurchaseOrder";
this.btnCancelSubPurchaseOrder.Size = new System.Drawing.Size(70, 23);
this.btnCancelSubPurchaseOrder.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -617,64 +622,13 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnCancelSubPurchaseOrder.Text = "取消待创建";
this.btnCancelSubPurchaseOrder.Click += new System.EventHandler(this.btnCancelSubPurchaseOrder_Click);
//
// panelEx2
//
this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control;
this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
this.panelEx2.Location = new System.Drawing.Point(32, 71);
this.panelEx2.Name = "panelEx2";
this.panelEx2.Size = new System.Drawing.Size(70, 23);
this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.panelEx2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.panelEx2.Style.GradientAngle = 90;
this.panelEx2.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx2.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.panelEx2.TabIndex = 405;
this.panelEx2.Text = "停止";
this.panelEx2.Visible = false;
this.panelEx2.Click += new System.EventHandler(this.btnStop_Click);
//
// ucGroupBoxEx2
//
this.ucGroupBoxEx2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx2.Controls.Add(this.chkHasCreate);
this.ucGroupBoxEx2.Controls.Add(this.btnSearch);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
this.ucGroupBoxEx2.TabIndex = 469;
this.ucGroupBoxEx2.TabStop = false;
this.ucGroupBoxEx2.Text = "读取待创建";
//
// chkHasCreate
//
this.chkHasCreate.AutoSize = true;
this.chkHasCreate.Location = new System.Drawing.Point(16, 73);
this.chkHasCreate.Name = "chkHasCreate";
this.chkHasCreate.Size = new System.Drawing.Size(111, 21);
this.chkHasCreate.TabIndex = 658;
this.chkHasCreate.Text = "测试读取已送货";
this.chkHasCreate.UseVisualStyleBackColor = true;
this.chkHasCreate.Visible = false;
//
// btnSearch
//
this.btnSearch.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnSearch.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearch.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearch.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearch.Location = new System.Drawing.Point(30, 32);
this.btnSearch.Location = new System.Drawing.Point(32, 26);
this.btnSearch.Name = "btnSearch";
this.btnSearch.Size = new System.Drawing.Size(70, 23);
this.btnSearch.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -692,20 +646,75 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSearch.Text = "读取待创建";
this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
//
// panelEx2
//
this.panelEx2.CanvasColor = System.Drawing.SystemColors.Control;
this.panelEx2.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
this.panelEx2.Location = new System.Drawing.Point(32, 82);
this.panelEx2.Name = "panelEx2";
this.panelEx2.Size = new System.Drawing.Size(70, 23);
this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.panelEx2.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.panelEx2.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx2.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.panelEx2.Style.GradientAngle = 90;
this.panelEx2.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx2.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.panelEx2.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx2.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.panelEx2.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.panelEx2.TabIndex = 405;
this.panelEx2.Text = "停止";
this.panelEx2.Click += new System.EventHandler(this.btnStop_Click);
//
// ucGroupBoxEx1
//
this.ucGroupBoxEx1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
this.ucGroupBoxEx1.Controls.Add(this.label14);
this.ucGroupBoxEx1.Controls.Add(this.txtShopName);
this.ucGroupBoxEx1.Controls.Add(this.label21);
this.ucGroupBoxEx1.Controls.Add(this.txtShopId);
this.ucGroupBoxEx1.Controls.Add(this.label22);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(144, 120);
this.ucGroupBoxEx1.Size = new System.Drawing.Size(280, 120);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "基础";
//
// btnEmpty
//
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnEmpty.Style.GradientAngle = 90;
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnEmpty.TabIndex = 705;
this.btnEmpty.Text = "重置查询条件";
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
//
// btnRefreshShop
//
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -713,9 +722,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(17, 31);
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(110, 24);
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -728,9 +737,57 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
this.btnRefreshShop.Text = "刷新店铺";
this.btnRefreshShop.Text = "查询/刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(75, 65);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 507;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(18, 68);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(68, 17);
this.label14.TabIndex = 508;
this.label14.Text = "店铺分组:";
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(75, 40);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 505;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(18, 43);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(68, 17);
this.label21.TabIndex = 506;
this.label21.Text = "店铺名称:";
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(75, 15);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 503;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(29, 18);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(57, 17);
this.label22.TabIndex = 504;
this.label22.Text = "店铺ID:";
//
// splitContainer3
//
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -765,6 +822,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.splitContainer2.Panel1.Controls.Add(this.label4);
this.splitContainer2.Panel1.Controls.Add(this.txtParentStockid);
this.splitContainer2.Panel1.Controls.Add(this.btnStop);
this.splitContainer2.Panel1.Controls.Add(this.chkHasCreate);
this.splitContainer2.Panel1.Controls.Add(this.label1);
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
@@ -827,7 +885,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnStop.Location = new System.Drawing.Point(43, 131);
this.btnStop.Location = new System.Drawing.Point(31, 134);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(70, 23);
this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -847,6 +905,17 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnStop.Visible = false;
this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
//
// chkHasCreate
//
this.chkHasCreate.AutoSize = true;
this.chkHasCreate.Location = new System.Drawing.Point(31, 165);
this.chkHasCreate.Name = "chkHasCreate";
this.chkHasCreate.Size = new System.Drawing.Size(111, 21);
this.chkHasCreate.TabIndex = 658;
this.chkHasCreate.Text = "测试读取已送货";
this.chkHasCreate.UseVisualStyleBackColor = true;
this.chkHasCreate.Visible = false;
//
// label1
//
this.label1.AutoSize = true;
@@ -861,18 +930,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
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)))));
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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1459,18 +1529,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvStock.AllowUserToAddRows = false;
this.dgvStock.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
this.dgvStock.AutoRowNumber = true;
this.dgvStock.BackgroundColor = System.Drawing.Color.White;
this.dgvStock.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.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colUpId,
@@ -1592,8 +1663,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colProdName
//
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle10;
this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true;
@@ -1798,9 +1869,8 @@ namespace TemuKJD.KJDForms.ProductForms
this.flowLayoutPanel1.ResumeLayout(false);
this.flowLayoutPanel1.PerformLayout();
this.ucGroupBoxEx3.ResumeLayout(false);
this.ucGroupBoxEx2.ResumeLayout(false);
this.ucGroupBoxEx2.PerformLayout();
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
@@ -1874,7 +1944,6 @@ namespace TemuKJD.KJDForms.ProductForms
private DevComponents.DotNetBar.PanelEx btnAdd;
private DevComponents.DotNetBar.PanelEx btnStopAdd;
private System.Windows.Forms.CheckBox chkLimited;
private UserComponent.UcGroupBoxEx ucGroupBoxEx2;
private System.Windows.Forms.TextBox txtStockid;
private System.Windows.Forms.Label label4;
private DevComponents.DotNetBar.PanelEx btnSearch;
@@ -1956,5 +2025,12 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private System.Windows.Forms.TextBox txtNotes;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.TextBox txtShopId;
private System.Windows.Forms.Label label22;
private DevComponents.DotNetBar.PanelEx btnEmpty;
}
}
@@ -54,7 +54,7 @@ namespace TemuKJD.KJDForms.ProductForms
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
this.dgvStock.AddSelectorColumn("colCheck");
@@ -96,16 +96,31 @@ namespace TemuKJD.KJDForms.ProductForms
// 店铺Id
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
=> !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
// 更新被删除的店铺列表
foreach (var row in dgvRowList)
{
dgvShop.Rows.Remove(row);
}
// 绑定其他店铺(含新导入的店铺)
foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
foreach (ShopLoginInfo shopEntity in shopLst)
{
if (!string.IsNullOrEmpty(shopEntity.ShopId))
BindShop(shopEntity, selectIds);
@@ -190,7 +205,7 @@ namespace TemuKJD.KJDForms.ProductForms
}
string searchText = txtStockid.Text.Trim();
ucGroupBoxEx2.Enabled = false;
//ucGroupBoxEx2.Enabled = false;
ucGroupBoxEx3.Enabled = false;
ucGroupBoxEx4.Enabled = false;
@@ -358,7 +373,7 @@ namespace TemuKJD.KJDForms.ProductForms
}
Invoke(new Action(() =>
{
ucGroupBoxEx2.Enabled = true;
//ucGroupBoxEx2.Enabled = true;
ucGroupBoxEx3.Enabled = true;
ucGroupBoxEx4.Enabled = true;
string sRst = "查询结束!";
@@ -594,7 +609,7 @@ namespace TemuKJD.KJDForms.ProductForms
Invoke(new Action(() =>
{
ucGroupBoxEx2.Enabled = true;
//ucGroupBoxEx2.Enabled = true;
ucGroupBoxEx3.Enabled = true;
ucGroupBoxEx4.Enabled = true;
}));
@@ -626,7 +641,7 @@ namespace TemuKJD.KJDForms.ProductForms
}
string searchText = txtStockid.Text.Trim();
ucGroupBoxEx2.Enabled = false;
//ucGroupBoxEx2.Enabled = false;
ucGroupBoxEx3.Enabled = false;
ucGroupBoxEx4.Enabled = false;
@@ -722,7 +737,7 @@ namespace TemuKJD.KJDForms.ProductForms
}
Invoke(new Action(() =>
{
ucGroupBoxEx2.Enabled = true;
//ucGroupBoxEx2.Enabled = true;
ucGroupBoxEx3.Enabled = true;
ucGroupBoxEx4.Enabled = true;
string sRst = "操作结束(取消待创建)!";
@@ -772,7 +787,7 @@ namespace TemuKJD.KJDForms.ProductForms
}
string searchText = txtStockid.Text.Trim();
ucGroupBoxEx2.Enabled = false;
//ucGroupBoxEx2.Enabled = false;
ucGroupBoxEx3.Enabled = false;
ucGroupBoxEx4.Enabled = false;
@@ -1040,7 +1055,7 @@ namespace TemuKJD.KJDForms.ProductForms
}
Invoke(new Action(() =>
{
ucGroupBoxEx2.Enabled = true;
//ucGroupBoxEx2.Enabled = true;
ucGroupBoxEx3.Enabled = true;
ucGroupBoxEx4.Enabled = true;
string sRst = "查询结束!";
@@ -1064,7 +1079,7 @@ namespace TemuKJD.KJDForms.ProductForms
return;
}
ucGroupBoxEx2.Enabled = false;
//ucGroupBoxEx2.Enabled = false;
ucGroupBoxEx3.Enabled = false;
ucGroupBoxEx4.Enabled = false;
@@ -1243,7 +1258,7 @@ namespace TemuKJD.KJDForms.ProductForms
}
Invoke(new Action(() =>
{
ucGroupBoxEx2.Enabled = true;
//ucGroupBoxEx2.Enabled = true;
ucGroupBoxEx3.Enabled = true;
ucGroupBoxEx4.Enabled = true;
string sRst = "操作结束(创建备货单)!";
@@ -1333,5 +1348,10 @@ namespace TemuKJD.KJDForms.ProductForms
label102.Text = "近7日加购大于7日平均销量,7日平均 ×";
}
}
private void btnEmpty_Click(object sender, EventArgs e)
{
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
}
}
}
+150 -54
View File
@@ -70,8 +70,15 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkToday = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.btnSearchAds = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
this.txtNotes = new System.Windows.Forms.TextBox();
this.btnCheckAdsLogin = new DevComponents.DotNetBar.PanelEx();
this.label6 = new System.Windows.Forms.Label();
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
this.txtShopName = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
this.txtShopId = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbLoading2 = new System.Windows.Forms.PictureBox();
@@ -86,6 +93,8 @@ namespace TemuKJD.KJDForms.ProductForms
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.gbxSoloChangeRoas = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.lblShopId = new System.Windows.Forms.Label();
this.lblGoodsId = new System.Windows.Forms.Label();
this.txtCalculateProfitRate2 = new System.Windows.Forms.TextBox();
this.btnCancelSoloChangeRoas = new DevComponents.DotNetBar.PanelEx();
this.lblCalculateRoasPercentSign2 = new System.Windows.Forms.Label();
@@ -134,8 +143,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.lblGoodsId = new System.Windows.Forms.Label();
this.lblShopId = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -212,16 +219,16 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx3.Controls.Add(this.btnAddAds);
this.ucGroupBoxEx3.Controls.Add(this.btnEdit);
this.ucGroupBoxEx3.Controls.Add(this.label5);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(417, 2);
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
this.ucGroupBoxEx3.Size = new System.Drawing.Size(1156, 120);
this.ucGroupBoxEx3.Size = new System.Drawing.Size(1021, 120);
this.ucGroupBoxEx3.TabIndex = 666;
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "直通车推广";
//
// txtSelectFilter
//
this.txtSelectFilter.Location = new System.Drawing.Point(738, 82);
this.txtSelectFilter.Location = new System.Drawing.Point(717, 82);
this.txtSelectFilter.Name = "txtSelectFilter";
this.txtSelectFilter.Size = new System.Drawing.Size(42, 23);
this.txtSelectFilter.TabIndex = 514;
@@ -230,7 +237,7 @@ namespace TemuKJD.KJDForms.ProductForms
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(624, 85);
this.label4.Location = new System.Drawing.Point(603, 85);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(116, 17);
this.label4.TabIndex = 515;
@@ -242,7 +249,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSelectFilter.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSelectFilter.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSelectFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSelectFilter.Location = new System.Drawing.Point(813, 82);
this.btnSelectFilter.Location = new System.Drawing.Point(792, 82);
this.btnSelectFilter.Name = "btnSelectFilter";
this.btnSelectFilter.Size = new System.Drawing.Size(38, 23);
this.btnSelectFilter.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -267,7 +274,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnContinueAds.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnContinueAds.DisabledBackColor = System.Drawing.Color.Empty;
this.btnContinueAds.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnContinueAds.Location = new System.Drawing.Point(741, 32);
this.btnContinueAds.Location = new System.Drawing.Point(614, 32);
this.btnContinueAds.Name = "btnContinueAds";
this.btnContinueAds.Size = new System.Drawing.Size(110, 23);
this.btnContinueAds.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -292,7 +299,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnPauseAds.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnPauseAds.DisabledBackColor = System.Drawing.Color.Empty;
this.btnPauseAds.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPauseAds.Location = new System.Drawing.Point(625, 32);
this.btnPauseAds.Location = new System.Drawing.Point(498, 32);
this.btnPauseAds.Name = "btnPauseAds";
this.btnPauseAds.Size = new System.Drawing.Size(110, 23);
this.btnPauseAds.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -312,7 +319,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtBudget
//
this.txtBudget.Location = new System.Drawing.Point(212, 25);
this.txtBudget.Location = new System.Drawing.Point(191, 25);
this.txtBudget.Name = "txtBudget";
this.txtBudget.Size = new System.Drawing.Size(43, 23);
this.txtBudget.TabIndex = 441;
@@ -322,7 +329,7 @@ namespace TemuKJD.KJDForms.ProductForms
// lblBudget
//
this.lblBudget.AutoSize = true;
this.lblBudget.Location = new System.Drawing.Point(255, 28);
this.lblBudget.Location = new System.Drawing.Point(234, 28);
this.lblBudget.Name = "lblBudget";
this.lblBudget.Size = new System.Drawing.Size(20, 17);
this.lblBudget.TabIndex = 477;
@@ -331,7 +338,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtCalculateProfitRate
//
this.txtCalculateProfitRate.Location = new System.Drawing.Point(253, 82);
this.txtCalculateProfitRate.Location = new System.Drawing.Point(232, 82);
this.txtCalculateProfitRate.Name = "txtCalculateProfitRate";
this.txtCalculateProfitRate.Size = new System.Drawing.Size(32, 23);
this.txtCalculateProfitRate.TabIndex = 465;
@@ -341,7 +348,7 @@ namespace TemuKJD.KJDForms.ProductForms
// lblCalculateRoasPercentSign
//
this.lblCalculateRoasPercentSign.AutoSize = true;
this.lblCalculateRoasPercentSign.Location = new System.Drawing.Point(284, 85);
this.lblCalculateRoasPercentSign.Location = new System.Drawing.Point(263, 85);
this.lblCalculateRoasPercentSign.Name = "lblCalculateRoasPercentSign";
this.lblCalculateRoasPercentSign.Size = new System.Drawing.Size(315, 17);
this.lblCalculateRoasPercentSign.TabIndex = 467;
@@ -351,7 +358,7 @@ namespace TemuKJD.KJDForms.ProductForms
// lblCalculateRoas
//
this.lblCalculateRoas.AutoSize = true;
this.lblCalculateRoas.Location = new System.Drawing.Point(186, 85);
this.lblCalculateRoas.Location = new System.Drawing.Point(165, 85);
this.lblCalculateRoas.Name = "lblCalculateRoas";
this.lblCalculateRoas.Size = new System.Drawing.Size(68, 17);
this.lblCalculateRoas.TabIndex = 466;
@@ -360,7 +367,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtSameRoas
//
this.txtSameRoas.Location = new System.Drawing.Point(143, 82);
this.txtSameRoas.Location = new System.Drawing.Point(122, 82);
this.txtSameRoas.Name = "txtSameRoas";
this.txtSameRoas.Size = new System.Drawing.Size(32, 23);
this.txtSameRoas.TabIndex = 452;
@@ -369,7 +376,7 @@ namespace TemuKJD.KJDForms.ProductForms
// lblSameRoas
//
this.lblSameRoas.AutoSize = true;
this.lblSameRoas.Location = new System.Drawing.Point(104, 85);
this.lblSameRoas.Location = new System.Drawing.Point(83, 85);
this.lblSameRoas.Name = "lblSameRoas";
this.lblSameRoas.Size = new System.Drawing.Size(41, 17);
this.lblSameRoas.TabIndex = 464;
@@ -378,7 +385,7 @@ namespace TemuKJD.KJDForms.ProductForms
// chkCalculateRoas
//
this.chkCalculateRoas.AutoSize = true;
this.chkCalculateRoas.Location = new System.Drawing.Point(189, 58);
this.chkCalculateRoas.Location = new System.Drawing.Point(168, 58);
this.chkCalculateRoas.Name = "chkCalculateRoas";
this.chkCalculateRoas.Size = new System.Drawing.Size(263, 21);
this.chkCalculateRoas.TabIndex = 463;
@@ -391,7 +398,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkSameRoas.AutoSize = true;
this.chkSameRoas.Checked = true;
this.chkSameRoas.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSameRoas.Location = new System.Drawing.Point(108, 58);
this.chkSameRoas.Location = new System.Drawing.Point(87, 58);
this.chkSameRoas.Name = "chkSameRoas";
this.chkSameRoas.Size = new System.Drawing.Size(75, 21);
this.chkSameRoas.TabIndex = 462;
@@ -402,7 +409,7 @@ namespace TemuKJD.KJDForms.ProductForms
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(34, 60);
this.label2.Location = new System.Drawing.Point(13, 60);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(80, 17);
this.label2.TabIndex = 451;
@@ -411,7 +418,7 @@ namespace TemuKJD.KJDForms.ProductForms
// chkLimitValue
//
this.chkLimitValue.AutoSize = true;
this.chkLimitValue.Location = new System.Drawing.Point(155, 26);
this.chkLimitValue.Location = new System.Drawing.Point(134, 26);
this.chkLimitValue.Name = "chkLimitValue";
this.chkLimitValue.Size = new System.Drawing.Size(63, 21);
this.chkLimitValue.TabIndex = 440;
@@ -424,7 +431,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkNoLimit.AutoSize = true;
this.chkNoLimit.Checked = true;
this.chkNoLimit.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkNoLimit.Location = new System.Drawing.Point(108, 26);
this.chkNoLimit.Location = new System.Drawing.Point(87, 26);
this.chkNoLimit.Name = "chkNoLimit";
this.chkNoLimit.Size = new System.Drawing.Size(51, 21);
this.chkNoLimit.TabIndex = 439;
@@ -435,7 +442,7 @@ namespace TemuKJD.KJDForms.ProductForms
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(34, 28);
this.label1.Location = new System.Drawing.Point(13, 28);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(80, 17);
this.label1.TabIndex = 438;
@@ -448,7 +455,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnDelAds.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnDelAds.DisabledBackColor = System.Drawing.Color.Empty;
this.btnDelAds.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelAds.Location = new System.Drawing.Point(857, 32);
this.btnDelAds.Location = new System.Drawing.Point(730, 32);
this.btnDelAds.Name = "btnDelAds";
this.btnDelAds.Size = new System.Drawing.Size(110, 23);
this.btnDelAds.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -473,7 +480,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnAddAds.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnAddAds.DisabledBackColor = System.Drawing.Color.Empty;
this.btnAddAds.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddAds.Location = new System.Drawing.Point(1007, 32);
this.btnAddAds.Location = new System.Drawing.Point(872, 32);
this.btnAddAds.Name = "btnAddAds";
this.btnAddAds.Size = new System.Drawing.Size(132, 23);
this.btnAddAds.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -498,7 +505,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnEdit.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnEdit.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEdit.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnEdit.Location = new System.Drawing.Point(1007, 61);
this.btnEdit.Location = new System.Drawing.Point(872, 61);
this.btnEdit.Name = "btnEdit";
this.btnEdit.Size = new System.Drawing.Size(132, 23);
this.btnEdit.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -519,7 +526,7 @@ namespace TemuKJD.KJDForms.ProductForms
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(781, 85);
this.label5.Location = new System.Drawing.Point(760, 85);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(32, 17);
this.label5.TabIndex = 534;
@@ -536,7 +543,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx2.Controls.Add(this.chkYesterday);
this.ucGroupBoxEx2.Controls.Add(this.chkToday);
this.ucGroupBoxEx2.Controls.Add(this.btnSearchAds);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
this.ucGroupBoxEx2.TabIndex = 469;
@@ -619,15 +626,53 @@ namespace TemuKJD.KJDForms.ProductForms
| System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
this.ucGroupBoxEx1.Controls.Add(this.btnCheckAdsLogin);
this.ucGroupBoxEx1.Controls.Add(this.label6);
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(3, 2);
this.ucGroupBoxEx1.Controls.Add(this.txtShopName);
this.ucGroupBoxEx1.Controls.Add(this.label8);
this.ucGroupBoxEx1.Controls.Add(this.txtShopId);
this.ucGroupBoxEx1.Controls.Add(this.label7);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(144, 120);
this.ucGroupBoxEx1.Size = new System.Drawing.Size(280, 120);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "基础";
//
// btnEmpty
//
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(223, 90);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(38, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnEmpty.Style.GradientAngle = 90;
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnEmpty.TabIndex = 701;
this.btnEmpty.Text = "重置";
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(75, 65);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 501;
//
// btnCheckAdsLogin
//
this.btnCheckAdsLogin.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -635,9 +680,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnCheckAdsLogin.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnCheckAdsLogin.DisabledBackColor = System.Drawing.Color.Empty;
this.btnCheckAdsLogin.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCheckAdsLogin.Location = new System.Drawing.Point(17, 71);
this.btnCheckAdsLogin.Location = new System.Drawing.Point(19, 90);
this.btnCheckAdsLogin.Name = "btnCheckAdsLogin";
this.btnCheckAdsLogin.Size = new System.Drawing.Size(110, 24);
this.btnCheckAdsLogin.Size = new System.Drawing.Size(102, 23);
this.btnCheckAdsLogin.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnCheckAdsLogin.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnCheckAdsLogin.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -653,6 +698,15 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnCheckAdsLogin.Text = "检测直通车状态";
this.btnCheckAdsLogin.Click += new System.EventHandler(this.btnCheckAdsLogin_Click);
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(18, 68);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(68, 17);
this.label6.TabIndex = 502;
this.label6.Text = "店铺分组:";
//
// btnRefreshShop
//
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -660,9 +714,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(17, 31);
this.btnRefreshShop.Location = new System.Drawing.Point(123, 90);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(110, 24);
this.btnRefreshShop.Size = new System.Drawing.Size(98, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -675,9 +729,41 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
this.btnRefreshShop.Text = "刷新店铺";
this.btnRefreshShop.Text = "查询/刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(75, 40);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 499;
//
// label8
//
this.label8.AutoSize = true;
this.label8.Location = new System.Drawing.Point(18, 43);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(68, 17);
this.label8.TabIndex = 500;
this.label8.Text = "店铺名称:";
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(75, 15);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 497;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(29, 18);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(57, 17);
this.label7.TabIndex = 498;
this.label7.Text = "店铺ID:";
//
// splitContainer3
//
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -739,6 +825,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
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)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -866,6 +953,26 @@ namespace TemuKJD.KJDForms.ProductForms
this.gbxSoloChangeRoas.Text = "修改目标回报率";
this.gbxSoloChangeRoas.Visible = false;
//
// lblShopId
//
this.lblShopId.AutoSize = true;
this.lblShopId.Location = new System.Drawing.Point(108, 23);
this.lblShopId.Name = "lblShopId";
this.lblShopId.Size = new System.Drawing.Size(49, 17);
this.lblShopId.TabIndex = 691;
this.lblShopId.Text = "shopId";
this.lblShopId.Visible = false;
//
// lblGoodsId
//
this.lblGoodsId.AutoSize = true;
this.lblGoodsId.Location = new System.Drawing.Point(27, 23);
this.lblGoodsId.Name = "lblGoodsId";
this.lblGoodsId.Size = new System.Drawing.Size(58, 17);
this.lblGoodsId.TabIndex = 690;
this.lblGoodsId.Text = "goodsId";
this.lblGoodsId.Visible = false;
//
// txtCalculateProfitRate2
//
this.txtCalculateProfitRate2.Location = new System.Drawing.Point(175, 67);
@@ -1012,6 +1119,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.dgvAds.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvAds.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvAds.AutoRowNumber = true;
this.dgvAds.BackgroundColor = System.Drawing.Color.White;
this.dgvAds.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
@@ -1392,26 +1500,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnClear.Text = "清空结果";
this.btnClear.Visible = false;
//
// lblGoodsId
//
this.lblGoodsId.AutoSize = true;
this.lblGoodsId.Location = new System.Drawing.Point(27, 23);
this.lblGoodsId.Name = "lblGoodsId";
this.lblGoodsId.Size = new System.Drawing.Size(58, 17);
this.lblGoodsId.TabIndex = 690;
this.lblGoodsId.Text = "goodsId";
this.lblGoodsId.Visible = false;
//
// lblShopId
//
this.lblShopId.AutoSize = true;
this.lblShopId.Location = new System.Drawing.Point(108, 23);
this.lblShopId.Name = "lblShopId";
this.lblShopId.Size = new System.Drawing.Size(49, 17);
this.lblShopId.TabIndex = 691;
this.lblShopId.Text = "shopId";
this.lblShopId.Visible = false;
//
// TemuAdsForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1432,6 +1520,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx2.ResumeLayout(false);
this.ucGroupBoxEx2.PerformLayout();
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
@@ -1554,5 +1643,12 @@ namespace TemuKJD.KJDForms.ProductForms
private UserComponent.UcCheckBox chkSameRoas2;
private System.Windows.Forms.Label lblShopId;
private System.Windows.Forms.Label lblGoodsId;
private System.Windows.Forms.TextBox txtNotes;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox txtShopId;
private DevComponents.DotNetBar.PanelEx btnEmpty;
}
}
+23 -3
View File
@@ -47,7 +47,7 @@ namespace TemuKJD.KJDForms.ProductForms
{
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
this.dgvAds.AddSelectorColumn("colCheck");
@@ -98,16 +98,31 @@ namespace TemuKJD.KJDForms.ProductForms
// 店铺Id
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
=> !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
// 更新被删除的店铺列表
foreach (var row in dgvRowList)
{
dgvShop.Rows.Remove(row);
}
// 绑定其他店铺(含新导入的店铺)
foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
foreach (ShopLoginInfo shopEntity in shopLst)
{
if (!string.IsNullOrEmpty(shopEntity.ShopId))
BindShop(shopEntity, selectIds);
@@ -2297,6 +2312,11 @@ namespace TemuKJD.KJDForms.ProductForms
chkSameRoas2.Checked = !chkCalculateRoas2.Checked;
lblCalculateRoas2.Visible = lblCalculateRoasPercentSign2.Visible = txtCalculateProfitRate2.Visible = chkCalculateRoas2.Checked;
}
private void btnEmpty_Click(object sender, EventArgs e)
{
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
}
}
public class CreateAdsParam
+123 -122
View File
@@ -30,19 +30,19 @@ namespace TemuKJD.KJDForms.ProductForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
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();
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();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnRestoreJitParams = new DevComponents.DotNetBar.PanelEx();
@@ -72,7 +72,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnResetExtCode = new DevComponents.DotNetBar.PanelEx();
this.txtExtCode = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.dtpEndTime = new System.Windows.Forms.DateTimePicker();
this.dtpStartTime = new System.Windows.Forms.DateTimePicker();
this.btnSearch2 = new DevComponents.DotNetBar.PanelEx();
@@ -94,6 +93,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchStock = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkBatchJit = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkFilterJit = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.chkSearchTime = new TemuKJD.UserComponent.UcCheckBox(this.components);
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.pbShopLoading = new System.Windows.Forms.PictureBox();
@@ -216,7 +216,6 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx1.Controls.Add(this.btnResetExtCode);
this.ucGroupBoxEx1.Controls.Add(this.txtExtCode);
this.ucGroupBoxEx1.Controls.Add(this.label12);
this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime);
this.ucGroupBoxEx1.Controls.Add(this.dtpEndTime);
this.ucGroupBoxEx1.Controls.Add(this.dtpStartTime);
this.ucGroupBoxEx1.Controls.Add(this.btnSearch2);
@@ -238,6 +237,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.ucGroupBoxEx1.Controls.Add(this.chkBatchStock);
this.ucGroupBoxEx1.Controls.Add(this.chkBatchJit);
this.ucGroupBoxEx1.Controls.Add(this.chkFilterJit);
this.ucGroupBoxEx1.Controls.Add(this.chkSearchTime);
this.ucGroupBoxEx1.Location = new System.Drawing.Point(2, 2);
this.ucGroupBoxEx1.Name = "ucGroupBoxEx1";
this.ucGroupBoxEx1.Size = new System.Drawing.Size(1580, 140);
@@ -296,7 +296,7 @@ namespace TemuKJD.KJDForms.ProductForms
// line3
//
this.line3.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.line3.Location = new System.Drawing.Point(265, 21);
this.line3.Location = new System.Drawing.Point(263, 21);
this.line3.Name = "line3";
this.line3.Size = new System.Drawing.Size(11, 104);
this.line3.TabIndex = 1265;
@@ -316,7 +316,7 @@ namespace TemuKJD.KJDForms.ProductForms
// line1
//
this.line1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.line1.Location = new System.Drawing.Point(588, 21);
this.line1.Location = new System.Drawing.Point(534, 21);
this.line1.Name = "line1";
this.line1.Size = new System.Drawing.Size(11, 104);
this.line1.TabIndex = 1263;
@@ -363,39 +363,39 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvExtCode.AllowUserToAddRows = false;
this.dgvExtCode.AllowUserToDeleteRows = false;
dataGridViewCellStyle25.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle25;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvExtCode.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvExtCode.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.dgvExtCode.AutoRowNumber = false;
this.dgvExtCode.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvExtCode.BackgroundColor = System.Drawing.Color.White;
this.dgvExtCode.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
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;
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvExtCode.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvExtCode.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelectExtCode,
this.colFilterExtCode,
this.colJitConfig});
this.dgvExtCode.Location = new System.Drawing.Point(630, 17);
this.dgvExtCode.Location = new System.Drawing.Point(580, 17);
this.dgvExtCode.Name = "dgvExtCode";
this.dgvExtCode.ReadOnly = true;
this.dgvExtCode.RowHeadersVisible = false;
this.dgvExtCode.RowHeadersWidth = 24;
this.dgvExtCode.RowTemplate.Height = 23;
this.dgvExtCode.Size = new System.Drawing.Size(257, 113);
this.dgvExtCode.Size = new System.Drawing.Size(317, 113);
this.dgvExtCode.TabIndex = 684;
this.dgvExtCode.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvExtCode_CellContentClick);
//
// colSelectExtCode
//
this.colSelectExtCode.FillWeight = 30F;
this.colSelectExtCode.FillWeight = 18F;
this.colSelectExtCode.HeaderText = "选";
this.colSelectExtCode.Name = "colSelectExtCode";
this.colSelectExtCode.ReadOnly = true;
@@ -404,22 +404,21 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colFilterExtCode
//
this.colFilterExtCode.FillWeight = 170F;
this.colFilterExtCode.HeaderText = "货号";
this.colFilterExtCode.Name = "colFilterExtCode";
this.colFilterExtCode.ReadOnly = true;
//
// colJitConfig
//
this.colJitConfig.FillWeight = 60F;
this.colJitConfig.HeaderText = "JIT配置";
this.colJitConfig.FillWeight = 95F;
this.colJitConfig.HeaderText = "JIT配置(点击显示详情)";
this.colJitConfig.Name = "colJitConfig";
this.colJitConfig.ReadOnly = true;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(597, 20);
this.label6.Location = new System.Drawing.Point(545, 20);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(44, 17);
this.label6.TabIndex = 1172;
@@ -455,9 +454,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnStop.CanvasColor = System.Drawing.SystemColors.Control;
this.btnStop.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnStop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnStop.Location = new System.Drawing.Point(287, 107);
this.btnStop.Location = new System.Drawing.Point(283, 110);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(66, 23);
this.btnStop.Size = new System.Drawing.Size(45, 23);
this.btnStop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnStop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnStop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -471,7 +470,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnStop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnStop.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnStop.TabIndex = 999;
this.btnStop.Text = "停止查询";
this.btnStop.Text = "停止";
this.btnStop.Visible = false;
this.btnStop.Click += new System.EventHandler(this.btnStop_Click);
//
@@ -561,24 +560,25 @@ namespace TemuKJD.KJDForms.ProductForms
this.pbBatchRealPicture.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.pbBatchRealPicture.TabIndex = 1051;
this.pbBatchRealPicture.TabStop = false;
this.pbBatchRealPicture.Click += new System.EventHandler(this.pbBatchRealPicture_Click);
//
// txtBatchIdentifyCode
//
this.txtBatchIdentifyCode.Location = new System.Drawing.Point(904, 104);
this.txtBatchIdentifyCode.Location = new System.Drawing.Point(906, 104);
this.txtBatchIdentifyCode.Name = "txtBatchIdentifyCode";
this.txtBatchIdentifyCode.Size = new System.Drawing.Size(87, 23);
this.txtBatchIdentifyCode.TabIndex = 1048;
//
// txtBatchPriceMax
//
this.txtBatchPriceMax.Location = new System.Drawing.Point(952, 42);
this.txtBatchPriceMax.Location = new System.Drawing.Point(954, 42);
this.txtBatchPriceMax.Name = "txtBatchPriceMax";
this.txtBatchPriceMax.Size = new System.Drawing.Size(40, 23);
this.txtBatchPriceMax.TabIndex = 1046;
//
// txtBatchPriceMin
//
this.txtBatchPriceMin.Location = new System.Drawing.Point(904, 42);
this.txtBatchPriceMin.Location = new System.Drawing.Point(906, 42);
this.txtBatchPriceMin.Name = "txtBatchPriceMin";
this.txtBatchPriceMin.Size = new System.Drawing.Size(40, 23);
this.txtBatchPriceMin.TabIndex = 1045;
@@ -589,9 +589,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSearch1.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearch1.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearch1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearch1.Location = new System.Drawing.Point(355, 107);
this.btnSearch1.Location = new System.Drawing.Point(330, 110);
this.btnSearch1.Name = "btnSearch1";
this.btnSearch1.Size = new System.Drawing.Size(110, 23);
this.btnSearch1.Size = new System.Drawing.Size(96, 23);
this.btnSearch1.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSearch1.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSearch1.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -612,9 +612,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnResetExtCode.CanvasColor = System.Drawing.SystemColors.Control;
this.btnResetExtCode.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnResetExtCode.DisabledBackColor = System.Drawing.Color.Empty;
this.btnResetExtCode.Location = new System.Drawing.Point(511, 47);
this.btnResetExtCode.Location = new System.Drawing.Point(492, 38);
this.btnResetExtCode.Name = "btnResetExtCode";
this.btnResetExtCode.Size = new System.Drawing.Size(66, 23);
this.btnResetExtCode.Size = new System.Drawing.Size(32, 23);
this.btnResetExtCode.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnResetExtCode.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnResetExtCode.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
@@ -633,43 +633,32 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtExtCode
//
this.txtExtCode.Location = new System.Drawing.Point(326, 47);
this.txtExtCode.Location = new System.Drawing.Point(330, 38);
this.txtExtCode.Name = "txtExtCode";
this.txtExtCode.Size = new System.Drawing.Size(182, 23);
this.txtExtCode.Size = new System.Drawing.Size(160, 23);
this.txtExtCode.TabIndex = 1003;
//
// label12
//
this.label12.AutoSize = true;
this.label12.Location = new System.Drawing.Point(292, 50);
this.label12.Location = new System.Drawing.Point(296, 41);
this.label12.Name = "label12";
this.label12.Size = new System.Drawing.Size(44, 17);
this.label12.TabIndex = 1004;
this.label12.Text = "货号:";
//
// chkSearchTime
//
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSearchTime.Location = new System.Drawing.Point(287, 81);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(15, 14);
this.chkSearchTime.TabIndex = 1002;
this.chkSearchTime.UseVisualStyleBackColor = true;
//
// dtpEndTime
//
this.dtpEndTime.Location = new System.Drawing.Point(441, 77);
this.dtpEndTime.Location = new System.Drawing.Point(330, 86);
this.dtpEndTime.Name = "dtpEndTime";
this.dtpEndTime.Size = new System.Drawing.Size(136, 23);
this.dtpEndTime.Size = new System.Drawing.Size(194, 23);
this.dtpEndTime.TabIndex = 1001;
//
// dtpStartTime
//
this.dtpStartTime.Location = new System.Drawing.Point(303, 77);
this.dtpStartTime.Location = new System.Drawing.Point(330, 62);
this.dtpStartTime.Name = "dtpStartTime";
this.dtpStartTime.Size = new System.Drawing.Size(136, 23);
this.dtpStartTime.Size = new System.Drawing.Size(194, 23);
this.dtpStartTime.TabIndex = 1000;
//
// btnSearch2
@@ -678,9 +667,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnSearch2.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnSearch2.DisabledBackColor = System.Drawing.Color.Empty;
this.btnSearch2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSearch2.Location = new System.Drawing.Point(467, 107);
this.btnSearch2.Location = new System.Drawing.Point(428, 110);
this.btnSearch2.Name = "btnSearch2";
this.btnSearch2.Size = new System.Drawing.Size(110, 23);
this.btnSearch2.Size = new System.Drawing.Size(96, 23);
this.btnSearch2.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnSearch2.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnSearch2.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -698,15 +687,15 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtSpuId
//
this.txtSpuId.Location = new System.Drawing.Point(326, 17);
this.txtSpuId.Location = new System.Drawing.Point(330, 14);
this.txtSpuId.Name = "txtSpuId";
this.txtSpuId.Size = new System.Drawing.Size(251, 23);
this.txtSpuId.Size = new System.Drawing.Size(194, 23);
this.txtSpuId.TabIndex = 997;
//
// label7
//
this.label7.AutoSize = true;
this.label7.Location = new System.Drawing.Point(282, 20);
this.label7.Location = new System.Drawing.Point(286, 16);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(54, 17);
this.label7.TabIndex = 998;
@@ -717,7 +706,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(213, 107);
this.btnEmpty.Location = new System.Drawing.Point(214, 107);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(40, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -740,7 +729,7 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.label5.AutoSize = true;
this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label5.Location = new System.Drawing.Point(15, 110);
this.label5.Location = new System.Drawing.Point(12, 110);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(128, 17);
this.label5.TabIndex = 685;
@@ -748,15 +737,15 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(70, 77);
this.txtNotes.Location = new System.Drawing.Point(68, 77);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(183, 23);
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 382;
//
// label4
//
this.label4.AutoSize = true;
this.label4.Location = new System.Drawing.Point(13, 80);
this.label4.Location = new System.Drawing.Point(11, 80);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(68, 17);
this.label4.TabIndex = 383;
@@ -768,7 +757,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(145, 107);
this.btnRefreshShop.Location = new System.Drawing.Point(143, 107);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(65, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -788,40 +777,40 @@ namespace TemuKJD.KJDForms.ProductForms
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(70, 47);
this.txtShopName.Location = new System.Drawing.Point(68, 47);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(183, 23);
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 380;
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(70, 17);
this.txtShopId.Location = new System.Drawing.Point(68, 17);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(183, 23);
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 378;
//
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(26, 20);
this.label2.Location = new System.Drawing.Point(22, 20);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(55, 17);
this.label2.Size = new System.Drawing.Size(57, 17);
this.label2.TabIndex = 379;
this.label2.Text = "店铺id:";
this.label2.Text = "店铺ID:";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(25, 50);
this.label3.Location = new System.Drawing.Point(11, 50);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(56, 17);
this.label3.Size = new System.Drawing.Size(68, 17);
this.label3.TabIndex = 381;
this.label3.Text = "店铺名:";
this.label3.Text = "店铺名称:";
//
// label13
//
this.label13.AutoSize = true;
this.label13.Location = new System.Drawing.Point(943, 45);
this.label13.Location = new System.Drawing.Point(945, 45);
this.label13.Name = "label13";
this.label13.Size = new System.Drawing.Size(13, 17);
this.label13.TabIndex = 1062;
@@ -832,7 +821,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, 82);
this.chkBatchIdentifyCode.Location = new System.Drawing.Point(905, 82);
this.chkBatchIdentifyCode.Name = "chkBatchIdentifyCode";
this.chkBatchIdentifyCode.Size = new System.Drawing.Size(99, 21);
this.chkBatchIdentifyCode.TabIndex = 1111;
@@ -844,7 +833,7 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkBatchPrice.AutoSize = true;
this.chkBatchPrice.Checked = true;
this.chkBatchPrice.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkBatchPrice.Location = new System.Drawing.Point(904, 20);
this.chkBatchPrice.Location = new System.Drawing.Point(906, 20);
this.chkBatchPrice.Name = "chkBatchPrice";
this.chkBatchPrice.Size = new System.Drawing.Size(87, 21);
this.chkBatchPrice.TabIndex = 1112;
@@ -899,6 +888,18 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkFilterJit.UseVisualStyleBackColor = true;
this.chkFilterJit.CheckedChanged += new System.EventHandler(this.chkFilterJit_CheckedChanged);
//
// chkSearchTime
//
this.chkSearchTime.AutoSize = true;
this.chkSearchTime.Checked = true;
this.chkSearchTime.CheckState = System.Windows.Forms.CheckState.Checked;
this.chkSearchTime.Location = new System.Drawing.Point(283, 63);
this.chkSearchTime.Name = "chkSearchTime";
this.chkSearchTime.Size = new System.Drawing.Size(63, 21);
this.chkSearchTime.TabIndex = 1002;
this.chkSearchTime.Text = "日期:";
this.chkSearchTime.UseVisualStyleBackColor = true;
//
// splitContainer3
//
this.splitContainer3.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -969,19 +970,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle14.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle14;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
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;
dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -1141,19 +1142,19 @@ namespace TemuKJD.KJDForms.ProductForms
//
this.dgvOpenJit.AllowUserToAddRows = false;
this.dgvOpenJit.AllowUserToDeleteRows = false;
dataGridViewCellStyle16.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle16;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(249)))), ((int)(((byte)(249)))), ((int)(((byte)(249)))));
this.dgvOpenJit.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
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)))));
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;
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;
this.dgvOpenJit.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvOpenJit.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -1220,8 +1221,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colSupplierName
//
dataGridViewCellStyle18.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle18;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSupplierName.DefaultCellStyle = dataGridViewCellStyle7;
this.colSupplierName.HeaderText = "店铺名称";
this.colSupplierName.Name = "colSupplierName";
this.colSupplierName.ReadOnly = true;
@@ -1261,8 +1262,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colProdName
//
dataGridViewCellStyle19.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle19;
dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProdName.DefaultCellStyle = dataGridViewCellStyle8;
this.colProdName.HeaderText = "标题";
this.colProdName.Name = "colProdName";
this.colProdName.ReadOnly = true;
@@ -1270,8 +1271,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colSkuName
//
dataGridViewCellStyle20.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuName.DefaultCellStyle = dataGridViewCellStyle20;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colSkuName.DefaultCellStyle = dataGridViewCellStyle9;
this.colSkuName.HeaderText = "规格名称";
this.colSkuName.Name = "colSkuName";
this.colSkuName.ReadOnly = true;
@@ -1279,8 +1280,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colExtCode
//
dataGridViewCellStyle21.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colExtCode.DefaultCellStyle = dataGridViewCellStyle21;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colExtCode.DefaultCellStyle = dataGridViewCellStyle10;
this.colExtCode.HeaderText = "货号";
this.colExtCode.Name = "colExtCode";
this.colExtCode.ReadOnly = true;
@@ -1303,8 +1304,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colCreatTime
//
dataGridViewCellStyle22.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle22;
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCreatTime.DefaultCellStyle = dataGridViewCellStyle11;
this.colCreatTime.HeaderText = "创建时间";
this.colCreatTime.Name = "colCreatTime";
this.colCreatTime.ReadOnly = true;
@@ -1320,8 +1321,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colCompliance
//
dataGridViewCellStyle23.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCompliance.DefaultCellStyle = dataGridViewCellStyle23;
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colCompliance.DefaultCellStyle = dataGridViewCellStyle12;
this.colCompliance.HeaderText = "合规信息";
this.colCompliance.Name = "colCompliance";
this.colCompliance.ReadOnly = true;
@@ -1354,8 +1355,8 @@ namespace TemuKJD.KJDForms.ProductForms
//
// colRecevieArea
//
dataGridViewCellStyle24.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle24;
dataGridViewCellStyle13.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colRecevieArea.DefaultCellStyle = dataGridViewCellStyle13;
this.colRecevieArea.HeaderText = "期望到货";
this.colRecevieArea.Name = "colRecevieArea";
this.colRecevieArea.ReadOnly = true;
@@ -1573,10 +1574,10 @@ namespace TemuKJD.KJDForms.ProductForms
private System.Windows.Forms.DataGridViewLinkColumn colStock;
private System.Windows.Forms.DataGridViewLinkColumn colRecevieArea;
private System.Windows.Forms.DataGridViewTextBoxColumn colMsg;
private DevComponents.DotNetBar.PanelEx btnSaveExtCodeJitConfig;
private DevComponents.DotNetBar.PanelEx btnRestoreJitParams;
private System.Windows.Forms.DataGridViewCheckBoxColumn colSelectExtCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colFilterExtCode;
private System.Windows.Forms.DataGridViewTextBoxColumn colJitConfig;
private DevComponents.DotNetBar.PanelEx btnSaveExtCodeJitConfig;
private DevComponents.DotNetBar.PanelEx btnRestoreJitParams;
}
}
+97 -23
View File
@@ -59,7 +59,7 @@ namespace TemuKJD.KJDForms.ProductForms
/// <summary>
/// jit开通参数配置
/// </summary>
List<OpenJitParams> lstOpenJitParams = null;
List<OpenJitFullParams> lstOpenJitParams = null;
public TemuJitForm()
{
@@ -108,9 +108,9 @@ namespace TemuKJD.KJDForms.ProductForms
this.chkSearchTime.CheckedChanged += Txt_TextChanged;
// 读取货号开通jit参数
lstOpenJitParams = NaiBa.Util.Helper.ConfigHelper.LoadConfig<List<OpenJitParams>>("open_jit_params");
lstOpenJitParams = NaiBa.Util.Helper.ConfigHelper.LoadConfig<List<OpenJitFullParams>>("open_jit_params");
if (lstOpenJitParams == null)
lstOpenJitParams = new List<OpenJitParams>();
lstOpenJitParams = new List<OpenJitFullParams>();
}
private void Txt_TextChanged(object sender, EventArgs e)
@@ -168,17 +168,17 @@ namespace TemuKJD.KJDForms.ProductForms
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text))
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => txtShopId.Text.Contains(s.ShopId)).ToList();
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text))
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => txtShopName.Text.Contains(s.ShopAccount)).ToList();
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text))
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => txtNotes.Text.Contains(s.Notes)).ToList();
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
@@ -793,10 +793,11 @@ namespace TemuKJD.KJDForms.ProductForms
this.dgvExtCode.Rows.Clear();
foreach (var ext in extCodeLst)
{
var paramsExist = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == ext);
this.dgvExtCode.Rows.Add(
false,
false,
ext,
lstOpenJitParams.Any(p => p.ExtCode == ext) ? "查看" : "未设置"
paramsExist != null ? ("价:" + paramsExist.PriceMin + "-" + paramsExist.PriceMax + ";库:" + paramsExist.Stock) : "未设置"
);
}
}));
@@ -1344,6 +1345,12 @@ Content-Disposition: form-data; name=""upload_sign""
BaseMsgForm.ShowError(checkJitParamRst);
return;
}
checkJitParamRst = CheckExtCodeJitParam();
if (!string.IsNullOrEmpty(checkJitParamRst))
{
BaseMsgForm.ShowError(checkJitParamRst);
return;
}
cancellationTokenSource = new CancellationTokenSource();
pbLoading.Visible = true;
@@ -1396,6 +1403,46 @@ Content-Disposition: form-data; name=""upload_sign""
return "";
}
string CheckExtCodeJitParam()
{
var dgvRows = this.dgvExtCode.Rows.Cast<DataGridViewRow>().Where(r => r.Cells["colSelectExtCode"].Value.ParseToBool() == true).ToList();
foreach (var dgvRow in dgvRows)
{
// 如果货号存在Jit开通配置,按货号指定配置开通
var extCode = dgvRow.Cells["colFilterExtCode"].Value.ParseToString();
var extCodeOpenJitParams = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == extCode);
if (extCodeOpenJitParams != null)
{
var minPriceFen = (extCodeOpenJitParams.PriceMin * 100).ParseToInt();
var maxPriceFen = (extCodeOpenJitParams.PriceMax * 100).ParseToInt();
var identifyCode = extCodeOpenJitParams.IdentifyCode;
var realPicture = extCodeOpenJitParams.RealPicture;
var stock = extCodeOpenJitParams.Stock;
if (chkBatchPrice.Checked && (minPriceFen < 500 || maxPriceFen < 500 || maxPriceFen < minPriceFen))
{
return "请为选中的货号:" + extCode + " 合理设置价格!至少为 5 且最大值不能小于最小值!";
}
if (chkBatchIdentifyCode.Checked && identifyCode.IsNullOrEmpty())
{
return "请为选中的货号:" + extCode + " 填写识别码!";
}
if (chkBatchRealPicture.Checked && realPicture.IsNullOrEmpty())
{
return "请为选中的货号:" + extCode + " 选择实拍图!";
}
if (chkBatchStock.Checked && stock < 1)
{
return "请为选中的货号:" + extCode + " 设置合理库存!大于 0 !";
}
}
}
return "";
}
void AutoJit(int type = 1)
{
//var batchExtCodeLst = txtBatchExtCode.Text.Trim().Split(new string[] { ",", " " }, StringSplitOptions.RemoveEmptyEntries);
@@ -1907,7 +1954,8 @@ Content-Disposition: form-data; name=""upload_sign""
FilterRows();
break;
case "JIT配置":
if (row.Cells[e.ColumnIndex].Value.ParseToString() == "查看")
case "JIT配置(点击显示详情)":
if (row.Cells[e.ColumnIndex].Value.ParseToString() != "未设置")
{
var extCode = row.Cells["colFilterExtCode"].Value.ParseToString();
var jitParam = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == extCode);
@@ -1926,7 +1974,7 @@ Content-Disposition: form-data; name=""upload_sign""
}
}
string DisplayOpenJitParams(OpenJitParams jitParam)
string DisplayOpenJitParams(OpenJitFullParams jitParam)
{
this.txtBatchPriceMin.Text = jitParam.PriceMin.ToString();
this.txtBatchPriceMax.Text = jitParam.PriceMax.ToString();
@@ -1934,14 +1982,21 @@ Content-Disposition: form-data; name=""upload_sign""
this.txtBatchStock.Text = jitParam.Stock.ToString();
try
{
Image image = Image.FromFile(jitParam.RealPicture);
using (MemoryStream memoryStream = new MemoryStream())
if (!string.IsNullOrEmpty(jitParam.RealPicture))
{
image.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Jpeg);
byte[] imageBytes = memoryStream.ToArray();
Image image = Image.FromFile(jitParam.RealPicture);
using (MemoryStream memoryStream = new MemoryStream())
{
image.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Jpeg);
byte[] imageBytes = memoryStream.ToArray();
}
this.pbBatchRealPicture.Image = image;
}
else
{
this.pbBatchRealPicture.Image = new Bitmap(1,1);
}
this.pbBatchRealPicture.Tag = jitParam.RealPicture;
this.pbBatchRealPicture.Image = image;
}
catch (Exception ex)
{
@@ -2272,7 +2327,7 @@ Content-Disposition: form-data; name=""upload_sign""
foreach (var extCode in extCodeLst)
{
lstOpenJitParams.RemoveAll(p => p.ExtCode == extCode);
var jitParam = new OpenJitParams()
var jitParam = new OpenJitFullParams()
{
ExtCode = extCode,
IdentifyCode = txtBatchIdentifyCode.Text.Trim(),
@@ -2283,11 +2338,13 @@ Content-Disposition: form-data; name=""upload_sign""
};
lstOpenJitParams.Add(jitParam);
}
NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", lstOpenJitParams);
NaiBa.Util.Helper.ConfigHelper.SaveConfig("open_jit_params", JsonHelper.DeserializeJsonToList<OpenJitParamsNoImg>(JsonHelper.SerializeObject(lstOpenJitParams)));
BaseMsgForm.ShowInfo("选中货号的JIT配置已保存!");
foreach (var row in rows)
{
row.Cells["colJitConfig"].Value = "查看";
var ext = row.Cells["colFilterExtCode"].Value.ParseToString();
var paramsExist = lstOpenJitParams.FirstOrDefault(p => p.ExtCode == ext);
row.Cells["colJitConfig"].Value = ("价:" + paramsExist.PriceMin + "-" + paramsExist.PriceMax + ";库:" + paramsExist.Stock); // "查看";
}
}
@@ -2317,6 +2374,12 @@ Content-Disposition: form-data; name=""upload_sign""
}
}
}
private void pbBatchRealPicture_Click(object sender, EventArgs e)
{
ShowImgForm imgForm = new ShowImgForm(pbBatchRealPicture.Image);
imgForm.ShowDialog();
}
}
// jit操作查询相关设置
@@ -2332,9 +2395,9 @@ Content-Disposition: form-data; name=""upload_sign""
}
/// <summary>
/// 开开通jit配置参数
/// 开通jit配置参数
/// </summary>
public class OpenJitParams
public class OpenJitFullParams
{
public string ExtCode { get; set; }
public decimal PriceMin { get; set; }
@@ -2343,6 +2406,17 @@ Content-Disposition: form-data; name=""upload_sign""
public string RealPicture { get; set; }
public int Stock { get; set; }
}
/// <summary>
/// 因为每家店铺图片不一致,所以保存价格和数量,但是图片和识别码不保存
/// </summary>
public class OpenJitParamsNoImg
{
public string ExtCode { get; set; }
public decimal PriceMin { get; set; }
public decimal PriceMax { get; set; }
public int Stock { get; set; }
}
/// <summary>
/// 合规信息
/// </summary>
@@ -117,6 +117,15 @@
<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>
@@ -204,13 +213,4 @@
<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>
@@ -243,7 +243,6 @@
this.txtNotChangeMainImg.Location = new System.Drawing.Point(1440, 97);
this.txtNotChangeMainImg.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtNotChangeMainImg.Name = "txtNotChangeMainImg";
this.txtNotChangeMainImg.ReadOnly = true;
this.txtNotChangeMainImg.Size = new System.Drawing.Size(36, 23);
this.txtNotChangeMainImg.TabIndex = 700;
this.txtNotChangeMainImg.Text = "5";
@@ -1507,6 +1506,7 @@
this.dgvSelectProduct.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvSelectProduct.AutoRowNumber = true;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -30,11 +30,11 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle13 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle14 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle15 = 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();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
@@ -47,9 +47,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.label13 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.cmbNotes = new System.Windows.Forms.ComboBox();
this.txtShopId = new System.Windows.Forms.TextBox();
this.txtSearchShopId = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.txtSearchShopName = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtProdName = new System.Windows.Forms.TextBox();
this.cmbUserNotes = new System.Windows.Forms.ComboBox();
@@ -59,9 +59,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.label8 = new System.Windows.Forms.Label();
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
this.txtNotes = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.label21 = new System.Windows.Forms.Label();
this.txtShopId = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.txtFilter = new System.Windows.Forms.TextBox();
this.btnRestore = new DevComponents.DotNetBar.PanelEx();
this.btnFilter = new DevComponents.DotNetBar.PanelEx();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colShopLoginName = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -98,9 +108,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.ucSplitPage1 = new TemuKJD.UserControls.UcSplitPage();
this.txtFilter = new System.Windows.Forms.TextBox();
this.btnFilter = new DevComponents.DotNetBar.PanelEx();
this.btnRestore = new DevComponents.DotNetBar.PanelEx();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -161,9 +168,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.ucGroupBoxEx4.Controls.Add(this.label13);
this.ucGroupBoxEx4.Controls.Add(this.label6);
this.ucGroupBoxEx4.Controls.Add(this.cmbNotes);
this.ucGroupBoxEx4.Controls.Add(this.txtShopId);
this.ucGroupBoxEx4.Controls.Add(this.txtSearchShopId);
this.ucGroupBoxEx4.Controls.Add(this.label7);
this.ucGroupBoxEx4.Controls.Add(this.txtShopName);
this.ucGroupBoxEx4.Controls.Add(this.txtSearchShopName);
this.ucGroupBoxEx4.Controls.Add(this.label3);
this.ucGroupBoxEx4.Controls.Add(this.txtProdName);
this.ucGroupBoxEx4.Controls.Add(this.cmbUserNotes);
@@ -172,9 +179,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.ucGroupBoxEx4.Controls.Add(this.cmbStatus);
this.ucGroupBoxEx4.Controls.Add(this.label8);
this.ucGroupBoxEx4.Controls.Add(this.btnSearch);
this.ucGroupBoxEx4.Location = new System.Drawing.Point(147, 2);
this.ucGroupBoxEx4.Location = new System.Drawing.Point(302, 2);
this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
this.ucGroupBoxEx4.Size = new System.Drawing.Size(1135, 120);
this.ucGroupBoxEx4.Size = new System.Drawing.Size(980, 120);
this.ucGroupBoxEx4.TabIndex = 666;
this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "认领商品查询";
@@ -296,13 +303,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.cmbNotes.TabIndex = 488;
this.cmbNotes.Text = "全部";
//
// txtShopId
// txtSearchShopId
//
this.txtShopId.Location = new System.Drawing.Point(83, 32);
this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(85, 23);
this.txtShopId.TabIndex = 481;
this.txtSearchShopId.Location = new System.Drawing.Point(83, 32);
this.txtSearchShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtSearchShopId.Name = "txtSearchShopId";
this.txtSearchShopId.Size = new System.Drawing.Size(85, 23);
this.txtSearchShopId.TabIndex = 481;
//
// label7
//
@@ -314,13 +321,13 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.label7.TabIndex = 484;
this.label7.Text = "店铺名称";
//
// txtShopName
// txtSearchShopName
//
this.txtShopName.Location = new System.Drawing.Point(228, 32);
this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(86, 23);
this.txtShopName.TabIndex = 483;
this.txtSearchShopName.Location = new System.Drawing.Point(228, 32);
this.txtSearchShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtSearchShopName.Name = "txtSearchShopName";
this.txtSearchShopName.Size = new System.Drawing.Size(86, 23);
this.txtSearchShopName.TabIndex = 483;
//
// label3
//
@@ -371,7 +378,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty;
this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelSelect.Location = new System.Drawing.Point(982, 32);
this.btnDelSelect.Location = new System.Drawing.Point(827, 32);
this.btnDelSelect.Name = "btnDelSelect";
this.btnDelSelect.Size = new System.Drawing.Size(126, 23);
this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -442,17 +449,93 @@ namespace TemuKJD.KJDForms.ProductSelectForms
| System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx1.Controls.Add(this.btnRestore);
this.ucGroupBoxEx1.Controls.Add(this.btnFilter);
this.ucGroupBoxEx1.Controls.Add(this.txtFilter);
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
this.ucGroupBoxEx1.Controls.Add(this.label14);
this.ucGroupBoxEx1.Controls.Add(this.txtShopName);
this.ucGroupBoxEx1.Controls.Add(this.label21);
this.ucGroupBoxEx1.Controls.Add(this.txtShopId);
this.ucGroupBoxEx1.Controls.Add(this.label22);
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
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(144, 120);
this.ucGroupBoxEx1.Size = new System.Drawing.Size(300, 120);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "基础";
//
// btnEmpty
//
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnEmpty.Style.GradientAngle = 90;
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnEmpty.TabIndex = 735;
this.btnEmpty.Text = "重置查询条件";
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(75, 65);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 733;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(18, 68);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(68, 17);
this.label14.TabIndex = 734;
this.label14.Text = "店铺分组:";
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(75, 40);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 731;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(18, 43);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(68, 17);
this.label21.TabIndex = 732;
this.label21.Text = "店铺名称:";
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(75, 15);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 729;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(29, 18);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(57, 17);
this.label22.TabIndex = 730;
this.label22.Text = "店铺ID:";
//
// btnRefreshShop
//
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -460,9 +543,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(17, 31);
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(110, 24);
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -475,7 +558,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
this.btnRefreshShop.Text = "刷新店铺";
this.btnRefreshShop.Text = "查询/刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// splitContainer3
@@ -506,6 +589,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//
// splitContainer2.Panel1
//
this.splitContainer2.Panel1.Controls.Add(this.txtFilter);
this.splitContainer2.Panel1.Controls.Add(this.btnRestore);
this.splitContainer2.Panel1.Controls.Add(this.btnFilter);
this.splitContainer2.Panel1.Controls.Add(this.dgvShop);
this.splitContainer2.Panel1.Padding = new System.Windows.Forms.Padding(4, 0, 0, 0);
//
@@ -518,22 +604,84 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.splitContainer2.SplitterDistance = 300;
this.splitContainer2.TabIndex = 0;
//
// txtFilter
//
this.txtFilter.Location = new System.Drawing.Point(19, 40);
this.txtFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtFilter.Name = "txtFilter";
this.txtFilter.Size = new System.Drawing.Size(110, 23);
this.txtFilter.TabIndex = 482;
this.txtFilter.Visible = false;
//
// btnRestore
//
this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control;
this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestore.Location = new System.Drawing.Point(88, 68);
this.btnRestore.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnRestore.Name = "btnRestore";
this.btnRestore.Size = new System.Drawing.Size(41, 24);
this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestore.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnRestore.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnRestore.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnRestore.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestore.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnRestore.Style.GradientAngle = 90;
this.btnRestore.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestore.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestore.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestore.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnRestore.TabIndex = 508;
this.btnRestore.Text = "还原";
this.btnRestore.Visible = false;
this.btnRestore.Click += new System.EventHandler(this.btnRestore_Click);
//
// btnFilter
//
this.btnFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFilter.Location = new System.Drawing.Point(19, 68);
this.btnFilter.Name = "btnFilter";
this.btnFilter.Size = new System.Drawing.Size(67, 24);
this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnFilter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnFilter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnFilter.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnFilter.Style.GradientAngle = 90;
this.btnFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilter.TabIndex = 486;
this.btnFilter.Text = "筛选店铺";
this.btnFilter.Visible = false;
this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click);
//
// dgvShop
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle11.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle11;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
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)))));
dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle12.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle12.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle12;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -650,18 +798,19 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//
this.dgvSelectProduct.AllowUserToAddRows = false;
this.dgvSelectProduct.AllowUserToDeleteRows = false;
dataGridViewCellStyle13.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle13;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
this.dgvSelectProduct.AutoRowNumber = true;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle14.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle14.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle14.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle14.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle14.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle14.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle14.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle14;
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -780,8 +929,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//
// colProductName
//
dataGridViewCellStyle15.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle15;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle10;
this.colProductName.HeaderText = "商品标题";
this.colProductName.Name = "colProductName";
this.colProductName.ReadOnly = true;
@@ -931,64 +1080,6 @@ namespace TemuKJD.KJDForms.ProductSelectForms
this.ucSplitPage1.TabIndex = 675;
this.ucSplitPage1.TotalPage = 1;
//
// txtFilter
//
this.txtFilter.Location = new System.Drawing.Point(17, 59);
this.txtFilter.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtFilter.Name = "txtFilter";
this.txtFilter.Size = new System.Drawing.Size(110, 23);
this.txtFilter.TabIndex = 482;
//
// btnFilter
//
this.btnFilter.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btnFilter.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnFilter.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnFilter.DisabledBackColor = System.Drawing.Color.Empty;
this.btnFilter.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnFilter.Location = new System.Drawing.Point(17, 86);
this.btnFilter.Name = "btnFilter";
this.btnFilter.Size = new System.Drawing.Size(67, 24);
this.btnFilter.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilter.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilter.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnFilter.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder;
this.btnFilter.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash;
this.btnFilter.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None;
this.btnFilter.Style.ForeColor.Color = System.Drawing.Color.White;
this.btnFilter.Style.GradientAngle = 90;
this.btnFilter.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnFilter.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilter.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnFilter.TabIndex = 486;
this.btnFilter.Text = "筛选店铺";
this.btnFilter.Click += new System.EventHandler(this.btnFilter_Click);
//
// btnRestore
//
this.btnRestore.CanvasColor = System.Drawing.SystemColors.Control;
this.btnRestore.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnRestore.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRestore.Location = new System.Drawing.Point(86, 87);
this.btnRestore.Margin = new System.Windows.Forms.Padding(4, 2, 2, 2);
this.btnRestore.Name = "btnRestore";
this.btnRestore.Size = new System.Drawing.Size(41, 23);
this.btnRestore.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestore.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnRestore.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnRestore.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnRestore.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestore.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnRestore.Style.GradientAngle = 90;
this.btnRestore.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestore.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnRestore.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestore.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRestore.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnRestore.TabIndex = 508;
this.btnRestore.Text = "还原";
this.btnRestore.Click += new System.EventHandler(this.btnRestore_Click);
//
// DbProductUserSelectForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -1013,6 +1104,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
this.splitContainer3.ResumeLayout(false);
this.splitContainer2.Panel1.ResumeLayout(false);
this.splitContainer2.Panel1.PerformLayout();
this.splitContainer2.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer2)).EndInit();
this.splitContainer2.ResumeLayout(false);
@@ -1050,9 +1142,9 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.ComboBox cmbNotes;
private System.Windows.Forms.TextBox txtShopId;
private System.Windows.Forms.TextBox txtSearchShopId;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.TextBox txtSearchShopName;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtProdName;
private System.Windows.Forms.ComboBox cmbUserNotes;
@@ -1095,5 +1187,12 @@ namespace TemuKJD.KJDForms.ProductSelectForms
private System.Windows.Forms.TextBox txtFilter;
private DevComponents.DotNetBar.PanelEx btnRestore;
private DevComponents.DotNetBar.PanelEx btnFilter;
private DevComponents.DotNetBar.PanelEx btnEmpty;
private System.Windows.Forms.TextBox txtNotes;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.TextBox txtShopId;
private System.Windows.Forms.Label label22;
}
}
@@ -22,6 +22,7 @@ using TemuKJD.KJDForms.ShopForms;
using TemuKJD.KJDForms.ToolForms;
using TemuKJD.ToolForms;
using Work;
using NaiBa.Util;
namespace TemuKJD.KJDForms.ProductSelectForms
{
@@ -29,7 +30,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
{
bool isInit = false;
CheckBox chkSelectAll = null;
List<TemuDBProductSelect> lstTemuDBProductSelect = new List<TemuDBProductSelect>();
ConcurrentList<TemuDBProductSelect> lstTemuDBProductSelect = new ConcurrentList<TemuDBProductSelect>();
public DbProductUserSelectForm()
{
InitializeComponent();
@@ -39,7 +40,7 @@ namespace TemuKJD.KJDForms.ProductSelectForms
{
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
chkSelectAll.Checked = true;
@@ -94,22 +95,42 @@ namespace TemuKJD.KJDForms.ProductSelectForms
// 店铺Id
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
=> !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
// 更新被删除的店铺列表
foreach (var row in dgvRowList)
{
dgvShop.Rows.Remove(row);
}
// 绑定其他店铺(含新导入的店铺)
foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
foreach (ShopLoginInfo shopEntity in shopLst)
{
if (!string.IsNullOrEmpty(shopEntity.ShopId))
BindShop(shopEntity, selectIds);
}
}
private void btnEmpty_Click(object sender, EventArgs e)
{
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
}
private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null)
{
if (shopEntity == null)
@@ -292,8 +313,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
"&search_skc=" + txtSKC.Text +
"&search_ext_code=" + txtExtCode.Text +
"&search_prod_name=" + txtProdName.Text +
"&search_shop_id=" + txtShopId.Text +
"&search_shop_account=" + txtShopName.Text +
"&search_shop_id=" + txtSearchShopId.Text +
"&search_shop_account=" + txtSearchShopName.Text +
"&search_notes=" + (cmbNotes.Text == "全部" ? "" : cmbNotes.Text) +
"&search_user_notes=" + (cmbUserNotes.Text == "全部" ? "" : cmbUserNotes.Text) +
"&status=" + (cmbStatus.Text == "全部" ? "" : cmbStatus.Text) +
@@ -467,8 +488,8 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//this.txtCat.Text = "";
this.txtExtCode.Text = "";
this.txtProdName.Text = "";
this.txtShopId.Text = "";
this.txtShopName.Text = "";
this.txtSearchShopId.Text = "";
this.txtSearchShopName.Text = "";
this.txtSKC.Text = "";
this.txtSPU.Text = "";
this.cmbStatus.Text = "待上传";
@@ -510,16 +531,17 @@ namespace TemuKJD.KJDForms.ProductSelectForms
//BaseMsgForm.ShowError("图片加载失败 " + getImgError);
image = TemuKJD.Properties.Resources.errpic;
try
Invoke(new Action(() =>
{
Invoke(new Action(() =>
try
{
row.Cells["colProductSkcPic"].Value = image;
}));
}
catch
{
}
}
catch
{
}
}));
}
});
}
@@ -19,7 +19,7 @@ using Work;
namespace TemuKJD.KJDForms.ProductSelectForms
{
public partial class DbPriceMarkUpForm : Form
public partial class DbPriceMarkUpForm : BaseForm
{
List<TemuDBExtCodePriceInfo> lstPriceInfo = new List<TemuDBExtCodePriceInfo>();
@@ -30,11 +30,11 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
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();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.pnlEmpty = new DevComponents.DotNetBar.PanelEx();
@@ -47,9 +47,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.label13 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
this.cmbNotes = new System.Windows.Forms.ComboBox();
this.txtShopId = new System.Windows.Forms.TextBox();
this.txtSearchShopId = new System.Windows.Forms.TextBox();
this.label7 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.txtSearchShopName = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label();
this.txtProdName = new System.Windows.Forms.TextBox();
this.cmbUserNotes = new System.Windows.Forms.ComboBox();
@@ -59,6 +59,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.label8 = new System.Windows.Forms.Label();
this.btnSearch = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
this.txtNotes = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.label21 = new System.Windows.Forms.Label();
this.txtShopId = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
@@ -158,9 +165,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.ucGroupBoxEx4.Controls.Add(this.label13);
this.ucGroupBoxEx4.Controls.Add(this.label6);
this.ucGroupBoxEx4.Controls.Add(this.cmbNotes);
this.ucGroupBoxEx4.Controls.Add(this.txtShopId);
this.ucGroupBoxEx4.Controls.Add(this.txtSearchShopId);
this.ucGroupBoxEx4.Controls.Add(this.label7);
this.ucGroupBoxEx4.Controls.Add(this.txtShopName);
this.ucGroupBoxEx4.Controls.Add(this.txtSearchShopName);
this.ucGroupBoxEx4.Controls.Add(this.label3);
this.ucGroupBoxEx4.Controls.Add(this.txtProdName);
this.ucGroupBoxEx4.Controls.Add(this.cmbUserNotes);
@@ -169,9 +176,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.ucGroupBoxEx4.Controls.Add(this.cmbStatus);
this.ucGroupBoxEx4.Controls.Add(this.label8);
this.ucGroupBoxEx4.Controls.Add(this.btnSearch);
this.ucGroupBoxEx4.Location = new System.Drawing.Point(147, 2);
this.ucGroupBoxEx4.Location = new System.Drawing.Point(302, 2);
this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
this.ucGroupBoxEx4.Size = new System.Drawing.Size(1135, 120);
this.ucGroupBoxEx4.Size = new System.Drawing.Size(980, 120);
this.ucGroupBoxEx4.TabIndex = 666;
this.ucGroupBoxEx4.TabStop = false;
this.ucGroupBoxEx4.Text = "库存商品查询";
@@ -293,13 +300,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.cmbNotes.TabIndex = 500;
this.cmbNotes.Text = "全部";
//
// txtShopId
// txtSearchShopId
//
this.txtShopId.Location = new System.Drawing.Point(83, 32);
this.txtShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(85, 23);
this.txtShopId.TabIndex = 493;
this.txtSearchShopId.Location = new System.Drawing.Point(83, 32);
this.txtSearchShopId.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtSearchShopId.Name = "txtSearchShopId";
this.txtSearchShopId.Size = new System.Drawing.Size(85, 23);
this.txtSearchShopId.TabIndex = 493;
//
// label7
//
@@ -311,13 +318,13 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.label7.TabIndex = 496;
this.label7.Text = "店铺名称";
//
// txtShopName
// txtSearchShopName
//
this.txtShopName.Location = new System.Drawing.Point(228, 32);
this.txtShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(86, 23);
this.txtShopName.TabIndex = 495;
this.txtSearchShopName.Location = new System.Drawing.Point(228, 32);
this.txtSearchShopName.Margin = new System.Windows.Forms.Padding(0, 2, 0, 2);
this.txtSearchShopName.Name = "txtSearchShopName";
this.txtSearchShopName.Size = new System.Drawing.Size(86, 23);
this.txtSearchShopName.TabIndex = 495;
//
// label3
//
@@ -368,7 +375,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.btnDelSelect.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnDelSelect.DisabledBackColor = System.Drawing.Color.Empty;
this.btnDelSelect.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelSelect.Location = new System.Drawing.Point(982, 32);
this.btnDelSelect.Location = new System.Drawing.Point(827, 32);
this.btnDelSelect.Name = "btnDelSelect";
this.btnDelSelect.Size = new System.Drawing.Size(126, 23);
this.btnDelSelect.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -439,14 +446,93 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
| System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
this.ucGroupBoxEx1.Controls.Add(this.label14);
this.ucGroupBoxEx1.Controls.Add(this.txtShopName);
this.ucGroupBoxEx1.Controls.Add(this.label21);
this.ucGroupBoxEx1.Controls.Add(this.txtShopId);
this.ucGroupBoxEx1.Controls.Add(this.label22);
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
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(144, 120);
this.ucGroupBoxEx1.Size = new System.Drawing.Size(300, 120);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "基础";
//
// btnEmpty
//
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnEmpty.Style.GradientAngle = 90;
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnEmpty.TabIndex = 749;
this.btnEmpty.Text = "重置查询条件";
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(75, 65);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 747;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(18, 68);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(68, 17);
this.label14.TabIndex = 748;
this.label14.Text = "店铺分组:";
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(75, 40);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 745;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(18, 43);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(68, 17);
this.label21.TabIndex = 746;
this.label21.Text = "店铺名称:";
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(75, 15);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 743;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(29, 18);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(57, 17);
this.label22.TabIndex = 744;
this.label22.Text = "店铺ID:";
//
// btnRefreshShop
//
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -454,9 +540,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(17, 31);
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(110, 24);
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -469,7 +555,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
this.btnRefreshShop.Text = "刷新店铺";
this.btnRefreshShop.Text = "查询/刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// splitContainer3
@@ -516,18 +602,19 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
dataGridViewCellStyle6.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle6;
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)))));
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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -644,18 +731,19 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
//
this.dgvSelectProduct.AllowUserToAddRows = false;
this.dgvSelectProduct.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
dataGridViewCellStyle8.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvSelectProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle8;
this.dgvSelectProduct.AutoRowNumber = true;
this.dgvSelectProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvSelectProduct.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.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
dataGridViewCellStyle9.BackColor = System.Drawing.SystemColors.Control;
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
dataGridViewCellStyle9.ForeColor = System.Drawing.SystemColors.WindowText;
dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight;
dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvSelectProduct.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle9;
this.dgvSelectProduct.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvSelectProduct.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colCheck,
@@ -770,8 +858,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
//
// colProductName
//
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
this.colProductName.DefaultCellStyle = dataGridViewCellStyle10;
this.colProductName.HeaderText = "商品标题";
this.colProductName.Name = "colProductName";
this.colProductName.ReadOnly = true;
@@ -912,10 +1000,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
//
this.ucSplitPage1.CurrentPage = 1;
this.ucSplitPage1.Dock = System.Windows.Forms.DockStyle.Right;
this.ucSplitPage1.IsShowPageSize = false;
this.ucSplitPage1.Location = new System.Drawing.Point(114, 0);
this.ucSplitPage1.Margin = new System.Windows.Forms.Padding(0);
this.ucSplitPage1.Name = "ucSplitPage1";
this.ucSplitPage1.Padding = new System.Windows.Forms.Padding(0, 0, 1, 0);
this.ucSplitPage1.PageSize = 50;
this.ucSplitPage1.Size = new System.Drawing.Size(573, 26);
this.ucSplitPage1.TabIndex = 675;
this.ucSplitPage1.TotalPage = 1;
@@ -938,6 +1028,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
this.ucGroupBoxEx4.ResumeLayout(false);
this.ucGroupBoxEx4.PerformLayout();
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
this.splitContainer3.Panel1.ResumeLayout(false);
this.splitContainer3.Panel2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.splitContainer3)).EndInit();
@@ -982,9 +1073,9 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
private System.Windows.Forms.Label label13;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.ComboBox cmbNotes;
private System.Windows.Forms.TextBox txtShopId;
private System.Windows.Forms.TextBox txtSearchShopId;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.TextBox txtSearchShopName;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtProdName;
private System.Windows.Forms.ComboBox cmbUserNotes;
@@ -1022,5 +1113,12 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colRemaining;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private DevComponents.DotNetBar.PanelEx btnEmpty;
private System.Windows.Forms.TextBox txtNotes;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.TextBox txtShopId;
private System.Windows.Forms.Label label22;
}
}
@@ -42,7 +42,7 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
{
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
chkSelectAll.Checked = true;
@@ -97,22 +97,42 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
// 店铺Id
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
=> !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
// 更新被删除的店铺列表
foreach (var row in dgvRowList)
{
dgvShop.Rows.Remove(row);
}
// 绑定其他店铺(含新导入的店铺)
foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
foreach (ShopLoginInfo shopEntity in shopLst)
{
if (!string.IsNullOrEmpty(shopEntity.ShopId))
BindShop(shopEntity, selectIds);
}
}
private void btnEmpty_Click(object sender, EventArgs e)
{
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
}
private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null)
{
if (shopEntity == null)
@@ -297,8 +317,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
"&search_skc=" + txtSKC.Text +
"&search_ext_code=" + txtExtCode.Text +
"&search_prod_name=" + txtProdName.Text +
"&search_shop_id=" + txtShopId.Text +
"&search_shop_account=" + txtShopName.Text +
"&search_shop_id=" + txtSearchShopId.Text +
"&search_shop_account=" + txtSearchShopName.Text +
"&search_notes=" + (cmbNotes.Text == "全部" ? "" : cmbNotes.Text) +
"&search_user_notes=" + (cmbUserNotes.Text == "全部" ? "" : cmbUserNotes.Text) +
"&status=" + (cmbStatus.Text == "全部" ? "" : cmbStatus.Text) +
@@ -474,8 +494,8 @@ namespace TemuKJD.KJDForms.ProductThirdSelectForms
//this.txtCat.Text = "";
this.txtExtCode.Text = "";
this.txtProdName.Text = "";
this.txtShopId.Text = "";
this.txtShopName.Text = "";
this.txtSearchShopId.Text = "";
this.txtSearchShopName.Text = "";
this.txtSKC.Text = "";
this.txtSPU.Text = "";
this.cmbStatus.Text = "待上传";
@@ -39,6 +39,13 @@ namespace TemuKJD.KJDForms.SalesCenterForms
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MarketingActivityForm));
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx1 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnEmpty = new DevComponents.DotNetBar.PanelEx();
this.txtNotes = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
this.txtShopName = new System.Windows.Forms.TextBox();
this.label21 = new System.Windows.Forms.Label();
this.txtShopId = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.btnRefreshShop = new DevComponents.DotNetBar.PanelEx();
this.ucGroupBoxEx2 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.chkGetDiscount = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -66,6 +73,14 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.splitContainer3 = new System.Windows.Forms.SplitContainer();
this.splitContainer2 = new System.Windows.Forms.SplitContainer();
this.dgvShop = new TemuKJD.UserComponent.DataGridViewEx();
this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
this.colShopLoginName = 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.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.splitContainer5 = new System.Windows.Forms.SplitContainer();
this.actDiscountLess60 = new TemuKJD.KJDForms.SalesCenterForms.UcActivityDiscountCtrl();
this.chkIfLowCancel = new TemuKJD.UserComponent.UcCheckBox(this.components);
@@ -102,14 +117,6 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
this.btnClear = new DevComponents.DotNetBar.PanelEx();
this.panel1 = new System.Windows.Forms.Panel();
this.colSelect = new TemuKJD.UserComponent.UcDataGridViewCheckBoxColumn(this.components);
this.colShopLoginName = 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.colLoginStatus = new System.Windows.Forms.DataGridViewLinkColumn();
this.colCanUse = new System.Windows.Forms.DataGridViewCheckBoxColumn();
this.colMessage = new System.Windows.Forms.DataGridViewTextBoxColumn();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
this.splitContainer1.Panel1.SuspendLayout();
this.splitContainer1.Panel2.SuspendLayout();
@@ -160,7 +167,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.splitContainer3);
this.splitContainer1.Size = new System.Drawing.Size(1398, 566);
this.splitContainer1.Size = new System.Drawing.Size(1438, 566);
this.splitContainer1.SplitterDistance = 120;
this.splitContainer1.TabIndex = 11;
//
@@ -170,14 +177,93 @@ namespace TemuKJD.KJDForms.SalesCenterForms
| System.Windows.Forms.AnchorStyles.Left)));
this.ucGroupBoxEx1.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.ucGroupBoxEx1.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx1.Controls.Add(this.btnEmpty);
this.ucGroupBoxEx1.Controls.Add(this.txtNotes);
this.ucGroupBoxEx1.Controls.Add(this.label14);
this.ucGroupBoxEx1.Controls.Add(this.txtShopName);
this.ucGroupBoxEx1.Controls.Add(this.label21);
this.ucGroupBoxEx1.Controls.Add(this.txtShopId);
this.ucGroupBoxEx1.Controls.Add(this.label22);
this.ucGroupBoxEx1.Controls.Add(this.btnRefreshShop);
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(144, 120);
this.ucGroupBoxEx1.Size = new System.Drawing.Size(280, 120);
this.ucGroupBoxEx1.TabIndex = 399;
this.ucGroupBoxEx1.TabStop = false;
this.ucGroupBoxEx1.Text = "基础";
//
// btnEmpty
//
this.btnEmpty.CanvasColor = System.Drawing.SystemColors.Control;
this.btnEmpty.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
this.btnEmpty.DisabledBackColor = System.Drawing.Color.Empty;
this.btnEmpty.Location = new System.Drawing.Point(173, 90);
this.btnEmpty.Name = "btnEmpty";
this.btnEmpty.Size = new System.Drawing.Size(88, 23);
this.btnEmpty.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(185)))), ((int)(((byte)(215)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine;
this.btnEmpty.Style.BorderColor.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText;
this.btnEmpty.Style.GradientAngle = 90;
this.btnEmpty.StyleMouseDown.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center;
this.btnEmpty.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnEmpty.StyleMouseOver.ForeColor.Color = System.Drawing.Color.White;
this.btnEmpty.TabIndex = 725;
this.btnEmpty.Text = "重置查询条件";
this.btnEmpty.Click += new System.EventHandler(this.btnEmpty_Click);
//
// txtNotes
//
this.txtNotes.Location = new System.Drawing.Point(75, 65);
this.txtNotes.Name = "txtNotes";
this.txtNotes.Size = new System.Drawing.Size(186, 23);
this.txtNotes.TabIndex = 723;
//
// label14
//
this.label14.AutoSize = true;
this.label14.Location = new System.Drawing.Point(18, 68);
this.label14.Name = "label14";
this.label14.Size = new System.Drawing.Size(68, 17);
this.label14.TabIndex = 724;
this.label14.Text = "店铺分组:";
//
// txtShopName
//
this.txtShopName.Location = new System.Drawing.Point(75, 40);
this.txtShopName.Name = "txtShopName";
this.txtShopName.Size = new System.Drawing.Size(186, 23);
this.txtShopName.TabIndex = 721;
//
// label21
//
this.label21.AutoSize = true;
this.label21.Location = new System.Drawing.Point(18, 43);
this.label21.Name = "label21";
this.label21.Size = new System.Drawing.Size(68, 17);
this.label21.TabIndex = 722;
this.label21.Text = "店铺名称:";
//
// txtShopId
//
this.txtShopId.Location = new System.Drawing.Point(75, 15);
this.txtShopId.Name = "txtShopId";
this.txtShopId.Size = new System.Drawing.Size(186, 23);
this.txtShopId.TabIndex = 719;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(29, 18);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(57, 17);
this.label22.TabIndex = 720;
this.label22.Text = "店铺ID:";
//
// btnRefreshShop
//
this.btnRefreshShop.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -185,9 +271,9 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.btnRefreshShop.Cursor = System.Windows.Forms.Cursors.Hand;
this.btnRefreshShop.DisabledBackColor = System.Drawing.Color.Empty;
this.btnRefreshShop.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnRefreshShop.Location = new System.Drawing.Point(17, 31);
this.btnRefreshShop.Location = new System.Drawing.Point(75, 90);
this.btnRefreshShop.Name = "btnRefreshShop";
this.btnRefreshShop.Size = new System.Drawing.Size(110, 24);
this.btnRefreshShop.Size = new System.Drawing.Size(96, 23);
this.btnRefreshShop.Style.Alignment = System.Drawing.StringAlignment.Center;
this.btnRefreshShop.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
this.btnRefreshShop.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -200,7 +286,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.btnRefreshShop.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255)))));
this.btnRefreshShop.TabIndex = 431;
this.btnRefreshShop.Text = "刷新店铺";
this.btnRefreshShop.Text = "查询/刷新店铺";
this.btnRefreshShop.Click += new System.EventHandler(this.btnRefreshShop_Click);
//
// ucGroupBoxEx2
@@ -211,7 +297,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.ucGroupBoxEx2.BorderStyle = TemuKJD.UserComponent.UcGroupBoxEx.GroupBoxBorderStyle.ROUND;
this.ucGroupBoxEx2.Controls.Add(this.chkGetDiscount);
this.ucGroupBoxEx2.Controls.Add(this.btnSearchActivity);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(147, 2);
this.ucGroupBoxEx2.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx2.Name = "ucGroupBoxEx2";
this.ucGroupBoxEx2.Size = new System.Drawing.Size(135, 120);
this.ucGroupBoxEx2.TabIndex = 469;
@@ -271,9 +357,9 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.ucGroupBoxEx3.Controls.Add(this.chkFullShop);
this.ucGroupBoxEx3.Controls.Add(this.chkNoSaleProd);
this.ucGroupBoxEx3.Controls.Add(this.panel2);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(282, 2);
this.ucGroupBoxEx3.Location = new System.Drawing.Point(417, 2);
this.ucGroupBoxEx3.Name = "ucGroupBoxEx3";
this.ucGroupBoxEx3.Size = new System.Drawing.Size(1114, 120);
this.ucGroupBoxEx3.Size = new System.Drawing.Size(1019, 120);
this.ucGroupBoxEx3.TabIndex = 666;
this.ucGroupBoxEx3.TabStop = false;
this.ucGroupBoxEx3.Text = "活动设置";
@@ -366,7 +452,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.panelEx2.Cursor = System.Windows.Forms.Cursors.Hand;
this.panelEx2.DisabledBackColor = System.Drawing.Color.Empty;
this.panelEx2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panelEx2.Location = new System.Drawing.Point(1024, 26);
this.panelEx2.Location = new System.Drawing.Point(929, 26);
this.panelEx2.Name = "panelEx2";
this.panelEx2.Size = new System.Drawing.Size(70, 23);
this.panelEx2.Style.Alignment = System.Drawing.StringAlignment.Center;
@@ -539,7 +625,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
// splitContainer3.Panel2
//
this.splitContainer3.Panel2.Controls.Add(this.splitContainer4);
this.splitContainer3.Size = new System.Drawing.Size(1398, 442);
this.splitContainer3.Size = new System.Drawing.Size(1438, 442);
this.splitContainer3.SplitterDistance = 412;
this.splitContainer3.TabIndex = 1;
//
@@ -559,7 +645,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
//
this.splitContainer2.Panel2.Controls.Add(this.splitContainer5);
this.splitContainer2.Panel2.Padding = new System.Windows.Forms.Padding(0, 0, 4, 0);
this.splitContainer2.Size = new System.Drawing.Size(1398, 412);
this.splitContainer2.Size = new System.Drawing.Size(1438, 412);
this.splitContainer2.SplitterDistance = 280;
this.splitContainer2.TabIndex = 0;
//
@@ -569,6 +655,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
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)))));
dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -600,6 +687,72 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvShop.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellClick);
this.dgvShop.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvShop_CellContentClick);
//
// colSelect
//
this.colSelect.HeaderText = "全选";
this.colSelect.Name = "colSelect";
this.colSelect.ReadOnly = true;
this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colSelect.Width = 28;
//
// colShopLoginName
//
this.colShopLoginName.HeaderText = "店铺登录名";
this.colShopLoginName.Name = "colShopLoginName";
this.colShopLoginName.ReadOnly = true;
this.colShopLoginName.Visible = false;
//
// colShopId
//
this.colShopId.HeaderText = "店铺Id";
this.colShopId.Name = "colShopId";
this.colShopId.ReadOnly = true;
this.colShopId.Visible = false;
this.colShopId.Width = 55;
//
// colShopName
//
this.colShopName.FillWeight = 150F;
this.colShopName.HeaderText = "店铺名";
this.colShopName.Name = "colShopName";
this.colShopName.ReadOnly = true;
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colShopName.Width = 70;
//
// colShopNotes
//
this.colShopNotes.HeaderText = "分组";
this.colShopNotes.Name = "colShopNotes";
this.colShopNotes.ReadOnly = true;
this.colShopNotes.Width = 70;
//
// colLoginStatus
//
this.colLoginStatus.HeaderText = "状态";
this.colLoginStatus.Name = "colLoginStatus";
this.colLoginStatus.ReadOnly = true;
this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colLoginStatus.Width = 38;
//
// colCanUse
//
this.colCanUse.HeaderText = "可用";
this.colCanUse.Name = "colCanUse";
this.colCanUse.ReadOnly = true;
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colCanUse.Visible = false;
this.colCanUse.Width = 28;
//
// colMessage
//
this.colMessage.HeaderText = "消息";
this.colMessage.Name = "colMessage";
this.colMessage.ReadOnly = true;
this.colMessage.Width = 120;
//
// splitContainer5
//
this.splitContainer5.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -616,7 +769,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
// splitContainer5.Panel2
//
this.splitContainer5.Panel2.Controls.Add(this.dgvProduct);
this.splitContainer5.Size = new System.Drawing.Size(1110, 412);
this.splitContainer5.Size = new System.Drawing.Size(1150, 412);
this.splitContainer5.SplitterDistance = 169;
this.splitContainer5.TabIndex = 0;
//
@@ -652,6 +805,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvActivity.AllowUserToDeleteRows = false;
dataGridViewCellStyle3.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvActivity.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle3;
this.dgvActivity.AutoRowNumber = true;
this.dgvActivity.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvActivity.BackgroundColor = System.Drawing.Color.White;
this.dgvActivity.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
@@ -680,7 +834,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvActivity.Name = "dgvActivity";
this.dgvActivity.ReadOnly = true;
this.dgvActivity.RowTemplate.Height = 23;
this.dgvActivity.Size = new System.Drawing.Size(1110, 169);
this.dgvActivity.Size = new System.Drawing.Size(1150, 169);
this.dgvActivity.TabIndex = 189;
this.dgvActivity.CellContentClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvActivity_CellContentClick);
//
@@ -760,6 +914,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvProduct.AllowUserToDeleteRows = false;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvProduct.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
this.dgvProduct.AutoRowNumber = true;
this.dgvProduct.BackgroundColor = System.Drawing.Color.White;
this.dgvProduct.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
@@ -793,7 +948,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.dgvProduct.Name = "dgvProduct";
this.dgvProduct.ReadOnly = true;
this.dgvProduct.RowTemplate.Height = 23;
this.dgvProduct.Size = new System.Drawing.Size(1110, 239);
this.dgvProduct.Size = new System.Drawing.Size(1150, 239);
this.dgvProduct.TabIndex = 188;
//
// colCheckProduct
@@ -931,8 +1086,8 @@ namespace TemuKJD.KJDForms.SalesCenterForms
//
this.splitContainer4.Panel2.Controls.Add(this.panelEx1);
this.splitContainer4.Panel2.Controls.Add(this.btnClear);
this.splitContainer4.Size = new System.Drawing.Size(1398, 26);
this.splitContainer4.SplitterDistance = 1120;
this.splitContainer4.Size = new System.Drawing.Size(1438, 26);
this.splitContainer4.SplitterDistance = 1160;
this.splitContainer4.TabIndex = 3;
//
// statusBar
@@ -943,7 +1098,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.statusBar.Location = new System.Drawing.Point(0, 0);
this.statusBar.Margin = new System.Windows.Forms.Padding(0);
this.statusBar.Name = "statusBar";
this.statusBar.Size = new System.Drawing.Size(1120, 26);
this.statusBar.Size = new System.Drawing.Size(1160, 26);
this.statusBar.TabIndex = 2;
//
// panelEx1
@@ -1003,80 +1158,14 @@ namespace TemuKJD.KJDForms.SalesCenterForms
this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
this.panel1.Location = new System.Drawing.Point(1, 33);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1398, 566);
this.panel1.Size = new System.Drawing.Size(1438, 566);
this.panel1.TabIndex = 12;
//
// colSelect
//
this.colSelect.HeaderText = "全选";
this.colSelect.Name = "colSelect";
this.colSelect.ReadOnly = true;
this.colSelect.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colSelect.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colSelect.Width = 28;
//
// colShopLoginName
//
this.colShopLoginName.HeaderText = "店铺登录名";
this.colShopLoginName.Name = "colShopLoginName";
this.colShopLoginName.ReadOnly = true;
this.colShopLoginName.Visible = false;
//
// colShopId
//
this.colShopId.HeaderText = "店铺Id";
this.colShopId.Name = "colShopId";
this.colShopId.ReadOnly = true;
this.colShopId.Visible = false;
this.colShopId.Width = 55;
//
// colShopName
//
this.colShopName.FillWeight = 150F;
this.colShopName.HeaderText = "店铺名";
this.colShopName.Name = "colShopName";
this.colShopName.ReadOnly = true;
this.colShopName.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colShopName.Width = 70;
//
// colShopNotes
//
this.colShopNotes.HeaderText = "分组";
this.colShopNotes.Name = "colShopNotes";
this.colShopNotes.ReadOnly = true;
this.colShopNotes.Width = 70;
//
// colLoginStatus
//
this.colLoginStatus.HeaderText = "状态";
this.colLoginStatus.Name = "colLoginStatus";
this.colLoginStatus.ReadOnly = true;
this.colLoginStatus.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colLoginStatus.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colLoginStatus.Width = 38;
//
// colCanUse
//
this.colCanUse.HeaderText = "可用";
this.colCanUse.Name = "colCanUse";
this.colCanUse.ReadOnly = true;
this.colCanUse.Resizable = System.Windows.Forms.DataGridViewTriState.True;
this.colCanUse.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic;
this.colCanUse.Visible = false;
this.colCanUse.Width = 28;
//
// colMessage
//
this.colMessage.HeaderText = "消息";
this.colMessage.Name = "colMessage";
this.colMessage.ReadOnly = true;
this.colMessage.Width = 120;
//
// MarketingActivityForm
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(98)))), ((int)(((byte)(200)))));
this.ClientSize = new System.Drawing.Size(1400, 600);
this.ClientSize = new System.Drawing.Size(1440, 600);
this.Controls.Add(this.panel1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
@@ -1093,6 +1182,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
this.splitContainer1.ResumeLayout(false);
this.ucGroupBoxEx1.ResumeLayout(false);
this.ucGroupBoxEx1.PerformLayout();
this.ucGroupBoxEx2.ResumeLayout(false);
this.ucGroupBoxEx2.PerformLayout();
this.ucGroupBoxEx3.ResumeLayout(false);
@@ -1202,5 +1292,12 @@ namespace TemuKJD.KJDForms.SalesCenterForms
private System.Windows.Forms.DataGridViewLinkColumn colLoginStatus;
private System.Windows.Forms.DataGridViewCheckBoxColumn colCanUse;
private System.Windows.Forms.DataGridViewTextBoxColumn colMessage;
private DevComponents.DotNetBar.PanelEx btnEmpty;
private System.Windows.Forms.TextBox txtNotes;
private System.Windows.Forms.Label label14;
private System.Windows.Forms.TextBox txtShopName;
private System.Windows.Forms.Label label21;
private System.Windows.Forms.TextBox txtShopId;
private System.Windows.Forms.Label label22;
}
}
@@ -78,7 +78,7 @@ namespace TemuKJD.KJDForms.SalesCenterForms
{
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
this.dgvActivity.AddSelectorColumn("colCheckActivity");
@@ -167,22 +167,42 @@ namespace TemuKJD.KJDForms.SalesCenterForms
// 店铺Id
var selectIds = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> row.Cells["colSelect"]?.Value.ParseToBool() == true).Select(r => r.Cells["colShopId"]?.Value.ToString()).ToList();
var shopLst = GlobalConfig.ShopLoginList.ToList();
if (!string.IsNullOrWhiteSpace(txtShopId.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopId.Text.Trim() + ",").Contains("," + s.ShopId + ",") || s.ShopId.Contains(txtShopId.Text.Trim())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtShopName.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtShopName.Text.Trim() + ",").Contains("," + s.ShopAccount + ",") || s.ShopAccount.ToLower().Contains(txtShopName.Text.Trim().ToLower())).ToList();
}
if (!string.IsNullOrWhiteSpace(txtNotes.Text.Trim()))
{
shopLst = shopLst.Where(s => ("," + txtNotes.Text.Trim() + ",").Contains("," + s.Notes + ",") || s.Notes.ToLower().Contains(txtNotes.Text.Trim().ToLower())).ToList();
}
// 获取被删除的店铺
List<DataGridViewRow> dgvRowList = dgvShop.Rows.Cast<DataGridViewRow>().Where(row
=> !GlobalConfig.ShopLoginList.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
=> !shopLst.Any(s => s.ShopId == row.Cells["colShopId"]?.Value?.ToString())).ToList();
// 更新被删除的店铺列表
foreach (var row in dgvRowList)
{
dgvShop.Rows.Remove(row);
}
// 绑定其他店铺(含新导入的店铺)
foreach (ShopLoginInfo shopEntity in GlobalConfig.ShopLoginList)
foreach (ShopLoginInfo shopEntity in shopLst)
{
if (!string.IsNullOrEmpty(shopEntity.ShopId))
BindShop(shopEntity, selectIds);
}
}
private void btnEmpty_Click(object sender, EventArgs e)
{
txtNotes.Text = txtShopId.Text = txtShopName.Text = "";
}
private void BindShop(ShopLoginInfo shopEntity, List<string> selectShopId = null)
{
if (shopEntity == null)
@@ -30,8 +30,8 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
this.ucGroupBoxEx3 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
this.btnGetNotGet = new DevComponents.DotNetBar.PanelEx();
@@ -293,9 +293,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.label7.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label7.AutoSize = true;
this.label7.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label7.Location = new System.Drawing.Point(527, 62);
this.label7.Location = new System.Drawing.Point(527, 60);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(53, 12);
this.label7.Size = new System.Drawing.Size(56, 17);
this.label7.TabIndex = 12;
this.label7.Text = "建议备货";
//
@@ -304,9 +304,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.label6.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label6.AutoSize = true;
this.label6.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label6.Location = new System.Drawing.Point(265, 62);
this.label6.Location = new System.Drawing.Point(265, 60);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(53, 12);
this.label6.Size = new System.Drawing.Size(56, 17);
this.label6.TabIndex = 11;
this.label6.Text = "即将断码";
//
@@ -315,9 +315,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.label5.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label5.AutoSize = true;
this.label5.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label5.Location = new System.Drawing.Point(3, 62);
this.label5.Location = new System.Drawing.Point(3, 60);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(41, 12);
this.label5.Size = new System.Drawing.Size(44, 17);
this.label5.TabIndex = 10;
this.label5.Text = "已断码";
//
@@ -326,9 +326,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.label4.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label4.AutoSize = true;
this.label4.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label4.Location = new System.Drawing.Point(789, 5);
this.label4.Location = new System.Drawing.Point(789, 3);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(41, 12);
this.label4.Size = new System.Drawing.Size(44, 17);
this.label4.TabIndex = 9;
this.label4.Text = "已断货";
//
@@ -337,9 +337,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.label3.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label3.AutoSize = true;
this.label3.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label3.Location = new System.Drawing.Point(527, 5);
this.label3.Location = new System.Drawing.Point(527, 3);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(41, 12);
this.label3.Size = new System.Drawing.Size(44, 17);
this.label3.TabIndex = 8;
this.label3.Text = "已缺货";
//
@@ -348,9 +348,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.label2.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label2.AutoSize = true;
this.label2.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label2.Location = new System.Drawing.Point(265, 5);
this.label2.Location = new System.Drawing.Point(265, 3);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(41, 12);
this.label2.Size = new System.Drawing.Size(44, 17);
this.label2.TabIndex = 7;
this.label2.Text = "待发货";
//
@@ -359,9 +359,9 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.label1.Anchor = System.Windows.Forms.AnchorStyles.Left;
this.label1.AutoSize = true;
this.label1.ForeColor = System.Drawing.SystemColors.ControlDarkDark;
this.label1.Location = new System.Drawing.Point(3, 5);
this.label1.Location = new System.Drawing.Point(3, 3);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(41, 12);
this.label1.Size = new System.Drawing.Size(44, 17);
this.label1.TabIndex = 0;
this.label1.Text = "待创建";
//
@@ -415,19 +415,20 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
//
this.dgvShop.AllowUserToAddRows = false;
this.dgvShop.AllowUserToDeleteRows = false;
dataGridViewCellStyle5.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle5;
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
this.dgvShop.AutoRowNumber = true;
this.dgvShop.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
this.dgvShop.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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle6;
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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle2;
this.dgvShop.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dgvShop.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.colSelect,
@@ -553,6 +554,7 @@ namespace TemuKJD.KJDForms.ShopForms.Statistics
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.ClientSize = new System.Drawing.Size(1253, 557);
this.Controls.Add(this.splitContainer1);
this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Name = "ShopWorkStatisticsForm";
this.Text = "ShopWorkStatistics";
this.Load += new System.EventHandler(this.ShopWorkStatisticsForm_Load);
@@ -12,12 +12,13 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using TemuKJD.BaseForms;
using TemuKJD.BLL;
using TemuKJD.Extension;
namespace TemuKJD.KJDForms.ShopForms.Statistics
{
public partial class ShopWorkStatisticsForm : Form
public partial class ShopWorkStatisticsForm : BaseForm
{
public List<ShopWorkStatisticsInfo> lstShopStatisticsInfo = new List<ShopWorkStatisticsInfo>();
public bool IsOperate = false;
@@ -24,7 +24,7 @@ using TemuKJD.ToolForms;
namespace TemuKJD.PDDForms.ProductForms.CouponForms
{
public partial class PDDProdActivityToolShouJianLiJianForm : Form
public partial class PDDProdActivityToolShouJianLiJianForm : BaseForm
{
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
@@ -22,7 +22,7 @@ using TemuKJD.ToolForms;
namespace TemuKJD.PDDForms.ProductForms
{
public partial class PDDProductUpDownForm : Form
public partial class PDDProductUpDownForm : BaseForm
{
public CancellationTokenSource cancellationTokenSource { get; set; } = null;
@@ -132,7 +132,7 @@ namespace TemuKJD.PDDForms.ProductSelectForms
this.panel1.SendToBack();
chkSelectAll = dgvShop.Columns["colSelect"].AddHeaderCheckBox(HorizontalAlignment.Center, 0, 0, null, null, false);
dgvShop.Columns["colSelect"].HeaderText = "";
chkSelectAll.Width = chkSelectAll.Height = 13;
//chkSelectAll.Width = chkSelectAll.Height = 13;
chkSelectAll.CheckedChanged += chkSelectAll_CheckedChanged;
chkSelectAll.Checked = true;