1备货调整 2在线升级调整
This commit is contained in:
1 parent
dd52c9b2d3
commit
fef54e1f0f
13 files changed
+290
-182
No files matched your search
+83
-53
@@ -30,17 +30,19 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.components = new System.ComponentModel.Container();
|
||||
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 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();
|
||||
this.splitContainer1 = new System.Windows.Forms.SplitContainer();
|
||||
this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components);
|
||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.lblMinBound = new System.Windows.Forms.Label();
|
||||
this.txtMinBound = new System.Windows.Forms.TextBox();
|
||||
this.label15 = new System.Windows.Forms.Label();
|
||||
this.lblMinBound = new System.Windows.Forms.Label();
|
||||
this.chkIfLessMakeZero = new System.Windows.Forms.CheckBox();
|
||||
this.txtScale2 = new System.Windows.Forms.TextBox();
|
||||
this.label14 = new System.Windows.Forms.Label();
|
||||
this.txtScale1 = new System.Windows.Forms.TextBox();
|
||||
@@ -137,12 +139,13 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.statusBar = new TemuKJD.UserControls.StatusBarUserControl();
|
||||
this.panelEx1 = new DevComponents.DotNetBar.PanelEx();
|
||||
this.btnClear = new DevComponents.DotNetBar.PanelEx();
|
||||
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
|
||||
this.label18 = new System.Windows.Forms.Label();
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
|
||||
this.splitContainer1.Panel1.SuspendLayout();
|
||||
this.splitContainer1.Panel2.SuspendLayout();
|
||||
this.splitContainer1.SuspendLayout();
|
||||
this.ucGroupBoxEx4.SuspendLayout();
|
||||
this.flowLayoutPanel1.SuspendLayout();
|
||||
this.ucGroupBoxEx3.SuspendLayout();
|
||||
this.ucGroupBoxEx2.SuspendLayout();
|
||||
this.ucGroupBoxEx1.SuspendLayout();
|
||||
@@ -167,7 +170,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer4.Panel1.SuspendLayout();
|
||||
this.splitContainer4.Panel2.SuspendLayout();
|
||||
this.splitContainer4.SuspendLayout();
|
||||
this.flowLayoutPanel1.SuspendLayout();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// splitContainer1
|
||||
@@ -209,6 +211,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx4.Controls.Add(this.label10);
|
||||
this.ucGroupBoxEx4.Controls.Add(this.label16);
|
||||
this.ucGroupBoxEx4.Controls.Add(this.label17);
|
||||
this.ucGroupBoxEx4.Controls.Add(this.label18);
|
||||
this.ucGroupBoxEx4.Location = new System.Drawing.Point(397, 2);
|
||||
this.ucGroupBoxEx4.Name = "ucGroupBoxEx4";
|
||||
this.ucGroupBoxEx4.Size = new System.Drawing.Size(749, 120);
|
||||
@@ -216,10 +219,31 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.ucGroupBoxEx4.TabStop = false;
|
||||
this.ucGroupBoxEx4.Text = "创建备货单";
|
||||
//
|
||||
// flowLayoutPanel1
|
||||
//
|
||||
this.flowLayoutPanel1.Controls.Add(this.lblMinBound);
|
||||
this.flowLayoutPanel1.Controls.Add(this.txtMinBound);
|
||||
this.flowLayoutPanel1.Controls.Add(this.label15);
|
||||
this.flowLayoutPanel1.Controls.Add(this.chkIfLessMakeZero);
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(240, 83);
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(433, 31);
|
||||
this.flowLayoutPanel1.TabIndex = 702;
|
||||
//
|
||||
// lblMinBound
|
||||
//
|
||||
this.lblMinBound.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.lblMinBound.AutoSize = true;
|
||||
this.lblMinBound.Location = new System.Drawing.Point(3, 5);
|
||||
this.lblMinBound.Name = "lblMinBound";
|
||||
this.lblMinBound.Size = new System.Drawing.Size(87, 17);
|
||||
this.lblMinBound.TabIndex = 691;
|
||||
this.lblMinBound.Text = "备货量小于3按";
|
||||
//
|
||||
// txtMinBound
|
||||
//
|
||||
this.txtMinBound.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.txtMinBound.Location = new System.Drawing.Point(105, 0);
|
||||
this.txtMinBound.Location = new System.Drawing.Point(93, 2);
|
||||
this.txtMinBound.Margin = new System.Windows.Forms.Padding(0);
|
||||
this.txtMinBound.Name = "txtMinBound";
|
||||
this.txtMinBound.Size = new System.Drawing.Size(39, 23);
|
||||
@@ -232,21 +256,25 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.label15.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label15.AutoSize = true;
|
||||
this.label15.Location = new System.Drawing.Point(147, 3);
|
||||
this.label15.Location = new System.Drawing.Point(135, 5);
|
||||
this.label15.Name = "label15";
|
||||
this.label15.Size = new System.Drawing.Size(32, 17);
|
||||
this.label15.TabIndex = 692;
|
||||
this.label15.Text = "备货";
|
||||
//
|
||||
// lblMinBound
|
||||
// chkIfLessMakeZero
|
||||
//
|
||||
this.lblMinBound.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.lblMinBound.AutoSize = true;
|
||||
this.lblMinBound.Location = new System.Drawing.Point(3, 3);
|
||||
this.lblMinBound.Name = "lblMinBound";
|
||||
this.lblMinBound.Size = new System.Drawing.Size(99, 17);
|
||||
this.lblMinBound.TabIndex = 691;
|
||||
this.lblMinBound.Text = "备货数量小于3按";
|
||||
this.chkIfLessMakeZero.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.chkIfLessMakeZero.AutoSize = true;
|
||||
this.chkIfLessMakeZero.Checked = true;
|
||||
this.chkIfLessMakeZero.CheckState = System.Windows.Forms.CheckState.Checked;
|
||||
this.chkIfLessMakeZero.Location = new System.Drawing.Point(183, 3);
|
||||
this.chkIfLessMakeZero.Margin = new System.Windows.Forms.Padding(13, 3, 3, 3);
|
||||
this.chkIfLessMakeZero.Name = "chkIfLessMakeZero";
|
||||
this.chkIfLessMakeZero.Size = new System.Drawing.Size(207, 21);
|
||||
this.chkIfLessMakeZero.TabIndex = 693;
|
||||
this.chkIfLessMakeZero.Text = "平台允许量小于最小备货量不备货";
|
||||
this.chkIfLessMakeZero.UseVisualStyleBackColor = true;
|
||||
//
|
||||
// txtScale2
|
||||
//
|
||||
@@ -661,18 +689,18 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvShop.AllowUserToAddRows = false;
|
||||
this.dgvShop.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle7.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle7;
|
||||
dataGridViewCellStyle1.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvShop.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle1;
|
||||
this.dgvShop.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvShop.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.dgvShop.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle8;
|
||||
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,
|
||||
@@ -687,8 +715,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.dgvShop.Name = "dgvShop";
|
||||
this.dgvShop.ReadOnly = true;
|
||||
this.dgvShop.RowHeadersWidth = 30;
|
||||
dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle9;
|
||||
dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.dgvShop.RowsDefaultCellStyle = dataGridViewCellStyle3;
|
||||
this.dgvShop.RowTemplate.Height = 23;
|
||||
this.dgvShop.Size = new System.Drawing.Size(266, 435);
|
||||
this.dgvShop.TabIndex = 6;
|
||||
@@ -1250,18 +1278,18 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
//
|
||||
this.dgvStock.AllowUserToAddRows = false;
|
||||
this.dgvStock.AllowUserToDeleteRows = false;
|
||||
dataGridViewCellStyle10.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle10;
|
||||
dataGridViewCellStyle4.BackColor = System.Drawing.Color.WhiteSmoke;
|
||||
this.dgvStock.AlternatingRowsDefaultCellStyle = dataGridViewCellStyle4;
|
||||
this.dgvStock.BackgroundColor = System.Drawing.Color.White;
|
||||
this.dgvStock.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255)))));
|
||||
dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle11.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle11.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle11;
|
||||
dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
|
||||
dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
|
||||
dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
|
||||
dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
|
||||
dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
|
||||
dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
|
||||
this.dgvStock.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
|
||||
this.dgvStock.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
||||
this.dgvStock.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
||||
this.colUpId,
|
||||
@@ -1287,8 +1315,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.dgvStock.Location = new System.Drawing.Point(0, 0);
|
||||
this.dgvStock.Name = "dgvStock";
|
||||
this.dgvStock.ReadOnly = true;
|
||||
dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.dgvStock.RowsDefaultCellStyle = dataGridViewCellStyle12;
|
||||
dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
||||
this.dgvStock.RowsDefaultCellStyle = dataGridViewCellStyle6;
|
||||
this.dgvStock.RowTemplate.Height = 23;
|
||||
this.dgvStock.Size = new System.Drawing.Size(870, 435);
|
||||
this.dgvStock.TabIndex = 187;
|
||||
@@ -1527,15 +1555,15 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.btnClear.Text = "清空结果";
|
||||
this.btnClear.Visible = false;
|
||||
//
|
||||
// flowLayoutPanel1
|
||||
// label18
|
||||
//
|
||||
this.flowLayoutPanel1.Controls.Add(this.lblMinBound);
|
||||
this.flowLayoutPanel1.Controls.Add(this.txtMinBound);
|
||||
this.flowLayoutPanel1.Controls.Add(this.label15);
|
||||
this.flowLayoutPanel1.Location = new System.Drawing.Point(180, 83);
|
||||
this.flowLayoutPanel1.Name = "flowLayoutPanel1";
|
||||
this.flowLayoutPanel1.Size = new System.Drawing.Size(284, 31);
|
||||
this.flowLayoutPanel1.TabIndex = 702;
|
||||
this.label18.Anchor = System.Windows.Forms.AnchorStyles.Left;
|
||||
this.label18.AutoSize = true;
|
||||
this.label18.Location = new System.Drawing.Point(170, 88);
|
||||
this.label18.Name = "label18";
|
||||
this.label18.Size = new System.Drawing.Size(80, 17);
|
||||
this.label18.TabIndex = 712;
|
||||
this.label18.Text = "最小备货量:";
|
||||
//
|
||||
// SaleStockUpForm
|
||||
//
|
||||
@@ -1554,6 +1582,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer1.ResumeLayout(false);
|
||||
this.ucGroupBoxEx4.ResumeLayout(false);
|
||||
this.ucGroupBoxEx4.PerformLayout();
|
||||
this.flowLayoutPanel1.ResumeLayout(false);
|
||||
this.flowLayoutPanel1.PerformLayout();
|
||||
this.ucGroupBoxEx3.ResumeLayout(false);
|
||||
this.ucGroupBoxEx2.ResumeLayout(false);
|
||||
this.ucGroupBoxEx2.PerformLayout();
|
||||
@@ -1586,8 +1616,6 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
this.splitContainer4.Panel2.ResumeLayout(false);
|
||||
((System.ComponentModel.ISupportInitialize)(this.splitContainer4)).EndInit();
|
||||
this.splitContainer4.ResumeLayout(false);
|
||||
this.flowLayoutPanel1.ResumeLayout(false);
|
||||
this.flowLayoutPanel1.PerformLayout();
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
@@ -1696,5 +1724,7 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
private System.Windows.Forms.Label label16;
|
||||
private System.Windows.Forms.Label label17;
|
||||
private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
|
||||
private System.Windows.Forms.CheckBox chkIfLessMakeZero;
|
||||
private System.Windows.Forms.Label label18;
|
||||
}
|
||||
}
|
||||
@@ -767,8 +767,11 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
sku.wantStockUpBound = sku.todaySaleVolume.ParseToInt() * scale
|
||||
- sku.inventoryNumInfo.warehouseInventoryNum.ParseToInt()
|
||||
- sku.inventoryNumInfo.waitReceiveNum.ParseToInt();
|
||||
if (sku.wantStockUpBound > 0 && sku.wantStockUpBound < this.txtMinBound.Text.ParseToInt())
|
||||
sku.wantStockUpBound = this.txtMinBound.Text.ParseToInt();
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
if (sku.wantStockUpBound > 0 && sku.wantStockUpBound < this.txtMinBound.Text.ParseToInt())
|
||||
sku.wantStockUpBound = this.txtMinBound.Text.ParseToInt();
|
||||
}));
|
||||
sku.wantStockUpBound = Math.Max(sku.wantStockUpBound, 0);
|
||||
}
|
||||
if (sInfo.skuQuantityDetailList.Any(s => s.wantStockUpBound > 0))
|
||||
@@ -964,6 +967,12 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
if (sku.wantStockUpBound > sBaseSku.applyUpperBound.ParseToInt())
|
||||
{
|
||||
sku.wantStockUpBound = sBaseSku.applyUpperBound.ParseToInt();
|
||||
//如果强制要求最小数量,且平台可备数量小于最小数量,直接不允许备货
|
||||
Invoke(new Action(() =>
|
||||
{
|
||||
if (sku.wantStockUpBound < this.txtMinBound.Text.ParseToInt() && this.chkIfLessMakeZero.Checked)
|
||||
sku.wantStockUpBound = -1;
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1034,7 +1043,8 @@ namespace TemuKJD.KJDForms.ProductForms
|
||||
|
||||
private void txtMinBound_TextChanged(object sender, EventArgs e)
|
||||
{
|
||||
this.lblMinBound.Text = "备货数量小于" + txtMinBound.Text.ParseToInt() + "按";
|
||||
this.lblMinBound.Text = "备货量小于" + txtMinBound.Text.ParseToInt() + "按";
|
||||
//this.chkIfLessMakeZero.Text = "平台允许备货数量小于" + txtMinBound.Text.ParseToInt() + "不备货";
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user