|
|
@@ -34,8 +34,6 @@
|
|
|
this.pi_titile_label = new System.Windows.Forms.Label();
|
|
|
this.pi_title = new System.Windows.Forms.Label();
|
|
|
this.panel1 = new System.Windows.Forms.Panel();
|
|
|
- this.datacount = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
|
|
|
- this.Label = new System.Windows.Forms.Label();
|
|
|
this.boxqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
|
|
|
this.getqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
|
|
|
this.ungetqty = new UAS_MES_NEW.CustomControl.ValueLabel.ValueLabel();
|
|
|
@@ -66,17 +64,17 @@
|
|
|
this.cancel = new UAS_MES_NEW.CustomControl.CustomCheckBox.CustomCheckBox();
|
|
|
this.input = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SnCollectionBox();
|
|
|
this.InOutDetailDGV = new UAS_MES_NEW.CustomControl.DataGrid_View.DataGridViewWithSerialNum();
|
|
|
- this.pim_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
- this.pim_mac = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
- this.pim_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
- this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
- this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
- this.blank = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
this.ProdDetail = new UAS_MES_NEW.CustomControl.ButtonUtil.NormalButton();
|
|
|
this.pi_inoutno = new UAS_MES_NEW.CustomControl.TextBoxWithIcon.SearchTextBox();
|
|
|
this.PrinterList_label = new System.Windows.Forms.Label();
|
|
|
this.PrinterList = new UAS_MES_NEW.CustomControl.ComBoxWithFocus.PrinterCombox();
|
|
|
this.Combine = new System.Windows.Forms.CheckBox();
|
|
|
+ this.pa_outboxcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
+ this.PA_TOTALQTY = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
+ this.pa_prodcode = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
+ this.pr_detail = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
+ this.pr_spec = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
+ this.blank = new System.Windows.Forms.DataGridViewTextBoxColumn();
|
|
|
this.panel1.SuspendLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.bindingSource)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.Prodiodetail)).BeginInit();
|
|
|
@@ -118,8 +116,6 @@
|
|
|
// panel1
|
|
|
//
|
|
|
this.panel1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
|
|
|
- this.panel1.Controls.Add(this.datacount);
|
|
|
- this.panel1.Controls.Add(this.Label);
|
|
|
this.panel1.Controls.Add(this.boxqty);
|
|
|
this.panel1.Controls.Add(this.getqty);
|
|
|
this.panel1.Controls.Add(this.ungetqty);
|
|
|
@@ -134,29 +130,6 @@
|
|
|
this.panel1.Size = new System.Drawing.Size(280, 388);
|
|
|
this.panel1.TabIndex = 217;
|
|
|
//
|
|
|
- // datacount
|
|
|
- //
|
|
|
- this.datacount.AutoSize = true;
|
|
|
- this.datacount.CutLength = null;
|
|
|
- this.datacount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.datacount.Location = new System.Drawing.Point(190, 310);
|
|
|
- this.datacount.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
|
|
|
- this.datacount.MaximumSize = new System.Drawing.Size(400, 0);
|
|
|
- this.datacount.Name = "datacount";
|
|
|
- this.datacount.Size = new System.Drawing.Size(0, 41);
|
|
|
- this.datacount.TabIndex = 230;
|
|
|
- //
|
|
|
- // Label
|
|
|
- //
|
|
|
- this.Label.AutoSize = true;
|
|
|
- this.Label.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.Label.Location = new System.Drawing.Point(18, 310);
|
|
|
- this.Label.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
|
|
|
- this.Label.Name = "Label";
|
|
|
- this.Label.Size = new System.Drawing.Size(146, 41);
|
|
|
- this.Label.TabIndex = 229;
|
|
|
- this.Label.Text = "当前明细";
|
|
|
- //
|
|
|
// boxqty
|
|
|
//
|
|
|
this.boxqty.AutoSize = true;
|
|
|
@@ -382,7 +355,7 @@
|
|
|
this.Prodiodetail.Name = "Prodiodetail";
|
|
|
this.Prodiodetail.RowHeadersWidth = 82;
|
|
|
this.Prodiodetail.RowTemplate.Height = 27;
|
|
|
- this.Prodiodetail.Size = new System.Drawing.Size(829, 405);
|
|
|
+ this.Prodiodetail.Size = new System.Drawing.Size(829, 441);
|
|
|
this.Prodiodetail.TabIndex = 242;
|
|
|
this.Prodiodetail.CellClick += new System.Windows.Forms.DataGridViewCellEventHandler(this.Prodiodetail_CellClick);
|
|
|
//
|
|
|
@@ -473,7 +446,7 @@
|
|
|
this.cancel.AllPower = null;
|
|
|
this.cancel.AutoSize = true;
|
|
|
this.cancel.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
|
|
|
- this.cancel.Location = new System.Drawing.Point(298, 966);
|
|
|
+ this.cancel.Location = new System.Drawing.Point(295, 971);
|
|
|
this.cancel.Margin = new System.Windows.Forms.Padding(4);
|
|
|
this.cancel.Name = "cancel";
|
|
|
this.cancel.Power = null;
|
|
|
@@ -503,75 +476,22 @@
|
|
|
this.InOutDetailDGV.AllowUserToAddRows = false;
|
|
|
this.InOutDetailDGV.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
|
|
|
this.InOutDetailDGV.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
|
|
|
- this.pim_outboxcode,
|
|
|
- this.pim_mac,
|
|
|
- this.pim_prodcode,
|
|
|
+ this.pa_outboxcode,
|
|
|
+ this.PA_TOTALQTY,
|
|
|
+ this.pa_prodcode,
|
|
|
this.pr_detail,
|
|
|
this.pr_spec,
|
|
|
this.blank});
|
|
|
this.InOutDetailDGV.EnableContentClick = true;
|
|
|
- this.InOutDetailDGV.Location = new System.Drawing.Point(18, 494);
|
|
|
+ this.InOutDetailDGV.Location = new System.Drawing.Point(18, 532);
|
|
|
this.InOutDetailDGV.Margin = new System.Windows.Forms.Padding(4);
|
|
|
this.InOutDetailDGV.Name = "InOutDetailDGV";
|
|
|
this.InOutDetailDGV.RowHeadersWidth = 82;
|
|
|
this.InOutDetailDGV.RowTemplate.Height = 27;
|
|
|
- this.InOutDetailDGV.Size = new System.Drawing.Size(1144, 421);
|
|
|
+ this.InOutDetailDGV.Size = new System.Drawing.Size(1144, 383);
|
|
|
this.InOutDetailDGV.TabIndex = 218;
|
|
|
this.InOutDetailDGV.DataSourceChanged += new System.EventHandler(this.InOutDetailDGV_DataSourceChanged);
|
|
|
//
|
|
|
- // pim_outboxcode
|
|
|
- //
|
|
|
- this.pim_outboxcode.DataPropertyName = "pim_outboxcode";
|
|
|
- this.pim_outboxcode.HeaderText = "栈板/箱号";
|
|
|
- this.pim_outboxcode.MinimumWidth = 2;
|
|
|
- this.pim_outboxcode.Name = "pim_outboxcode";
|
|
|
- this.pim_outboxcode.ReadOnly = true;
|
|
|
- this.pim_outboxcode.Width = 150;
|
|
|
- //
|
|
|
- // pim_mac
|
|
|
- //
|
|
|
- this.pim_mac.DataPropertyName = "pim_mac";
|
|
|
- this.pim_mac.HeaderText = "SN号";
|
|
|
- this.pim_mac.MinimumWidth = 10;
|
|
|
- this.pim_mac.Name = "pim_mac";
|
|
|
- this.pim_mac.ReadOnly = true;
|
|
|
- this.pim_mac.Width = 200;
|
|
|
- //
|
|
|
- // pim_prodcode
|
|
|
- //
|
|
|
- this.pim_prodcode.DataPropertyName = "pim_prodcode";
|
|
|
- this.pim_prodcode.HeaderText = "产品代码";
|
|
|
- this.pim_prodcode.MinimumWidth = 10;
|
|
|
- this.pim_prodcode.Name = "pim_prodcode";
|
|
|
- this.pim_prodcode.ReadOnly = true;
|
|
|
- this.pim_prodcode.Width = 200;
|
|
|
- //
|
|
|
- // pr_detail
|
|
|
- //
|
|
|
- this.pr_detail.DataPropertyName = "pr_detail";
|
|
|
- this.pr_detail.HeaderText = "名称";
|
|
|
- this.pr_detail.MinimumWidth = 10;
|
|
|
- this.pr_detail.Name = "pr_detail";
|
|
|
- this.pr_detail.ReadOnly = true;
|
|
|
- this.pr_detail.Width = 200;
|
|
|
- //
|
|
|
- // pr_spec
|
|
|
- //
|
|
|
- this.pr_spec.DataPropertyName = "pr_spec";
|
|
|
- this.pr_spec.HeaderText = "规格";
|
|
|
- this.pr_spec.MinimumWidth = 200;
|
|
|
- this.pr_spec.Name = "pr_spec";
|
|
|
- this.pr_spec.ReadOnly = true;
|
|
|
- this.pr_spec.Width = 200;
|
|
|
- //
|
|
|
- // blank
|
|
|
- //
|
|
|
- this.blank.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
|
|
|
- this.blank.HeaderText = "";
|
|
|
- this.blank.MinimumWidth = 2;
|
|
|
- this.blank.Name = "blank";
|
|
|
- this.blank.Width = 2;
|
|
|
- //
|
|
|
// ProdDetail
|
|
|
//
|
|
|
this.ProdDetail.AllPower = null;
|
|
|
@@ -580,7 +500,7 @@
|
|
|
this.ProdDetail.Font = new System.Drawing.Font("微软雅黑", 9F);
|
|
|
this.ProdDetail.Image = null;
|
|
|
this.ProdDetail.IsShowBorder = true;
|
|
|
- this.ProdDetail.Location = new System.Drawing.Point(1300, 21);
|
|
|
+ this.ProdDetail.Location = new System.Drawing.Point(1322, 9);
|
|
|
this.ProdDetail.Margin = new System.Windows.Forms.Padding(4);
|
|
|
this.ProdDetail.MoveImage = ((System.Drawing.Image)(resources.GetObject("ProdDetail.MoveImage")));
|
|
|
this.ProdDetail.Name = "ProdDetail";
|
|
|
@@ -640,6 +560,58 @@
|
|
|
this.Combine.Text = "合并明细";
|
|
|
this.Combine.UseVisualStyleBackColor = true;
|
|
|
//
|
|
|
+ // pa_outboxcode
|
|
|
+ //
|
|
|
+ this.pa_outboxcode.DataPropertyName = "pa_outboxcode";
|
|
|
+ this.pa_outboxcode.HeaderText = "栈板/箱号";
|
|
|
+ this.pa_outboxcode.MinimumWidth = 2;
|
|
|
+ this.pa_outboxcode.Name = "pa_outboxcode";
|
|
|
+ this.pa_outboxcode.ReadOnly = true;
|
|
|
+ this.pa_outboxcode.Width = 150;
|
|
|
+ //
|
|
|
+ // PA_TOTALQTY
|
|
|
+ //
|
|
|
+ this.PA_TOTALQTY.DataPropertyName = "PA_TOTALQTY";
|
|
|
+ this.PA_TOTALQTY.HeaderText = "装箱数量";
|
|
|
+ this.PA_TOTALQTY.MinimumWidth = 10;
|
|
|
+ this.PA_TOTALQTY.Name = "PA_TOTALQTY";
|
|
|
+ this.PA_TOTALQTY.Width = 200;
|
|
|
+ //
|
|
|
+ // pa_prodcode
|
|
|
+ //
|
|
|
+ this.pa_prodcode.DataPropertyName = "pa_prodcode";
|
|
|
+ this.pa_prodcode.HeaderText = "产品代码";
|
|
|
+ this.pa_prodcode.MinimumWidth = 10;
|
|
|
+ this.pa_prodcode.Name = "pa_prodcode";
|
|
|
+ this.pa_prodcode.ReadOnly = true;
|
|
|
+ this.pa_prodcode.Width = 200;
|
|
|
+ //
|
|
|
+ // pr_detail
|
|
|
+ //
|
|
|
+ this.pr_detail.DataPropertyName = "pr_detail";
|
|
|
+ this.pr_detail.HeaderText = "名称";
|
|
|
+ this.pr_detail.MinimumWidth = 10;
|
|
|
+ this.pr_detail.Name = "pr_detail";
|
|
|
+ this.pr_detail.ReadOnly = true;
|
|
|
+ this.pr_detail.Width = 200;
|
|
|
+ //
|
|
|
+ // pr_spec
|
|
|
+ //
|
|
|
+ this.pr_spec.DataPropertyName = "pr_spec";
|
|
|
+ this.pr_spec.HeaderText = "规格";
|
|
|
+ this.pr_spec.MinimumWidth = 200;
|
|
|
+ this.pr_spec.Name = "pr_spec";
|
|
|
+ this.pr_spec.ReadOnly = true;
|
|
|
+ this.pr_spec.Width = 200;
|
|
|
+ //
|
|
|
+ // blank
|
|
|
+ //
|
|
|
+ this.blank.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.None;
|
|
|
+ this.blank.HeaderText = "";
|
|
|
+ this.blank.MinimumWidth = 2;
|
|
|
+ this.blank.Name = "blank";
|
|
|
+ this.blank.Width = 2;
|
|
|
+ //
|
|
|
// Warehouse_FinishedProductOutSumNEW
|
|
|
//
|
|
|
this.AutoScaleDimensions = new System.Drawing.SizeF(12F, 24F);
|
|
|
@@ -676,12 +648,12 @@
|
|
|
this.Text = "成品出货";
|
|
|
this.Load += new System.EventHandler(this.Warehouse_FinishedProductOut_Load);
|
|
|
this.SizeChanged += new System.EventHandler(this.Warehouse_FinishedProductOut_SizeChanged);
|
|
|
- this.panel1.ResumeLayout(false);
|
|
|
+ this.panel1.ResumeLayout(true);
|
|
|
this.panel1.PerformLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.bindingSource)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.Prodiodetail)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.InOutDetailDGV)).EndInit();
|
|
|
- this.ResumeLayout(false);
|
|
|
+ this.ResumeLayout(true);
|
|
|
this.PerformLayout();
|
|
|
|
|
|
}
|
|
|
@@ -712,14 +684,6 @@
|
|
|
private CustomControl.ValueLabel.ValueLabel getqty;
|
|
|
private CustomControl.ValueLabel.ValueLabel boxqty;
|
|
|
private System.Windows.Forms.BindingSource bindingSource;
|
|
|
- private System.Windows.Forms.DataGridViewTextBoxColumn pim_outboxcode;
|
|
|
- private System.Windows.Forms.DataGridViewTextBoxColumn pim_mac;
|
|
|
- private System.Windows.Forms.DataGridViewTextBoxColumn pim_prodcode;
|
|
|
- private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
|
|
|
- private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
|
|
|
- private System.Windows.Forms.DataGridViewTextBoxColumn blank;
|
|
|
- private CustomControl.ValueLabel.ValueLabel datacount;
|
|
|
- private System.Windows.Forms.Label Label;
|
|
|
private CustomControl.DataGrid_View.DataGridViewWithSerialNum Prodiodetail;
|
|
|
private CustomControl.TextBoxWithIcon.EnterTextBox PrintNum;
|
|
|
private System.Windows.Forms.Label PrintLabel_label;
|
|
|
@@ -735,5 +699,11 @@
|
|
|
private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
|
|
|
private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail1;
|
|
|
private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec1;
|
|
|
+ private System.Windows.Forms.DataGridViewTextBoxColumn pa_outboxcode;
|
|
|
+ private System.Windows.Forms.DataGridViewTextBoxColumn PA_TOTALQTY;
|
|
|
+ private System.Windows.Forms.DataGridViewTextBoxColumn pa_prodcode;
|
|
|
+ private System.Windows.Forms.DataGridViewTextBoxColumn pr_detail;
|
|
|
+ private System.Windows.Forms.DataGridViewTextBoxColumn pr_spec;
|
|
|
+ private System.Windows.Forms.DataGridViewTextBoxColumn blank;
|
|
|
}
|
|
|
}
|