Skip to content

李娜 / Line-Smart-Workstation

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

增加扫码补料功能

1 个父辈 6af4d630
内嵌 并排
正在显示 19 个修改的文件 包含 894 行增加 和 45 行删除
TSA-V/FrmMenu.cs
......@@ -555,8 +555,10 @@ namespace TSA_V
List<BoardInfo> listb = new List<BoardInfo>(BoardManager.boardList);
var ls = listb.Select((point) => { return point.boardName; }).ToList();
FrmSelectPoint frma = new FrmSelectPoint(ResourceCulture.GetString("FrmBoardSelect_Text", "请选择程序"), ls, 0);
string selectMode = ResourceCulture.GetString("ScanReplenish", "扫码补料模式");
FrmSelectPoint frma = new FrmSelectPoint(ResourceCulture.GetString("FrmBoardSelect_Text", "请选择程序"), ls, 0, selectMode);
DialogResult result = frma.ShowDialog();
int workType = frma.SelectWorkMode;
if (result.Equals(DialogResult.OK))
{
BoardInfo board = listb[frma.SelectIndex];
......@@ -581,12 +583,27 @@ namespace TSA_V
}
}
list = (from m in list orderby m.PN ascending select m).ToList();
FrmBoardPutCom frm = new FrmBoardPutCom();
if (frm.SetOperateInfo(board, board.bomName, list))
if (workType.Equals(1))
{
this.Visible = false;
frm.ShowDialog();
this.Visible = true;
FrmScanPutCom frm = new FrmScanPutCom();
if (frm.SetOperateInfo(board, board.bomName, list))
{
this.Visible = false;
frm.ShowDialog();
this.Visible = true;
}
}
else
{
FrmBoardPutCom frm = new FrmBoardPutCom();
if (frm.SetOperateInfo(board, board.bomName, list))
{
this.Visible = false;
frm.ShowDialog();
this.Visible = true;
}
}
}
......
TSA-V/FrmSelectPoint.Designer.cs
......@@ -31,6 +31,7 @@
this.btnCancel = new System.Windows.Forms.Button();
this.btnOk = new System.Windows.Forms.Button();
this.cmbPointList = new System.Windows.Forms.ComboBox();
this.chkScanMode = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// btnCancel
......@@ -67,17 +68,29 @@
this.cmbPointList.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbPointList.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbPointList.FormattingEnabled = true;
this.cmbPointList.Location = new System.Drawing.Point(85, 73);
this.cmbPointList.Location = new System.Drawing.Point(83, 61);
this.cmbPointList.Name = "cmbPointList";
this.cmbPointList.Size = new System.Drawing.Size(246, 29);
this.cmbPointList.TabIndex = 275;
this.cmbPointList.SelectedIndexChanged += new System.EventHandler(this.cmbPointList_SelectedIndexChanged);
//
// chkScanMode
//
this.chkScanMode.AutoSize = true;
this.chkScanMode.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkScanMode.Location = new System.Drawing.Point(85, 112);
this.chkScanMode.Name = "chkScanMode";
this.chkScanMode.Size = new System.Drawing.Size(112, 24);
this.chkScanMode.TabIndex = 278;
this.chkScanMode.Text = "扫码补料方式";
this.chkScanMode.UseVisualStyleBackColor = true;
//
// FrmSelectPoint
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(413, 261);
this.Controls.Add(this.chkScanMode);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnOk);
this.Controls.Add(this.cmbPointList);
......@@ -85,6 +98,7 @@
this.Text = "请选择组件";
this.Load += new System.EventHandler(this.FrmSelectPoint_Load);
this.ResumeLayout(false);
this.PerformLayout();
}
......@@ -93,5 +107,6 @@
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Button btnOk;
private System.Windows.Forms.ComboBox cmbPointList;
private System.Windows.Forms.CheckBox chkScanMode;
}
}
\ No newline at end of file
TSA-V/FrmSelectPoint.cs
......@@ -17,13 +17,18 @@ namespace TSA_V
private List<string> pointList = new List<string>();
public int SelectIndex = -1;
public int defaultIndex = 0;
public int SelectWorkMode = 0;//默认是0，当选择扫码补料时=1，
string Title;
public FrmSelectPoint(string title,List<string> pointList,int Index)
public FrmSelectPoint(string title,List<string> pointList,int Index,string chbStr="")
{
this.pointList = pointList;
InitializeComponent();
defaultIndex = Index;
Title = title;
chkScanMode.Text = chbStr;
chkScanMode.Checked = false;
chkScanMode.Visible=(!String.IsNullOrEmpty(chbStr));
}
private FrmSelectPoint( )
{
......@@ -32,6 +37,10 @@ namespace TSA_V
private void btnOk_Click(object sender, EventArgs e)
{
if (chkScanMode.Checked)
{
SelectWorkMode = 1;
}
this.DialogResult = DialogResult.OK;
}
......
TSA-V/Properties/Resource.en-US.resx
......@@ -2789,4 +2789,17 @@
<data name = "FrmSureAddCom_btnClose_Text" xml:space = "preserve"> <value> Cancel Addition </value> </data>
<data name = "FrmSureAddCom_btnSave_Text" xml:space = "preserve"> <value> Confirm Addition </value> </data>
<data name = "PnHasPos" xml:space = "preserve"> <value> The component [{0}] has been configured at position [{1}], please re-enter the position </value> </data>
<data name = "ScanReplenish" xml:space = "preserve"> <value> Scan Replenishment Mode </value> </data>
<data name = "FrmSelectPoint_Text" xml:space = "preserve"> <value> Please select a component </value> </data>
<data name = "FrmSelectPoint_chkScanMode_Text" xml:space = "preserve"> <value> Scan Replenishment Mode </value> </data>
<data name = "FrmScanPutCom_Text" xml:space = "preserve"> <value> Program [43] Component Library [43] Replenishing </value> </data>
<data name = "FrmScanPutCom_label6_Text" xml:space = "preserve"> <value> PN: </value> </data>
<data name = "FrmScanPutCom_label2_Text" xml:space = "preserve"> <value> Material Number: </value> </data>
<data name = "FrmScanPutCom_btnSaveCount_Text" xml:space = "preserve"> <value> Save Quantity </value> </data>
<data name = "FrmScanPutCom_label5_Text" xml:space = "preserve"> <value> Description: </value> </data>
<data name = "FrmScanPutCom_label4_Text" xml:space = "preserve"> <value> Position: </value> </data>
<data name = "FrmScanPutCom_label1_Text" xml:space = "preserve"> <value> Tray Position: </value> </data>
<data name = "FrmScanPutCom_label3_Text" xml:space = "preserve"> <value> Quantity: </value> </data>
<data name = "FrmScanPutCom_btnCancel_Text" xml:space = "preserve"> <value> End </value> </data>
<data name = "NotFindPN" xml:space = "preserve"> <value> PN={0} not found, please scan again </value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.ru-RU.resx
......@@ -2767,4 +2767,17 @@
<data name = "FrmSureAddCom_btnClose_Text" xml:space = "preserve"> <value> 放弃添加 </value> </data>
<data name = "FrmSureAddCom_btnSave_Text" xml:space = "preserve"> <value> 确认添加 </value> </data>
<data name = "PnHasPos" xml:space = "preserve"> <value> 元器件【{0}】已配置位置【{1}】，请重新输入位置 </value> </data>
<data name = "ScanReplenish" xml:space = "preserve"> <value> 扫码补料模式 </value> </data>
<data name = "FrmSelectPoint_Text" xml:space = "preserve"> <value> 请选择组件 </value> </data>
<data name = "FrmSelectPoint_chkScanMode_Text" xml:space = "preserve"> <value> 扫码补料模式 </value> </data>
<data name = "FrmScanPutCom_Text" xml:space = "preserve"> <value> 程序【43】元器件库【43】备料中 </value> </data>
<data name = "FrmScanPutCom_label6_Text" xml:space = "preserve"> <value> PN: </value> </data>
<data name = "FrmScanPutCom_label2_Text" xml:space = "preserve"> <value> 物料编号： </value> </data>
<data name = "FrmScanPutCom_btnSaveCount_Text" xml:space = "preserve"> <value> 保存数量 </value> </data>
<data name = "FrmScanPutCom_label5_Text" xml:space = "preserve"> <value> 描述： </value> </data>
<data name = "FrmScanPutCom_label4_Text" xml:space = "preserve"> <value> 位号： </value> </data>
<data name = "FrmScanPutCom_label1_Text" xml:space = "preserve"> <value> 料盘位置： </value> </data>
<data name = "FrmScanPutCom_label3_Text" xml:space = "preserve"> <value> 数量： </value> </data>
<data name = "FrmScanPutCom_btnCancel_Text" xml:space = "preserve"> <value> 结束 </value> </data>
<data name = "NotFindPN" xml:space = "preserve"> <value> 未找到对应的PN={0}，请重新扫码 </value> </data>
</root>
\ No newline at end of file
TSA-V/Properties/Resource.zh-CN.resx
......@@ -3010,5 +3010,18 @@
<data name = "FrmSureAddCom_焊点列表_Text" xml:space = "preserve"> <value> 列表 </value> </data>
<data name = "FrmSureAddCom_btnClose_Text" xml:space = "preserve"> <value> 放弃添加 </value> </data>
<data name = "FrmSureAddCom_btnSave_Text" xml:space = "preserve"> <value> 确认添加 </value> </data>
<data name = "PnHasPos" xml:space = "preserve"> <value> 元器件【{0}】已配置位置【{1}】，请重新输入位置 </value> </data>
<data name = "PnHasPos" xml:space = "preserve"> <value> 元器件【{0}】已配置位置【{1}】，请重新输入位置 </value> </data>
<data name = "ScanReplenish" xml:space = "preserve"> <value> 扫码补料模式 </value> </data>
<data name = "FrmSelectPoint_Text" xml:space = "preserve"> <value> 请选择组件 </value> </data>
<data name = "FrmSelectPoint_chkScanMode_Text" xml:space = "preserve"> <value> 扫码补料模式 </value> </data>
<data name = "FrmScanPutCom_Text" xml:space = "preserve"> <value> 程序【43】元器件库【43】备料中 </value> </data>
<data name = "FrmScanPutCom_label6_Text" xml:space = "preserve"> <value> PN: </value> </data>
<data name = "FrmScanPutCom_label2_Text" xml:space = "preserve"> <value> 物料编号： </value> </data>
<data name = "FrmScanPutCom_btnSaveCount_Text" xml:space = "preserve"> <value> 保存数量 </value> </data>
<data name = "FrmScanPutCom_label5_Text" xml:space = "preserve"> <value> 描述： </value> </data>
<data name = "FrmScanPutCom_label4_Text" xml:space = "preserve"> <value> 位号： </value> </data>
<data name = "FrmScanPutCom_label1_Text" xml:space = "preserve"> <value> 料盘位置： </value> </data>
<data name = "FrmScanPutCom_label3_Text" xml:space = "preserve"> <value> 数量： </value> </data>
<data name = "FrmScanPutCom_btnCancel_Text" xml:space = "preserve"> <value> 结束 </value> </data>
<data name = "NotFindPN" xml:space = "preserve"> <value> 未找到对应的PN={0}，请重新扫码 </value> </data>
</root>
\ No newline at end of file
TSA-V/Smart-Workstation.csproj
......@@ -209,6 +209,12 @@
<Compile Include="frmBoard\FrmListViewer.Designer.cs">
<DependentUpon>FrmListViewer.cs</DependentUpon>
</Compile>
<Compile Include="frmCom\FrmScanPutCom.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="frmCom\FrmScanPutCom.Designer.cs">
<DependentUpon>FrmScanPutCom.cs</DependentUpon>
</Compile>
<Compile Include="frmCom\FrmSureAddCom.cs">
<SubType>Form</SubType>
</Compile>
......@@ -234,10 +240,10 @@
<Compile Include="frmBoard\FrmAddBoard.Designer.cs">
<DependentUpon>FrmAddBoard.cs</DependentUpon>
</Compile>
<Compile Include="FrmAddCom.cs">
<Compile Include="frmCom\FrmAddCom.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmAddCom.Designer.cs">
<Compile Include="frmCom\FrmAddCom.Designer.cs">
<DependentUpon>FrmAddCom.cs</DependentUpon>
</Compile>
<Compile Include="FrmBase.cs">
......@@ -294,10 +300,10 @@
<Compile Include="FrmChangeWidth.Designer.cs">
<DependentUpon>FrmChangeWidth.cs</DependentUpon>
</Compile>
<Compile Include="FrmBoardPutCom.cs">
<Compile Include="frmCom\FrmBoardPutCom.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmBoardPutCom.Designer.cs">
<Compile Include="frmCom\FrmBoardPutCom.Designer.cs">
<DependentUpon>FrmBoardPutCom.cs</DependentUpon>
</Compile>
<Compile Include="manager\MouseManager.cs" />
......@@ -394,10 +400,10 @@
<Compile Include="FrmMenu.Designer.cs">
<DependentUpon>FrmMenu.cs</DependentUpon>
</Compile>
<Compile Include="FrmPutCom.cs">
<Compile Include="frmCom\FrmPutCom.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="FrmPutCom.Designer.cs">
<Compile Include="frmCom\FrmPutCom.Designer.cs">
<DependentUpon>FrmPutCom.cs</DependentUpon>
</Compile>
<Compile Include="FrmSelectPoint.cs">
......@@ -451,7 +457,7 @@
<EmbeddedResource Include="frmBoard\FrmAddBoard.resx">
<DependentUpon>FrmAddBoard.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmAddCom.resx">
<EmbeddedResource Include="frmCom\FrmAddCom.resx">
<DependentUpon>FrmAddCom.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmBase.resx">
......@@ -485,6 +491,9 @@
<EmbeddedResource Include="frmBoard\FrmListViewer.resx">
<DependentUpon>FrmListViewer.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmCom\FrmScanPutCom.resx">
<DependentUpon>FrmScanPutCom.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="frmCom\FrmSureAddCom.resx">
<DependentUpon>FrmSureAddCom.cs</DependentUpon>
<SubType>Designer</SubType>
......@@ -508,7 +517,7 @@
<EmbeddedResource Include="FrmChangeWidth.resx">
<DependentUpon>FrmChangeWidth.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmBoardPutCom.resx">
<EmbeddedResource Include="frmCom\FrmBoardPutCom.resx">
<DependentUpon>FrmBoardPutCom.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="projector\FrmViewScreen.resx">
......@@ -560,7 +569,7 @@
<EmbeddedResource Include="FrmMenu.resx">
<DependentUpon>FrmMenu.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmPutCom.resx">
<EmbeddedResource Include="frmCom\FrmPutCom.resx">
<DependentUpon>FrmPutCom.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="FrmSelectPoint.resx">
......
TSA-V/FrmBoardPutCom.Designer.cs → TSA-V/frmCom/FrmBoardPutCom.Designer.cs
......@@ -61,9 +61,9 @@
//
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.Location = new System.Drawing.Point(352, 219);
this.lblMoveStr.Location = new System.Drawing.Point(352, 201);
this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(184, 73);
this.lblMoveStr.Size = new System.Drawing.Size(184, 67);
this.lblMoveStr.TabIndex = 294;
this.lblMoveStr.Text = "移动中";
this.lblMoveStr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -72,7 +72,7 @@
//
this.lblLeftInfo.AutoSize = true;
this.lblLeftInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblLeftInfo.Location = new System.Drawing.Point(226, 437);
this.lblLeftInfo.Location = new System.Drawing.Point(226, 430);
this.lblLeftInfo.Name = "lblLeftInfo";
this.lblLeftInfo.Size = new System.Drawing.Size(44, 17);
this.lblLeftInfo.TabIndex = 293;
......@@ -82,7 +82,7 @@
//
this.lblEndInfo.AutoSize = true;
this.lblEndInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblEndInfo.Location = new System.Drawing.Point(83, 437);
this.lblEndInfo.Location = new System.Drawing.Point(83, 430);
this.lblEndInfo.Name = "lblEndInfo";
this.lblEndInfo.Size = new System.Drawing.Size(44, 17);
this.lblEndInfo.TabIndex = 292;
......@@ -92,9 +92,9 @@
//
this.btnSaveCount.Dock = System.Windows.Forms.DockStyle.Fill;
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, 292);
this.btnSaveCount.Location = new System.Drawing.Point(352, 268);
this.btnSaveCount.Name = "btnSaveCount";
this.btnSaveCount.Size = new System.Drawing.Size(184, 33);
this.btnSaveCount.Size = new System.Drawing.Size(184, 32);
this.btnSaveCount.TabIndex = 291;
this.btnSaveCount.TabStop = true;
this.btnSaveCount.Text = "保存数量";
......@@ -106,9 +106,9 @@
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(3, 73);
this.label4.Location = new System.Drawing.Point(3, 67);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(155, 73);
this.label4.Size = new System.Drawing.Size(155, 67);
this.label4.TabIndex = 289;
this.label4.Text = "位号：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -117,7 +117,7 @@
//
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.Location = new System.Drawing.Point(354, 376);
this.btnCancel.Location = new System.Drawing.Point(354, 369);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(128, 50);
this.btnCancel.TabIndex = 288;
......@@ -129,7 +129,7 @@
//
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnNext.Location = new System.Drawing.Point(217, 376);
this.btnNext.Location = new System.Drawing.Point(217, 369);
this.btnNext.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(128, 50);
this.btnNext.TabIndex = 287;
......@@ -142,9 +142,9 @@
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(3, 219);
this.label1.Location = new System.Drawing.Point(3, 201);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(155, 73);
this.label1.Size = new System.Drawing.Size(155, 67);
this.label1.TabIndex = 78;
this.label1.Text = "料盘位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -154,9 +154,9 @@
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(3, 292);
this.label3.Location = new System.Drawing.Point(3, 268);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(155, 33);
this.label3.Size = new System.Drawing.Size(155, 32);
this.label3.TabIndex = 76;
this.label3.Text = "数量：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -168,7 +168,7 @@
this.label2.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(3, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(155, 73);
this.label2.Size = new System.Drawing.Size(155, 67);
this.label2.TabIndex = 73;
this.label2.Text = "物料编号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -178,9 +178,9 @@
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(3, 146);
this.label5.Location = new System.Drawing.Point(3, 134);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(155, 73);
this.label5.Size = new System.Drawing.Size(155, 67);
this.label5.TabIndex = 295;
this.label5.Text = "描述：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -193,7 +193,7 @@
0,
0,
0});
this.numCount.Location = new System.Drawing.Point(164, 295);
this.numCount.Location = new System.Drawing.Point(164, 271);
this.numCount.Maximum = new decimal(new int[] {
1410065408,
2,
......@@ -212,7 +212,7 @@
this.lblPN.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblPN.Location = new System.Drawing.Point(164, 0);
this.lblPN.Name = "lblPN";
this.lblPN.Size = new System.Drawing.Size(372, 73);
this.lblPN.Size = new System.Drawing.Size(372, 67);
this.lblPN.TabIndex = 298;
this.lblPN.Text = "移动中";
this.lblPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -222,9 +222,9 @@
this.tableLayoutPanel1.SetColumnSpan(this.lblTagNo, 2);
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.Location = new System.Drawing.Point(164, 73);
this.lblTagNo.Location = new System.Drawing.Point(164, 67);
this.lblTagNo.Name = "lblTagNo";
this.lblTagNo.Size = new System.Drawing.Size(372, 73);
this.lblTagNo.Size = new System.Drawing.Size(372, 67);
this.lblTagNo.TabIndex = 299;
this.lblTagNo.Text = "移动中";
this.lblTagNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -234,9 +234,9 @@
this.tableLayoutPanel1.SetColumnSpan(this.lblDes, 2);
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.Location = new System.Drawing.Point(164, 146);
this.lblDes.Location = new System.Drawing.Point(164, 134);
this.lblDes.Name = "lblDes";
this.lblDes.Size = new System.Drawing.Size(372, 73);
this.lblDes.Size = new System.Drawing.Size(372, 67);
this.lblDes.TabIndex = 300;
this.lblDes.Text = "移动中";
this.lblDes.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -246,9 +246,9 @@
this.lblPosition.AutoSize = true;
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.Location = new System.Drawing.Point(164, 219);
this.lblPosition.Location = new System.Drawing.Point(164, 201);
this.lblPosition.Name = "lblPosition";
this.lblPosition.Size = new System.Drawing.Size(182, 73);
this.lblPosition.Size = new System.Drawing.Size(182, 67);
this.lblPosition.TabIndex = 301;
this.lblPosition.Text = "移动中";
this.lblPosition.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -280,14 +280,14 @@
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F));
this.tableLayoutPanel1.Size = new System.Drawing.Size(539, 325);
this.tableLayoutPanel1.Size = new System.Drawing.Size(539, 300);
this.tableLayoutPanel1.TabIndex = 302;
//
// btnPre
//
this.btnPre.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPre.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPre.Location = new System.Drawing.Point(83, 376);
this.btnPre.Location = new System.Drawing.Point(83, 369);
this.btnPre.Name = "btnPre";
this.btnPre.Size = new System.Drawing.Size(128, 50);
this.btnPre.TabIndex = 303;
......
TSA-V/frmCom/FrmScanPutCom.Designer.cs 0 → 100644
namespace TSA_V
{
partial class FrmScanPutCom
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.lblMoveStr = new System.Windows.Forms.Label();
this.btnSaveCount = new System.Windows.Forms.Button();
this.label4 = new System.Windows.Forms.Label();
this.btnCancel = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.numCount = new System.Windows.Forms.NumericUpDown();
this.lblPN = new System.Windows.Forms.Label();
this.lblTagNo = new System.Windows.Forms.Label();
this.lblDes = new System.Windows.Forms.Label();
this.lblPosition = new System.Windows.Forms.Label();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.txtScanPn = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.numCount)).BeginInit();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
// timer1
//
this.timer1.Interval = 300;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
//
// lblMoveStr
//
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.Location = new System.Drawing.Point(352, 180);
this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(184, 60);
this.lblMoveStr.TabIndex = 294;
this.lblMoveStr.Text = "移动中";
this.lblMoveStr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// btnSaveCount
//
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.Location = new System.Drawing.Point(352, 243);
this.btnSaveCount.Name = "btnSaveCount";
this.btnSaveCount.Size = new System.Drawing.Size(128, 50);
this.btnSaveCount.TabIndex = 291;
this.btnSaveCount.Text = "保存数量";
this.btnSaveCount.Click += new System.EventHandler(this.btnSaveCount_LinkClicked);
//
// label4
//
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label4.Location = new System.Drawing.Point(3, 60);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(155, 60);
this.label4.TabIndex = 289;
this.label4.Text = "位号：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// btnCancel
//
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.Location = new System.Drawing.Point(373, 364);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(128, 50);
this.btnCancel.TabIndex = 288;
this.btnCancel.Text = "结束";
this.btnCancel.UseVisualStyleBackColor = true;
this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
//
// label1
//
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label1.Location = new System.Drawing.Point(3, 180);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(155, 60);
this.label1.TabIndex = 78;
this.label1.Text = "料盘位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label3
//
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label3.Location = new System.Drawing.Point(3, 240);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(155, 60);
this.label3.TabIndex = 76;
this.label3.Text = "数量：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label2
//
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label2.Location = new System.Drawing.Point(3, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(155, 60);
this.label2.TabIndex = 73;
this.label2.Text = "物料编号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label5
//
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label5.Location = new System.Drawing.Point(3, 120);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(155, 60);
this.label5.TabIndex = 295;
this.label5.Text = "描述：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// numCount
//
this.numCount.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.numCount.Increment = new decimal(new int[] {
10,
0,
0,
0});
this.numCount.Location = new System.Drawing.Point(164, 256);
this.numCount.Margin = new System.Windows.Forms.Padding(3, 16, 3, 3);
this.numCount.Maximum = new decimal(new int[] {
1410065408,
2,
0,
0});
this.numCount.Name = "numCount";
this.numCount.Size = new System.Drawing.Size(112, 29);
this.numCount.TabIndex = 297;
//
// lblPN
//
this.lblPN.AutoSize = true;
this.tableLayoutPanel1.SetColumnSpan(this.lblPN, 2);
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.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblPN.Location = new System.Drawing.Point(164, 0);
this.lblPN.Name = "lblPN";
this.lblPN.Size = new System.Drawing.Size(372, 60);
this.lblPN.TabIndex = 298;
this.lblPN.Text = "移动中";
this.lblPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblTagNo
//
this.tableLayoutPanel1.SetColumnSpan(this.lblTagNo, 2);
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.Location = new System.Drawing.Point(164, 60);
this.lblTagNo.Name = "lblTagNo";
this.lblTagNo.Size = new System.Drawing.Size(372, 60);
this.lblTagNo.TabIndex = 299;
this.lblTagNo.Text = "移动中";
this.lblTagNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblDes
//
this.tableLayoutPanel1.SetColumnSpan(this.lblDes, 2);
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.Location = new System.Drawing.Point(164, 120);
this.lblDes.Name = "lblDes";
this.lblDes.Size = new System.Drawing.Size(372, 60);
this.lblDes.TabIndex = 300;
this.lblDes.Text = "移动中";
this.lblDes.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// lblPosition
//
this.lblPosition.AutoSize = true;
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.Location = new System.Drawing.Point(164, 180);
this.lblPosition.Name = "lblPosition";
this.lblPosition.Size = new System.Drawing.Size(182, 60);
this.lblPosition.TabIndex = 301;
this.lblPosition.Text = "移动中";
this.lblPosition.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
//
// tableLayoutPanel1
//
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, 35F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35F));
this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
this.tableLayoutPanel1.Controls.Add(this.lblMoveStr, 2, 3);
this.tableLayoutPanel1.Controls.Add(this.numCount, 1, 4);
this.tableLayoutPanel1.Controls.Add(this.lblPosition, 1, 3);
this.tableLayoutPanel1.Controls.Add(this.lblPN, 1, 0);
this.tableLayoutPanel1.Controls.Add(this.lblDes, 1, 2);
this.tableLayoutPanel1.Controls.Add(this.btnSaveCount, 2, 4);
this.tableLayoutPanel1.Controls.Add(this.lblTagNo, 1, 1);
this.tableLayoutPanel1.Controls.Add(this.label5, 0, 2);
this.tableLayoutPanel1.Controls.Add(this.label4, 0, 1);
this.tableLayoutPanel1.Controls.Add(this.label1, 0, 3);
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.Location = new System.Drawing.Point(21, 25);
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
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));
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.Size = new System.Drawing.Size(539, 300);
this.tableLayoutPanel1.TabIndex = 302;
//
// txtScanPn
//
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.Name = "txtScanPn";
this.txtScanPn.Size = new System.Drawing.Size(257, 29);
this.txtScanPn.TabIndex = 304;
this.txtScanPn.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtScanPn_KeyDown);
//
// label6
//
this.label6.AutoSize = true;
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(60, 381);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(37, 21);
this.label6.TabIndex = 305;
this.label6.Text = "PN:";
//
// FrmScanPutCom
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(591, 488);
this.Controls.Add(this.label6);
this.Controls.Add(this.txtScanPn);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.btnCancel);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmScanPutCom";
this.Text = "备料";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FrmPutCom_FormClosing);
this.Load += new System.EventHandler(this.FrmPutCom_Load);
this.Shown += new System.EventHandler(this.FrmPutCom_Shown);
((System.ComponentModel.ISupportInitialize)(this.numCount)).EndInit();
this.tableLayoutPanel1.ResumeLayout(false);
this.tableLayoutPanel1.PerformLayout();
this.ResumeLayout(false);
this.PerformLayout();
}
#endregion
private System.Windows.Forms.Label label3;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Button btnSaveCount;
private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label lblMoveStr;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.NumericUpDown numCount;
private System.Windows.Forms.Label lblPN;
private System.Windows.Forms.Label lblTagNo;
private System.Windows.Forms.Label lblDes;
private System.Windows.Forms.Label lblPosition;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.TextBox txtScanPn;
private System.Windows.Forms.Label label6;
}
}
\ No newline at end of file
TSA-V/frmCom/FrmScanPutCom.cs 0 → 100644
using PUSICANLibrary;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using TSA_V.Common;
using TSA_V.DeviceLibrary;
using TSA_V.LoadCSVLibrary;
namespace TSA_V
{
public partial class FrmScanPutCom : FrmBase
{
private string bomName = "";
private StockInfo Work = new StockInfo();
private TSAVPosition currPosition = null;
ComponetInfo currCom = new ComponetInfo();
private List<ComponetInfo> oldConList = new List<ComponetInfo>();
private List<ComponetInfo> comList = null;
private string currPn ="";
private int currIndex = -1;
private BoardInfo board;
public FrmScanPutCom()
{
InitializeComponent();
}
private void FrmPutCom_Load(object sender, EventArgs e)
{
LanguageProcess();
TSAVBean.IsInPut = true;
Work.StartWork();
SetScreen();
timer1.Enabled = true;
txtScanPn.Text = "";
txtScanPn.Focus();
}
public bool SetOperateInfo(BoardInfo board, string bomName, List<ComponetInfo> list)
{
BoardManager.CurrBoard = board;
this.board = board;
oldConList = list;
comList = new List<ComponetInfo>();
//List<string> positinList = new List<string>();
//foreach (ComponetInfo obj in list)
//{
// if (positinList.Contains(obj.PositionNum))
// {
// }
// else
// {
// positinList.Add(obj.PositionNum);
// comList.Add(obj);
// }
//}
comList = new List<ComponetInfo>(list);
//排序
comList = (from m in comList orderby m.PN, m.GetSortPosition() ascending select m).ToList();
this.bomName = bomName;
this.Text =ResourceCulture.GetString(ResourceCulture.BLText, "程序【{0}】元器件库【{1}】备料中", board.boardName, bomName);
LogUtil.info("开始备料：程序【" + board.boardName + "】元器件库【" + bomName + "】");
if (comList.Count <= 0)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.ConotFindCom,"未找到需要备料的元器件！"));
return false;
}
ClearCom();
if (!Setting_NInit.App_IsDebug)
{
if (TSAVBean.Status <= TSAVStatus.Wait)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DeviceNotOk, "设备未连接，无法备料！"));
return false;
}
else if (TSAVBean.Status.Equals(TSAVStatus.Reset))
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.DeviceInReset, "设备正在重置中，请稍后再备料！"));
return false;
}
}
return true;
}
private void ClearCom()
{
txtScanPn.Text = string.Empty;
currPn = "";
currCom = null;
lblMoveStr.Text = "";
this.lblPN.Text = "";
this.numCount.Text = "";
this.lblTagNo.Text = "";
this.lblPosition.Text = "";
this.lblDes.Text = "";
txtScanPn.Focus();
btnSaveCount.Visible = false ;
}
private int getIndex(string pn)
{
int index = -1;
for(int i = 0; i < comList.Count; i++)
{
if (comList[i].PN.Equals(pn))
{
index = i;
break;
}
}
return index;
}
private void ShowCom()
{
currCom = comList[currIndex];
currPosition = CSVPositionReader<TSAVPosition>.GetPositonByNum(currCom.PositionNum);
this.lblPN.Text = currCom.PN;
this.numCount.Text = currCom.ComCount.ToString();
this.lblTagNo.Text = currCom.TagNo;
this.lblPosition.Text = currCom.PositionNum;
this.lblDes.Text = currCom.ComponentDes;
btnSaveCount.Visible = true;
if (String.IsNullOrEmpty(currCom.TagNo))
{
string tagNo = "";
List<SMTPointInfo> smts = (from m in board.smtList where m.PN.Equals(currCom.PN) select m).ToList();
foreach(SMTPointInfo smt in smts)
{
tagNo += smt.TagNo + " ";
}
lblTagNo.Text = tagNo;
}
LogUtil.info("正在备料中：元器件库【" + bomName + "】位号【" + lblTagNo.Text + "】物料编号【" + currCom.PN + "】料盘编号【" + currCom.PositionNum + "】");
if (currPosition == null)
{
MessageBox.Show(ResourceCulture.GetString(ResourceCulture.CanotFindPosition, "未找到物料编号【{0}】的坐标", currCom.PositionNum));
}
else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{
Work.MoveToBag(currPosition, currCom);
}
numCount.Focus();
}
private void SaveCom()
{
int newCount = (int)numCount.Value;
ComponetInfo com = comList[currIndex];
com.ComCount = newCount.ToString();
CSVBomManager.UpdateComponet(bomName, com);
try
{
TSAVPosition position = null;
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
LabelInfo label = LedLabelController.GetLabel(position, com, false);
LedLabelController.UpdateScreen(label);
}
catch (Exception ex)
{
LogUtil.error("备料后更新电子屏出错：" + ex.ToString());
}
}
private void btnCancel_Click(object sender, EventArgs e)
{
this.Close();
}
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);　// 其他键按默认处理　
}
private void btnSaveCount_LinkClicked(object sender, EventArgs e)
{
SaveCom();
ClearCom();
}
private void FrmPutCom_FormClosing(object sender, FormClosingEventArgs e)
{
LogUtil.info("结束备料：元器件库【" + bomName + "】");
timer1.Enabled = false;
if (TSAVBean.Status > TSAVStatus.Reset)
{
Work.StopWork();
}
TSAVBean.IsInPut = false;
}
private void timer1_Tick(object sender, EventArgs e)
{
if (currPn == "")
{
lblMoveStr.Text = "";
txtScanPn.Focus();
}
else
{
numCount.Focus();
if (Work.IsWorking)
{
if (Work.IsWaitMove)
{
lblMoveStr.Text = ResourceCulture.GetString(ResourceCulture.Move, "移动中");
CheckWorkWait();
}
else if (IOManager.IOValue(IOManager.Footrest_Single).Equals(IO_VALUE.HIGH))
{
//btnNext.PerformClick();
//点脚踏时保存。
btnSaveCount.PerformClick();
}
if (!Work.IsWaitMove)
{
lblMoveStr.Text = ResourceCulture.GetString(ResourceCulture.Inplace, "已到位");
}
}
}
}
private void CheckWorkWait()
{
string waitMsg = "";
List<WaitResultInfo> list = Work.waitList;
//当等待超过一分钟时，需要打印提示
TimeSpan span = DateTime.Now - Work.LastSetpTime;
bool isOk = WaitResultInfo.GetWaitResult(list, span,false, out waitMsg);
if (isOk)
{
Work.EndWait();
}
else
{
if (span.TotalMinutes > 1)
{
waitMsg = "等待【" + waitMsg + "】超时 已等待【" + Math.Round( span.TotalMinutes ,2)+ "】分钟，";
foreach (WaitResultInfo wait in list)
{
waitMsg = waitMsg + "\r\n" + wait.ToStr();
}
LogUtil.error(waitMsg);
}
}
}
private void FrmPutCom_Shown(object sender, EventArgs e)
{
}
private void txtScanPn_KeyDown(object sender, KeyEventArgs e)
{
// 检测 Enter 键
if (e.KeyCode == Keys.Enter)
{
if (currPn == "")
{
string pn = txtScanPn.Text.Trim();
currIndex = getIndex(pn);
if (currIndex >= 0)
{
currPn = pn;
ShowCom();
}
else
{
//未找到对应的PN，请重新输入
currPn = "";
currIndex = -1;
MessageBox.Show(ResourceControl.GetString("NotFindPN", "未找到对应的PN={0}，请重新扫码", new string[] { pn }));
txtScanPn.Clear();
}
}
}
}
}
}
TSA-V/frmCom/FrmScanPutCom.resx 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>
\ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!