Skip to content

李娜 / Line-Smart-Workstation

转到一个项目
切换导航栏
切换导航栏固定状态
Commit c0471236 由 LN
选项

补料功能完善

1 个父辈 855b5efd
内嵌 并排
正在显示 6 个修改的文件 包含 167 行增加 和 86 行删除
TSA-V/Properties/Resource.en-US.resx
...@@ -2806,5 +2806,7 @@ ...@@ -2806,5 +2806,7 @@
<data name = "FrmNImageViewer_btnCut_Text" xml:space = "preserve"> <value> Cut </value> </data> <data name = "FrmNImageViewer_btnCut_Text" xml:space = "preserve"> <value> Cut </value> </data>
<data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> Rotate </value> </data> <data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> Rotate </value> </data>
<data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> Cancel </value> </data> <data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> Cancel </value> </data>
<data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> OK </value> </data> <data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> OK </value> </data>
<data name = "FrmScanPutCom_label7_Text" xml:space = "preserve"> <value> Pos: </value> </data>
<data name = "NotFindPNPos" xml:space = "preserve"> <value> Data Not Found: PN={0}, Location={1}, Please Scan Again</value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
...@@ -2785,4 +2785,6 @@ ...@@ -2785,4 +2785,6 @@
<data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> 旋转 </value> </data> <data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> 旋转 </value> </data>
<data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data> <data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data>
<data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data> <data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data>
<data name = "FrmScanPutCom_label7_Text" xml:space = "preserve"> <value> Pos: </value> </data>
<data name = "NotFindPNPos" xml:space = "preserve"> <value> 未找到数据：PN={0}，位置={1}，请重新扫码 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
...@@ -3029,4 +3029,6 @@ ...@@ -3029,4 +3029,6 @@
<data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> 旋转 </value> </data> <data name = "FrmNImageViewer_btnR_Text" xml:space = "preserve"> <value> 旋转 </value> </data>
<data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data> <data name = "FrmNImageViewer_btnCancel_Text" xml:space = "preserve"> <value> 取消 </value> </data>
<data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data> <data name = "FrmNImageViewer_btnOK_Text" xml:space = "preserve"> <value> 确认 </value> </data>
<data name = "FrmScanPutCom_label7_Text" xml:space = "preserve"> <value> 料盘位置: </value> </data>
<data name = "NotFindPNPos" xml:space = "preserve"> <value> 未找到数据：PN={0}，位置={1}，请重新扫码 </value> </data>
</root> </root>
\ No newline at end of file \ No newline at end of file
TSA-V/frmBoard/FrmPointInfo.cs
...@@ -110,6 +110,7 @@ namespace TSA_V ...@@ -110,6 +110,7 @@ namespace TSA_V
{ {
pnList.Insert(0,point.PN); pnList.Insert(0,point.PN);
} }
cmbPnList.DataSource = null;
cmbPnList.Items.Clear(); cmbPnList.Items.Clear();
cmbPnList.DataSource = pnList; cmbPnList.DataSource = pnList;
cmbPnList.SelectedIndex = pnList.IndexOf(point.PN); cmbPnList.SelectedIndex = pnList.IndexOf(point.PN);
......
TSA-V/frmCom/FrmScanPutCom.Designer.cs
...@@ -47,22 +47,24 @@ ...@@ -47,22 +47,24 @@
this.cmbPosition = new System.Windows.Forms.ComboBox(); this.cmbPosition = new System.Windows.Forms.ComboBox();
this.txtScanPn = new System.Windows.Forms.TextBox(); this.txtScanPn = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.lblMsg = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.numCount)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.numCount)).BeginInit();
this.tableLayoutPanel1.SuspendLayout(); this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
// timer1 // timer1
// //
this.timer1.Interval = 300; this.timer1.Interval = 1500;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// lblMoveStr // lblMoveStr
// //
this.lblMoveStr.Dock = System.Windows.Forms.DockStyle.Fill; this.lblMoveStr.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveStr.Location = new System.Drawing.Point(352, 180); this.lblMoveStr.Location = new System.Drawing.Point(353, 163);
this.lblMoveStr.Name = "lblMoveStr"; this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(184, 60); this.lblMoveStr.Size = new System.Drawing.Size(182, 53);
this.lblMoveStr.TabIndex = 294; this.lblMoveStr.TabIndex = 294;
this.lblMoveStr.Text = "移动中"; this.lblMoveStr.Text = "移动中";
this.lblMoveStr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblMoveStr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -71,9 +73,9 @@ ...@@ -71,9 +73,9 @@
// //
this.btnSaveCount.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnSaveCount.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSaveCount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnSaveCount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnSaveCount.Location = new System.Drawing.Point(352, 243); this.btnSaveCount.Location = new System.Drawing.Point(353, 220);
this.btnSaveCount.Name = "btnSaveCount"; this.btnSaveCount.Name = "btnSaveCount";
this.btnSaveCount.Size = new System.Drawing.Size(128, 50); this.btnSaveCount.Size = new System.Drawing.Size(128, 47);
this.btnSaveCount.TabIndex = 291; this.btnSaveCount.TabIndex = 291;
this.btnSaveCount.Text = "保存数量"; this.btnSaveCount.Text = "保存数量";
this.btnSaveCount.Click += new System.EventHandler(this.btnSaveCount_LinkClicked); this.btnSaveCount.Click += new System.EventHandler(this.btnSaveCount_LinkClicked);
...@@ -83,9 +85,9 @@ ...@@ -83,9 +85,9 @@
this.label4.Dock = System.Windows.Forms.DockStyle.Fill; this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(3, 60); this.label4.Location = new System.Drawing.Point(4, 55);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(155, 60); this.label4.Size = new System.Drawing.Size(154, 53);
this.label4.TabIndex = 289; this.label4.TabIndex = 289;
this.label4.Text = "位号："; this.label4.Text = "位号：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -94,7 +96,7 @@ ...@@ -94,7 +96,7 @@
// //
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCancel.Location = new System.Drawing.Point(373, 364); this.btnCancel.Location = new System.Drawing.Point(496, 17);
this.btnCancel.Name = "btnCancel"; this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(128, 50); this.btnCancel.Size = new System.Drawing.Size(128, 50);
this.btnCancel.TabIndex = 288; this.btnCancel.TabIndex = 288;
...@@ -107,9 +109,9 @@ ...@@ -107,9 +109,9 @@
this.label1.Dock = System.Windows.Forms.DockStyle.Fill; this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(3, 180); this.label1.Location = new System.Drawing.Point(4, 163);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(155, 60); this.label1.Size = new System.Drawing.Size(154, 53);
this.label1.TabIndex = 78; this.label1.TabIndex = 78;
this.label1.Text = "料盘位置："; this.label1.Text = "料盘位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -119,9 +121,9 @@ ...@@ -119,9 +121,9 @@
this.label3.Dock = System.Windows.Forms.DockStyle.Fill; this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(3, 240); this.label3.Location = new System.Drawing.Point(4, 217);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(155, 60); this.label3.Size = new System.Drawing.Size(154, 53);
this.label3.TabIndex = 76; this.label3.TabIndex = 76;
this.label3.Text = "数量："; this.label3.Text = "数量：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -131,9 +133,9 @@ ...@@ -131,9 +133,9 @@
this.label2.Dock = System.Windows.Forms.DockStyle.Fill; this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(3, 0); this.label2.Location = new System.Drawing.Point(4, 1);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(155, 60); this.label2.Size = new System.Drawing.Size(154, 53);
this.label2.TabIndex = 73; this.label2.TabIndex = 73;
this.label2.Text = "物料编号："; this.label2.Text = "物料编号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -143,9 +145,9 @@ ...@@ -143,9 +145,9 @@
this.label5.Dock = System.Windows.Forms.DockStyle.Fill; this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(3, 120); this.label5.Location = new System.Drawing.Point(4, 109);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(155, 60); this.label5.Size = new System.Drawing.Size(154, 53);
this.label5.TabIndex = 295; this.label5.TabIndex = 295;
this.label5.Text = "描述："; this.label5.Text = "描述：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
...@@ -158,7 +160,7 @@ ...@@ -158,7 +160,7 @@
0, 0,
0, 0,
0}); 0});
this.numCount.Location = new System.Drawing.Point(164, 256); this.numCount.Location = new System.Drawing.Point(165, 233);
this.numCount.Margin = new System.Windows.Forms.Padding(3, 16, 3, 3); this.numCount.Margin = new System.Windows.Forms.Padding(3, 16, 3, 3);
this.numCount.Maximum = new decimal(new int[] { this.numCount.Maximum = new decimal(new int[] {
1410065408, 1410065408,
...@@ -176,9 +178,9 @@ ...@@ -176,9 +178,9 @@
this.lblPN.Dock = System.Windows.Forms.DockStyle.Fill; this.lblPN.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblPN.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblPN.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPN.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblPN.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblPN.Location = new System.Drawing.Point(164, 0); this.lblPN.Location = new System.Drawing.Point(165, 1);
this.lblPN.Name = "lblPN"; this.lblPN.Name = "lblPN";
this.lblPN.Size = new System.Drawing.Size(372, 60); this.lblPN.Size = new System.Drawing.Size(370, 53);
this.lblPN.TabIndex = 298; this.lblPN.TabIndex = 298;
this.lblPN.Text = "移动中"; this.lblPN.Text = "移动中";
this.lblPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -188,9 +190,9 @@ ...@@ -188,9 +190,9 @@
this.tableLayoutPanel1.SetColumnSpan(this.lblTagNo, 2); this.tableLayoutPanel1.SetColumnSpan(this.lblTagNo, 2);
this.lblTagNo.Dock = System.Windows.Forms.DockStyle.Fill; this.lblTagNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblTagNo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblTagNo.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTagNo.Location = new System.Drawing.Point(164, 60); this.lblTagNo.Location = new System.Drawing.Point(165, 55);
this.lblTagNo.Name = "lblTagNo"; this.lblTagNo.Name = "lblTagNo";
this.lblTagNo.Size = new System.Drawing.Size(372, 60); this.lblTagNo.Size = new System.Drawing.Size(370, 53);
this.lblTagNo.TabIndex = 299; this.lblTagNo.TabIndex = 299;
this.lblTagNo.Text = "移动中"; this.lblTagNo.Text = "移动中";
this.lblTagNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblTagNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -200,9 +202,9 @@ ...@@ -200,9 +202,9 @@
this.tableLayoutPanel1.SetColumnSpan(this.lblDes, 2); this.tableLayoutPanel1.SetColumnSpan(this.lblDes, 2);
this.lblDes.Dock = System.Windows.Forms.DockStyle.Fill; this.lblDes.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblDes.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDes.Location = new System.Drawing.Point(164, 120); this.lblDes.Location = new System.Drawing.Point(165, 109);
this.lblDes.Name = "lblDes"; this.lblDes.Name = "lblDes";
this.lblDes.Size = new System.Drawing.Size(372, 60); this.lblDes.Size = new System.Drawing.Size(370, 53);
this.lblDes.TabIndex = 300; this.lblDes.TabIndex = 300;
this.lblDes.Text = "移动中"; this.lblDes.Text = "移动中";
this.lblDes.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblDes.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
...@@ -212,15 +214,16 @@ ...@@ -212,15 +214,16 @@
this.lblPosition.AutoSize = true; this.lblPosition.AutoSize = true;
this.lblPosition.Dock = System.Windows.Forms.DockStyle.Fill; this.lblPosition.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPosition.Location = new System.Drawing.Point(164, 180); this.lblPosition.Location = new System.Drawing.Point(165, 163);
this.lblPosition.Name = "lblPosition"; this.lblPosition.Name = "lblPosition";
this.lblPosition.Size = new System.Drawing.Size(182, 60); this.lblPosition.Size = new System.Drawing.Size(181, 53);
this.lblPosition.TabIndex = 301; this.lblPosition.TabIndex = 301;
this.lblPosition.Text = "移动中"; this.lblPosition.Text = "移动中";
this.lblPosition.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; this.lblPosition.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
// //
// tableLayoutPanel1 // tableLayoutPanel1
// //
this.tableLayoutPanel1.CellBorderStyle = System.Windows.Forms.TableLayoutPanelCellBorderStyle.Single;
this.tableLayoutPanel1.ColumnCount = 3; this.tableLayoutPanel1.ColumnCount = 3;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 30F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F)); this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F));
...@@ -238,7 +241,7 @@ ...@@ -238,7 +241,7 @@
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 3); this.tableLayoutPanel1.Controls.Add(this.label1, 0, 3);
this.tableLayoutPanel1.Controls.Add(this.label3, 0, 4); this.tableLayoutPanel1.Controls.Add(this.label3, 0, 4);
this.tableLayoutPanel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tableLayoutPanel1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tableLayoutPanel1.Location = new System.Drawing.Point(21, 25); this.tableLayoutPanel1.Location = new System.Drawing.Point(54, 170);
this.tableLayoutPanel1.Name = "tableLayoutPanel1"; this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 4; this.tableLayoutPanel1.RowCount = 4;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
...@@ -247,24 +250,24 @@ ...@@ -247,24 +250,24 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(539, 300); this.tableLayoutPanel1.Size = new System.Drawing.Size(539, 271);
this.tableLayoutPanel1.TabIndex = 302; this.tableLayoutPanel1.TabIndex = 302;
// //
// cmbPosition // cmbPosition
// //
this.cmbPosition.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPosition.FormattingEnabled = true; this.cmbPosition.FormattingEnabled = true;
this.cmbPosition.Location = new System.Drawing.Point(98, 328); this.cmbPosition.Location = new System.Drawing.Point(119, 62);
this.cmbPosition.Name = "cmbPosition"; this.cmbPosition.Name = "cmbPosition";
this.cmbPosition.Size = new System.Drawing.Size(112, 29); this.cmbPosition.Size = new System.Drawing.Size(257, 29);
this.cmbPosition.TabIndex = 306; this.cmbPosition.TabIndex = 306;
this.cmbPosition.Visible = false; this.cmbPosition.SelectedIndexChanged += new System.EventHandler(this.cmbPosition_SelectedIndexChanged);
this.cmbPosition.KeyDown += new System.Windows.Forms.KeyEventHandler(this.cmbPosition_KeyDown);
// //
// txtScanPn // txtScanPn
// //
this.txtScanPn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtScanPn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtScanPn.Location = new System.Drawing.Point(98, 375); this.txtScanPn.Location = new System.Drawing.Point(119, 17);
this.txtScanPn.Name = "txtScanPn"; this.txtScanPn.Name = "txtScanPn";
this.txtScanPn.Size = new System.Drawing.Size(257, 29); this.txtScanPn.Size = new System.Drawing.Size(257, 29);
this.txtScanPn.TabIndex = 304; this.txtScanPn.TabIndex = 304;
...@@ -272,19 +275,43 @@ ...@@ -272,19 +275,43 @@
// //
// label6 // label6
// //
this.label6.AutoSize = true; this.label6.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label6.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label6.Location = new System.Drawing.Point(7, 21);
this.label6.Location = new System.Drawing.Point(60, 381);
this.label6.Name = "label6"; this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(37, 21); this.label6.Size = new System.Drawing.Size(102, 21);
this.label6.TabIndex = 305; this.label6.TabIndex = 305;
this.label6.Text = "PN:"; this.label6.Text = "PN:";
this.label6.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label7
//
this.label7.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label7.Location = new System.Drawing.Point(3, 66);
this.label7.Name = "label7";
this.label7.Size = new System.Drawing.Size(106, 21);
this.label7.TabIndex = 307;
this.label7.Text = "Pos:";
this.label7.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// lblMsg
//
this.lblMsg.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.lblMsg.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMsg.ForeColor = System.Drawing.Color.Red;
this.lblMsg.Location = new System.Drawing.Point(4, 113);
this.lblMsg.Name = "lblMsg";
this.lblMsg.Size = new System.Drawing.Size(620, 28);
this.lblMsg.TabIndex = 308;
this.lblMsg.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
// //
// FrmScanPutCom // FrmScanPutCom
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(591, 488); this.ClientSize = new System.Drawing.Size(636, 484);
this.Controls.Add(this.lblMsg);
this.Controls.Add(this.label7);
this.Controls.Add(this.cmbPosition); this.Controls.Add(this.cmbPosition);
this.Controls.Add(this.label6); this.Controls.Add(this.label6);
this.Controls.Add(this.txtScanPn); this.Controls.Add(this.txtScanPn);
...@@ -324,5 +351,7 @@ ...@@ -324,5 +351,7 @@
private System.Windows.Forms.TextBox txtScanPn; private System.Windows.Forms.TextBox txtScanPn;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.ComboBox cmbPosition; private System.Windows.Forms.ComboBox cmbPosition;
private System.Windows.Forms.Label label7;
private System.Windows.Forms.Label lblMsg;
} }
} }
\ No newline at end of file \ No newline at end of file
TSA-V/frmCom/FrmScanPutCom.cs
...@@ -92,6 +92,8 @@ namespace TSA_V ...@@ -92,6 +92,8 @@ namespace TSA_V
private void ClearCom() private void ClearCom()
{ {
txtScanPn.Text = string.Empty; txtScanPn.Text = string.Empty;
cmbPosition.Items.Clear();
cmbPosition.Text = "";
currPn = ""; currPn = "";
currCom = null; currCom = null;
...@@ -104,24 +106,32 @@ namespace TSA_V ...@@ -104,24 +106,32 @@ namespace TSA_V
txtScanPn.Focus(); txtScanPn.Focus();
btnSaveCount.Visible = false ; btnSaveCount.Visible = false ;
} }
private int getIndex(string pn) private List<ComponetInfo> getDataByPN(string pn)
{ {
List<ComponetInfo> result = (from m in comList where m.PN.Equals(pn) select m).ToList();
return result;
}
private int getIndex(string pn, string pos) {
int index = -1; int index = -1;
for(int i = 0; i < comList.Count; i++) for (int i = 0; i < comList.Count; i++)
{ {
if (comList[i].PN.Equals(pn)) if (comList[i].PN.Equals(pn))
{ {
index = i; if (pos == "" || comList[i].PositionNum == pos)
break; {
index = i;
break;
}
} }
} }
return index; return index;
} }
private void ShowCom() private void ShowCom()
{ {
lblMsg.Text = "";
currCom = comList[currIndex]; currCom = comList[currIndex];
currPosition = CSVPositionReader<TSAVPosition>.GetPositonByNum(currCom.PositionNum); currPosition = CSVPositionReader<TSAVPosition>.GetPositonByNum(currCom.PositionNum);
cmbPosition.Text= currCom.PositionNum;
this.lblPN.Text = currCom.PN; this.lblPN.Text = currCom.PN;
this.numCount.Text = currCom.ComCount.ToString(); this.numCount.Text = currCom.ComCount.ToString();
this.lblTagNo.Text = currCom.TagNo; this.lblTagNo.Text = currCom.TagNo;
...@@ -177,42 +187,7 @@ namespace TSA_V ...@@ -177,42 +187,7 @@ namespace TSA_V
this.Close(); this.Close();
} }
protected override bool ProcessCmdKey(ref Message msg, Keys keyData) protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
{ {
// 按快捷键Ctrl+S执行按钮的点击事件方法
//if (keyData.Equals(Keys.Up) || keyData.Equals(Keys.MButton | Keys.Space))
//{
// if (btnPre.Enabled)
// {
// btnPre.PerformClick();
// }
// return true;
//}
//else if (keyData.Equals(Keys.Down) || keyData.Equals(Keys.Back | Keys.Space))
//{
// if (btnNext.Enabled)
// {
// this.btnNext.PerformClick();
// }
// return true;
//}
//else if (keyData.Equals(Keys.Left) || keyData.Equals(Keys.LButton | Keys.MButton | Keys.Space))
//{
// if (btnPre.Enabled)
// {
// btnPre.PerformClick();
// }
// return true;
//}
//else if (keyData.Equals(Keys.Right) || keyData.Equals(Keys.LButton | Keys.RButton | Keys.MButton | Keys.Space))
//{
// if (btnNext.Enabled)
// {
// this.btnNext.PerformClick();
// }
// return true;
//}
return base.ProcessCmdKey(ref msg, keyData);　// 其他键按默认处理　 return base.ProcessCmdKey(ref msg, keyData);　// 其他键按默认处理　
} }
private void btnSaveCount_LinkClicked(object sender, EventArgs e) private void btnSaveCount_LinkClicked(object sender, EventArgs e)
...@@ -239,6 +214,10 @@ namespace TSA_V ...@@ -239,6 +214,10 @@ namespace TSA_V
lblMoveStr.Text = ""; lblMoveStr.Text = "";
txtScanPn.Focus(); txtScanPn.Focus();
} }
else if (currIndex < 0)
{
cmbPosition.Focus();
}
else else
{ {
numCount.Focus(); numCount.Focus();
...@@ -263,7 +242,7 @@ namespace TSA_V ...@@ -263,7 +242,7 @@ namespace TSA_V
} }
} }
} }
} }
private void CheckWorkWait() private void CheckWorkWait()
{ {
...@@ -292,7 +271,10 @@ namespace TSA_V ...@@ -292,7 +271,10 @@ namespace TSA_V
} }
private void FrmPutCom_Shown(object sender, EventArgs e) private void FrmPutCom_Shown(object sender, EventArgs e)
{ {
cmbPosition.BackColor = System.Drawing.Color.White;
cmbPosition.ForeColor = System.Drawing.Color.Black;
lblMsg.ForeColor = System.Drawing.Color.Red;
} }
private void txtScanPn_KeyDown(object sender, KeyEventArgs e) private void txtScanPn_KeyDown(object sender, KeyEventArgs e)
...@@ -301,24 +283,87 @@ namespace TSA_V ...@@ -301,24 +283,87 @@ namespace TSA_V
if (e.KeyCode == Keys.Enter) if (e.KeyCode == Keys.Enter)
{ {
if (currPn == "") if (currPn == "")
{ {
string pn = txtScanPn.Text.Trim(); string pn = txtScanPn.Text.Trim();
currIndex = getIndex(pn); List<ComponetInfo> list= getDataByPN(pn);
if (currIndex >= 0) if (list.Count > 0)
{ {
currPn = pn; currPn = pn;
ShowCom(); cmbPosition.Items.Clear();
foreach (ComponetInfo obj in list)
{
cmbPosition.Items.Add(obj.PositionNum);
}
cmbPosition.Text = "";
cmbPosition.Focus();
cmbPosition.BackColor =System.Drawing.Color.White;
if (list.Count == 1)
{
cmbPosition.Text = list[0].PositionNum;
currIndex = getIndex(pn, "");
ShowCom();
}
} }
else else
{ {
//未找到对应的PN，请重新输入 //未找到对应的PN，请重新输入
currPn = ""; currPn = "";
currIndex = -1; currIndex = -1;
MessageBox.Show(ResourceControl.GetString("NotFindPN", "未找到对应的PN={0}，请重新扫码", new string[] { pn })); lblMsg.Text = (ResourceControl.GetString("NotFindPN", "未找到数据：PN={0}，请重新扫码", new string[] { pn }));
txtScanPn.Clear(); txtScanPn.Clear();
} }
} }
} }
} }
private void cmbPosition_KeyDown(object sender, KeyEventArgs e)
{
if (currPn == "" || cmbPosition.Text.Trim() == "")
{
return;
}
if (e.KeyCode == Keys.Enter)
{
string pos = cmbPosition.Text.Trim();
currIndex = getIndex(currPn, pos);
if (currIndex >= 0)
{
ShowCom();
}
else
{
//未找到对应的PN，请重新输入
currIndex = -1;
lblMsg.Text = (ResourceControl.GetString("NotFindPNPos", "未找到数据：PN={0}，位置={1}，请重新扫码", new string[] { currPn, pos }));
cmbPosition.Text="";
}
}
}
private void cmbPosition_SelectedIndexChanged(object sender, EventArgs e)
{
if (currPn == ""|| cmbPosition.Text.Trim()=="")
{
return;
}
string pos = cmbPosition.Text.Trim();
currIndex = getIndex(currPn, pos);
if (currIndex >= 0)
{
ShowCom();
}
else
{
//未找到对应的PN，请重新输入
currIndex = -1;
lblMsg.Text=(ResourceControl.GetString("NotFindPNPos", "未找到数据：PN={0}，位置={1}，请重新扫码", new string[] { currPn, pos }));
cmbPosition.Text = "";
}
}
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!