Skip to content

李娜 / Line-Smart-Workstation

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

补料修改

1 个父辈 6a8b92ab
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 62 行增加 和 34 行删除
Common/Setting_Init.cs
...@@ -143,10 +143,6 @@ namespace TSA_V.Common ...@@ -143,10 +143,6 @@ namespace TSA_V.Common
public static string UseAIOBOX = "UseAIOBOX"; public static string UseAIOBOX = "UseAIOBOX";
/// <summary>
/// 元器件库名称的类型，0=英文，1=中文
/// </summary>
public static string LibNameType = "LibNameType";
//public static string Config_Pwd = "Config_Pwd"; //public static string Config_Pwd = "Config_Pwd";
......
DeviceLibrary/manager/StockInfo.cs
...@@ -40,6 +40,10 @@ namespace TSA_V.DeviceLibrary ...@@ -40,6 +40,10 @@ namespace TSA_V.DeviceLibrary
//上一个节点返回原点 //上一个节点返回原点
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition); PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
} }
if (PreLabel != null)
{
LedLabelController.CloseLed(PreLabel.ip, PreLabel.mac);
}
Thread.Sleep(500); Thread.Sleep(500);
endWorkTime = DateTime.Now; endWorkTime = DateTime.Now;
IsWorking = false; IsWorking = false;
...@@ -51,13 +55,21 @@ namespace TSA_V.DeviceLibrary ...@@ -51,13 +55,21 @@ namespace TSA_V.DeviceLibrary
IsWaitMove = false; IsWaitMove = false;
waitList = new List<WaitResultInfo>(); waitList = new List<WaitResultInfo>();
} }
private LabelInfo PreLabel = null;
public void MoveToBag(TSAVPosition position) public void MoveToBag(TSAVPosition position,ComponetInfo componet=null)
{
try
{ {
currPosition = position; currPosition = position;
waitList = new List<WaitResultInfo>(); waitList = new List<WaitResultInfo>();
IsWaitMove = true; IsWaitMove = true;
LastSetpTime = DateTime.Now; LastSetpTime = DateTime.Now;
if (PreLabel != null)
{
LedLabelController.CloseLed(PreLabel.ip, PreLabel.mac);
Thread.Sleep(300);
}
if (position.PositionType.Equals(1)) if (position.PositionType.Equals(1))
{ {
//转盘转动 //转盘转动
...@@ -82,6 +94,21 @@ namespace TSA_V.DeviceLibrary ...@@ -82,6 +94,21 @@ namespace TSA_V.DeviceLibrary
LogUtil.error("positionNum=" + position.PositionNum + ",未找到对应的运动轴！"); LogUtil.error("positionNum=" + position.PositionNum + ",未找到对应的运动轴！");
} }
} }
else if (position.PositionType.Equals(2))
{
if (componet == null)
{
var smtPoint = TSAVBean.Work.currPoint;
if(smtPoint != null)
{
componet = CSVBomManager.GetCom(BoardManager.CurrBoard.bomName, smtPoint);
}
}
LabelInfo label = LedLabelController.GetLabel(position, componet, true);
LedLabelController.UpdateScreen(label);
PreLabel = label;
}
else else
{ {
if (PreNodeId > 0) if (PreNodeId > 0)
...@@ -92,6 +119,10 @@ namespace TSA_V.DeviceLibrary ...@@ -92,6 +119,10 @@ namespace TSA_V.DeviceLibrary
LedManager.LightOn(position.DeviceIP, position.getLedList()); LedManager.LightOn(position.DeviceIP, position.getLedList());
waitList.Add(WaitResultInfo.WaitTime(500)); waitList.Add(WaitResultInfo.WaitTime(500));
} }
}catch(Exception ex)
{
LogUtil.error("MoveToBag 出错：" + ex.ToString());
}
} }
} }
} }
TSA-V/FrmBoardPutCom.cs
...@@ -40,6 +40,7 @@ namespace TSA_V ...@@ -40,6 +40,7 @@ namespace TSA_V
public bool SetOperateInfo(BoardInfo board, string bomName, List<ComponetInfo> list) public bool SetOperateInfo(BoardInfo board, string bomName, List<ComponetInfo> list)
{ {
BoardManager.CurrBoard = board;
this.board = board; this.board = board;
oldConList = list; oldConList = list;
comList = new List<ComponetInfo>(); comList = new List<ComponetInfo>();
...@@ -144,7 +145,7 @@ namespace TSA_V ...@@ -144,7 +145,7 @@ namespace TSA_V
} }
else if (TSAVBean.Status.Equals(TSAVStatus.Runing)) else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{ {
Work.MoveToBag(currPosition); Work.MoveToBag(currPosition, currCom);
} }
} }
private void btnPre_Click(object sender, EventArgs e) private void btnPre_Click(object sender, EventArgs e)
...@@ -167,10 +168,10 @@ namespace TSA_V ...@@ -167,10 +168,10 @@ namespace TSA_V
{ {
TSAVPosition position = null; TSAVPosition position = null;
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum); position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
LabelInfo label = LedLabelController.GetLabel(position, com, true); LabelInfo label = LedLabelController.GetLabel(position, com, false);
LedLabelController.UpdateScreen(label); LedLabelController.UpdateScreen(label);
} }
catch(Exception ex) catch (Exception ex)
{ {
LogUtil.error("备料后更新电子屏出错：" + ex.ToString()); LogUtil.error("备料后更新电子屏出错：" + ex.ToString());
} }
......
TSA-V/FrmMenu.cs
...@@ -476,7 +476,7 @@ namespace TSA_V ...@@ -476,7 +476,7 @@ namespace TSA_V
private void btnReplenish_Click(object sender, EventArgs e) private void btnReplenish_Click(object sender, EventArgs e)
{ {
if (WorkModeUtil.NoRotaryDisk) if (WorkModeUtil.OnlyGB)
{ {
string msg = ResourceControl.GetString("GuobanMode", "操作失败，当前为过板模式"); string msg = ResourceControl.GetString("GuobanMode", "操作失败，当前为过板模式");
MessageBoxMidle.Show(this, msg, ResourceCulture.GetString("提示"), MessageBoxButtons.OK, MessageBoxIcon.Error); MessageBoxMidle.Show(this, msg, ResourceCulture.GetString("提示"), MessageBoxButtons.OK, MessageBoxIcon.Error);
......
TSA-V/FrmPutCom.Designer.cs
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
// //
this.lblMoveStr.AutoSize = true; this.lblMoveStr.AutoSize = true;
this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveStr.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveStr.Location = new System.Drawing.Point(341, 204); this.lblMoveStr.Location = new System.Drawing.Point(303, 204);
this.lblMoveStr.Name = "lblMoveStr"; this.lblMoveStr.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(58, 21); this.lblMoveStr.Size = new System.Drawing.Size(58, 21);
this.lblMoveStr.TabIndex = 294; this.lblMoveStr.TabIndex = 294;
...@@ -90,7 +90,7 @@ ...@@ -90,7 +90,7 @@
// //
this.btnSaveCount.AutoSize = true; this.btnSaveCount.AutoSize = true;
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(341, 253); this.btnSaveCount.Location = new System.Drawing.Point(303, 253);
this.btnSaveCount.Name = "btnSaveCount"; this.btnSaveCount.Name = "btnSaveCount";
this.btnSaveCount.Size = new System.Drawing.Size(74, 21); this.btnSaveCount.Size = new System.Drawing.Size(74, 21);
this.btnSaveCount.TabIndex = 291; this.btnSaveCount.TabIndex = 291;
...@@ -102,10 +102,10 @@ ...@@ -102,10 +102,10 @@
// //
this.txtPartNum.Enabled = false; this.txtPartNum.Enabled = false;
this.txtPartNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtPartNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPartNum.Location = new System.Drawing.Point(150, 28); this.txtPartNum.Location = new System.Drawing.Point(189, 28);
this.txtPartNum.MaxLength = 20; this.txtPartNum.MaxLength = 20;
this.txtPartNum.Name = "txtPartNum"; this.txtPartNum.Name = "txtPartNum";
this.txtPartNum.Size = new System.Drawing.Size(220, 29); this.txtPartNum.Size = new System.Drawing.Size(172, 29);
this.txtPartNum.TabIndex = 290; this.txtPartNum.TabIndex = 290;
// //
// label4 // label4
...@@ -113,7 +113,7 @@ ...@@ -113,7 +113,7 @@
this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label4.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label4.Location = new System.Drawing.Point(12, 34); this.label4.Location = new System.Drawing.Point(12, 34);
this.label4.Name = "label4"; this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(132, 16); this.label4.Size = new System.Drawing.Size(171, 16);
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;
...@@ -161,10 +161,10 @@ ...@@ -161,10 +161,10 @@
// //
this.txtPosition.Enabled = false; this.txtPosition.Enabled = false;
this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtPosition.Location = new System.Drawing.Point(150, 200); this.txtPosition.Location = new System.Drawing.Point(189, 200);
this.txtPosition.MaxLength = 20; this.txtPosition.MaxLength = 20;
this.txtPosition.Name = "txtPosition"; this.txtPosition.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(163, 29); this.txtPosition.Size = new System.Drawing.Size(93, 29);
this.txtPosition.TabIndex = 79; this.txtPosition.TabIndex = 79;
// //
// label1 // label1
...@@ -172,7 +172,7 @@ ...@@ -172,7 +172,7 @@
this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label1.Location = new System.Drawing.Point(12, 206); this.label1.Location = new System.Drawing.Point(12, 206);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(132, 16); this.label1.Size = new System.Drawing.Size(171, 16);
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;
...@@ -180,10 +180,10 @@ ...@@ -180,10 +180,10 @@
// txtNum // txtNum
// //
this.txtNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtNum.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtNum.Location = new System.Drawing.Point(150, 249); this.txtNum.Location = new System.Drawing.Point(189, 249);
this.txtNum.MaxLength = 20; this.txtNum.MaxLength = 20;
this.txtNum.Name = "txtNum"; this.txtNum.Name = "txtNum";
this.txtNum.Size = new System.Drawing.Size(163, 29); this.txtNum.Size = new System.Drawing.Size(93, 29);
this.txtNum.TabIndex = 77; this.txtNum.TabIndex = 77;
// //
// label3 // label3
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label3.Location = new System.Drawing.Point(12, 255); this.label3.Location = new System.Drawing.Point(12, 255);
this.label3.Name = "label3"; this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(132, 16); this.label3.Size = new System.Drawing.Size(171, 16);
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;
...@@ -200,10 +200,10 @@ ...@@ -200,10 +200,10 @@
// //
this.txtName.Enabled = false; this.txtName.Enabled = false;
this.txtName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtName.Location = new System.Drawing.Point(150, 74); this.txtName.Location = new System.Drawing.Point(189, 74);
this.txtName.MaxLength = 20; this.txtName.MaxLength = 20;
this.txtName.Name = "txtName"; this.txtName.Name = "txtName";
this.txtName.Size = new System.Drawing.Size(220, 29); this.txtName.Size = new System.Drawing.Size(172, 29);
this.txtName.TabIndex = 74; this.txtName.TabIndex = 74;
// //
// label2 // label2
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label2.Location = new System.Drawing.Point(12, 80); this.label2.Location = new System.Drawing.Point(12, 80);
this.label2.Name = "label2"; this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(132, 16); this.label2.Size = new System.Drawing.Size(171, 16);
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;
...@@ -220,11 +220,11 @@ ...@@ -220,11 +220,11 @@
// //
this.txtDes.Enabled = false; this.txtDes.Enabled = false;
this.txtDes.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtDes.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtDes.Location = new System.Drawing.Point(150, 120); this.txtDes.Location = new System.Drawing.Point(189, 120);
this.txtDes.MaxLength = 20; this.txtDes.MaxLength = 20;
this.txtDes.Multiline = true; this.txtDes.Multiline = true;
this.txtDes.Name = "txtDes"; this.txtDes.Name = "txtDes";
this.txtDes.Size = new System.Drawing.Size(324, 62); this.txtDes.Size = new System.Drawing.Size(276, 62);
this.txtDes.TabIndex = 296; this.txtDes.TabIndex = 296;
// //
// label5 // label5
...@@ -232,7 +232,7 @@ ...@@ -232,7 +232,7 @@
this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label5.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label5.Location = new System.Drawing.Point(12, 143); this.label5.Location = new System.Drawing.Point(12, 143);
this.label5.Name = "label5"; this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(132, 16); this.label5.Size = new System.Drawing.Size(171, 16);
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;
......
TSA-V/Properties/Resource.en-US.resx
...@@ -2432,22 +2432,22 @@ ...@@ -2432,22 +2432,22 @@
<value> Descibe： </value> <value> Descibe： </value>
</data> </data>
<data name="FrmBoardPutCom_label4_Text" xml:space="preserve"> <data name="FrmBoardPutCom_label4_Text" xml:space="preserve">
<value> Material Code： </value> <value>Material Code:</value>
</data> </data>
<data name="FrmBoardPutCom_label1_Text" xml:space="preserve"> <data name="FrmBoardPutCom_label1_Text" xml:space="preserve">
<value> Plate Position： </value> <value>Plate Position:</value>
</data> </data>
<data name="FrmBoardPutCom_label3_Text" xml:space="preserve"> <data name="FrmBoardPutCom_label3_Text" xml:space="preserve">
<value> Number： </value> <value>Number:</value>
</data> </data>
<data name="FrmBoardPutCom_btnCancel_Text" xml:space="preserve"> <data name="FrmBoardPutCom_btnCancel_Text" xml:space="preserve">
<value> End </value> <value>End</value>
</data> </data>
<data name="FrmBoardPutCom_btnNext_Text" xml:space="preserve"> <data name="FrmBoardPutCom_btnNext_Text" xml:space="preserve">
<value> Next </value> <value>Next</value>
</data> </data>
<data name="FrmBoardPutCom_btnPre_Text" xml:space="preserve"> <data name="FrmBoardPutCom_btnPre_Text" xml:space="preserve">
<value> Previous </value> <value>Previous</value>
</data> </data>
<data name="UploadFile" xml:space="preserve"> <data name="UploadFile" xml:space="preserve">
<value> Please upload the program file. </value> <value> Please upload the program file. </value>
......
TSA-V/Smart-Workstation.csproj
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TSA_V</RootNamespace> <RootNamespace>TSA_V</RootNamespace>
<AssemblyName>NW_Client</AssemblyName> <AssemblyName>NEO STATION</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!