Skip to content

李娜 / Line-Smart-Workstation

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

补料修改

1 个父辈 6a8b92ab
内嵌 并排
正在显示 9 个修改的文件 包含 143 行增加 和 115 行删除
Common/Setting_Init.cs
......@@ -142,11 +142,7 @@ namespace TSA_V.Common
public static string UseAIOBOX = "UseAIOBOX";
/// <summary>
/// 元器件库名称的类型，0=英文，1=中文
/// </summary>
public static string LibNameType = "LibNameType";
//public static string Config_Pwd = "Config_Pwd";
......
Common/Setting_NInit.cs
......@@ -184,7 +184,7 @@ namespace TSA_V.Common
Line_NodeAddr = ConfigAppSettings.GetIntValue(Setting_Init.Line_NodeAddr, Line_NodeAddr);
Line_LastWidth = ConfigAppSettings.GetIntValue(Setting_Init.Line_LastWidth, Line_LastWidth);
Line_WidthPosition = ConfigAppSettings.GetValue(Setting_Init.Line_WidthPosition, Line_WidthPosition);
Soft_NeedChangeConfig = true;
Soft_ChangeOk = true;
LogUtil.info(" 配置迁移完成, 备份并删除原来配置");
......@@ -232,7 +232,7 @@ namespace TSA_V.Common
ConfigAppSettings.RemoveKey(Setting_Init.Line_LastWidth);
ConfigAppSettings.RemoveKey(Setting_Init.Line_WidthPosition);
ConfigAppSettings.RemoveKey("SMF_Serverurl");
ConfigAppSettings.RemoveKey("SMF_CID");
ConfigAppSettings.RemoveKey("SMF_CID");
}
......
DeviceLibrary/manager/StockInfo.cs
......@@ -40,6 +40,10 @@ namespace TSA_V.DeviceLibrary
//上一个节点返回原点
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
}
if (PreLabel != null)
{
LedLabelController.CloseLed(PreLabel.ip, PreLabel.mac);
}
Thread.Sleep(500);
endWorkTime = DateTime.Now;
IsWorking = false;
......@@ -51,46 +55,73 @@ namespace TSA_V.DeviceLibrary
IsWaitMove = false;
waitList = new List<WaitResultInfo>();
}
public void MoveToBag(TSAVPosition position)
private LabelInfo PreLabel = null;
public void MoveToBag(TSAVPosition position,ComponetInfo componet=null)
{
currPosition = position;
waitList = new List<WaitResultInfo>();
IsWaitMove = true;
LastSetpTime = DateTime.Now;
if (position.PositionType.Equals(1))
try
{
//转盘转动
//上一个转盘是否需要回原地？
NodeInfo moveNode = position.GetNode(TSAVBean.RotateMap);
if (moveNode != null)
currPosition = position;
waitList = new List<WaitResultInfo>();
IsWaitMove = true;
LastSetpTime = DateTime.Now;
if (PreLabel != null)
{
if (PreNodeId > 0 && !(moveNode.NodeId.Equals(PreNodeId)))
LedLabelController.CloseLed(PreLabel.ip, PreLabel.mac);
Thread.Sleep(300);
}
if (position.PositionType.Equals(1))
{
//转盘转动
//上一个转盘是否需要回原地？
NodeInfo moveNode = position.GetNode(TSAVBean.RotateMap);
if (moveNode != null)
{
//上一个节点返回原点
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
Thread.Sleep(50);
}
if (PreNodeId > 0 && !(moveNode.NodeId.Equals(PreNodeId)))
{
//上一个节点返回原点
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
Thread.Sleep(50);
}
PUSICANControl.AbsMove(moveNode.NodeId, position.RotatePosition);
waitList.Add(WaitResultInfo.WaitNode(moveNode, position.RotatePosition));
PUSICANControl.AbsMove(moveNode.NodeId, position.RotatePosition);
waitList.Add(WaitResultInfo.WaitNode(moveNode, position.RotatePosition));
PreNodeId = moveNode.NodeId;
PreNodeId = moveNode.NodeId;
}
else
{
LogUtil.error("positionNum=" + position.PositionNum + ",未找到对应的运动轴！");
}
}
else
else if (position.PositionType.Equals(2))
{
LogUtil.error("positionNum=" + position.PositionNum + ",未找到对应的运动轴！");
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
{
if (PreNodeId > 0)
else
{
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
if (PreNodeId > 0)
{
PUSICANControl.AbsMove(PreNodeId, TSAVBean.RotateNode_DefaultPosition);
}
PreNodeId = 0;
LedManager.LightOn(position.DeviceIP, position.getLedList());
waitList.Add(WaitResultInfo.WaitTime(500));
}
PreNodeId = 0;
LedManager.LightOn(position.DeviceIP, position.getLedList());
waitList.Add(WaitResultInfo.WaitTime(500));
}catch(Exception ex)
{
LogUtil.error("MoveToBag 出错：" + ex.ToString());
}
}
}
......
TSA-V/FrmBoardPutCom.Designer.cs
......@@ -37,7 +37,6 @@
this.label4 = new System.Windows.Forms.Label();
this.btnCancel = new System.Windows.Forms.Button();
this.btnNext = new System.Windows.Forms.Button();
this.btnPre = 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();
......@@ -48,6 +47,7 @@
this.lblDes = new System.Windows.Forms.Label();
this.lblPosition = new System.Windows.Forms.Label();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.btnPre = new System.Windows.Forms.Button();
((System.ComponentModel.ISupportInitialize)(this.numCount)).BeginInit();
this.tableLayoutPanel1.SuspendLayout();
this.SuspendLayout();
......@@ -60,10 +60,10 @@
// lblMoveStr
//
this.lblMoveStr.Dock = System.Windows.Forms.DockStyle.Fill;
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(406, 219);
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.Name = "lblMoveStr";
this.lblMoveStr.Size = new System.Drawing.Size(130, 73);
this.lblMoveStr.Size = new System.Drawing.Size(184, 73);
this.lblMoveStr.TabIndex = 294;
this.lblMoveStr.Text = "移动中";
this.lblMoveStr.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -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(406, 292);
this.btnSaveCount.Location = new System.Drawing.Point(352, 292);
this.btnSaveCount.Name = "btnSaveCount";
this.btnSaveCount.Size = new System.Drawing.Size(130, 33);
this.btnSaveCount.Size = new System.Drawing.Size(184, 33);
this.btnSaveCount.TabIndex = 291;
this.btnSaveCount.TabStop = true;
this.btnSaveCount.Text = "保存数量";
......@@ -104,11 +104,11 @@
// label4
//
this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
this.label4.Font = new System.Drawing.Font("微软雅黑", 12F, 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.Location = new System.Drawing.Point(3, 73);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(128, 73);
this.label4.Size = new System.Drawing.Size(155, 73);
this.label4.TabIndex = 289;
this.label4.Text = "位号：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -116,7 +116,7 @@
// btnCancel
//
this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 12F, 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(354, 376);
this.btnCancel.Name = "btnCancel";
this.btnCancel.Size = new System.Drawing.Size(128, 50);
......@@ -128,7 +128,7 @@
// btnNext
//
this.btnNext.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnNext.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
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.Name = "btnNext";
this.btnNext.Size = new System.Drawing.Size(128, 50);
......@@ -137,26 +137,14 @@
this.btnNext.UseVisualStyleBackColor = true;
this.btnNext.Click += new System.EventHandler(this.btnNext_Click);
//
// btnPre
//
this.btnPre.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnPre.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnPre.Location = new System.Drawing.Point(80, 376);
this.btnPre.Name = "btnPre";
this.btnPre.Size = new System.Drawing.Size(128, 50);
this.btnPre.TabIndex = 286;
this.btnPre.Text = "上一个元器件";
this.btnPre.UseVisualStyleBackColor = true;
this.btnPre.Click += new System.EventHandler(this.btnPre_Click);
//
// label1
//
this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
this.label1.Font = new System.Drawing.Font("微软雅黑", 12F, 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.Location = new System.Drawing.Point(3, 219);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(128, 73);
this.label1.Size = new System.Drawing.Size(155, 73);
this.label1.TabIndex = 78;
this.label1.Text = "料盘位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -164,11 +152,11 @@
// label3
//
this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
this.label3.Font = new System.Drawing.Font("微软雅黑", 12F, 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.Location = new System.Drawing.Point(3, 292);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(128, 33);
this.label3.Size = new System.Drawing.Size(155, 33);
this.label3.TabIndex = 76;
this.label3.Text = "数量：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -176,11 +164,11 @@
// label2
//
this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
this.label2.Font = new System.Drawing.Font("微软雅黑", 12F, 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.Location = new System.Drawing.Point(3, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(128, 73);
this.label2.Size = new System.Drawing.Size(155, 73);
this.label2.TabIndex = 73;
this.label2.Text = "物料编号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -188,11 +176,11 @@
// label5
//
this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
this.label5.Font = new System.Drawing.Font("微软雅黑", 12F, 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.Location = new System.Drawing.Point(3, 146);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(128, 73);
this.label5.Size = new System.Drawing.Size(155, 73);
this.label5.TabIndex = 295;
this.label5.Text = "描述：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -205,14 +193,14 @@
0,
0,
0});
this.numCount.Location = new System.Drawing.Point(137, 295);
this.numCount.Location = new System.Drawing.Point(164, 295);
this.numCount.Maximum = new decimal(new int[] {
1410065408,
2,
0,
0});
this.numCount.Name = "numCount";
this.numCount.Size = new System.Drawing.Size(163, 29);
this.numCount.Size = new System.Drawing.Size(112, 29);
this.numCount.TabIndex = 297;
//
// lblPN
......@@ -220,11 +208,11 @@
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("微软雅黑", 12F, 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.Location = new System.Drawing.Point(137, 0);
this.lblPN.Location = new System.Drawing.Point(164, 0);
this.lblPN.Name = "lblPN";
this.lblPN.Size = new System.Drawing.Size(399, 73);
this.lblPN.Size = new System.Drawing.Size(372, 73);
this.lblPN.TabIndex = 298;
this.lblPN.Text = "移动中";
this.lblPN.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -233,10 +221,10 @@
//
this.tableLayoutPanel1.SetColumnSpan(this.lblTagNo, 2);
this.lblTagNo.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblTagNo.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblTagNo.Location = new System.Drawing.Point(137, 73);
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.Name = "lblTagNo";
this.lblTagNo.Size = new System.Drawing.Size(399, 73);
this.lblTagNo.Size = new System.Drawing.Size(372, 73);
this.lblTagNo.TabIndex = 299;
this.lblTagNo.Text = "移动中";
this.lblTagNo.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -245,10 +233,10 @@
//
this.tableLayoutPanel1.SetColumnSpan(this.lblDes, 2);
this.lblDes.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblDes.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblDes.Location = new System.Drawing.Point(137, 146);
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.Name = "lblDes";
this.lblDes.Size = new System.Drawing.Size(399, 73);
this.lblDes.Size = new System.Drawing.Size(372, 73);
this.lblDes.TabIndex = 300;
this.lblDes.Text = "移动中";
this.lblDes.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -257,10 +245,10 @@
//
this.lblPosition.AutoSize = true;
this.lblPosition.Dock = System.Windows.Forms.DockStyle.Fill;
this.lblPosition.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblPosition.Location = new System.Drawing.Point(137, 219);
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.Name = "lblPosition";
this.lblPosition.Size = new System.Drawing.Size(263, 73);
this.lblPosition.Size = new System.Drawing.Size(182, 73);
this.lblPosition.TabIndex = 301;
this.lblPosition.Text = "移动中";
this.lblPosition.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
......@@ -268,9 +256,9 @@
// tableLayoutPanel1
//
this.tableLayoutPanel1.ColumnCount = 3;
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
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);
......@@ -295,17 +283,29 @@
this.tableLayoutPanel1.Size = new System.Drawing.Size(539, 325);
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.Name = "btnPre";
this.btnPre.Size = new System.Drawing.Size(128, 50);
this.btnPre.TabIndex = 303;
this.btnPre.Text = "上一个元器件";
this.btnPre.UseVisualStyleBackColor = true;
this.btnPre.Click += new System.EventHandler(this.btnPre_Click);
//
// FrmBoardPutCom
//
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.btnPre);
this.Controls.Add(this.tableLayoutPanel1);
this.Controls.Add(this.lblLeftInfo);
this.Controls.Add(this.lblEndInfo);
this.Controls.Add(this.btnCancel);
this.Controls.Add(this.btnNext);
this.Controls.Add(this.btnPre);
this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "FrmBoardPutCom";
this.Text = "备料";
......@@ -327,7 +327,6 @@
private System.Windows.Forms.Label label1;
private System.Windows.Forms.Button btnCancel;
private System.Windows.Forms.Button btnNext;
private System.Windows.Forms.Button btnPre;
private System.Windows.Forms.Label label4;
private System.Windows.Forms.LinkLabel btnSaveCount;
private System.Windows.Forms.Label lblEndInfo;
......@@ -341,5 +340,6 @@
private System.Windows.Forms.Label lblDes;
private System.Windows.Forms.Label lblPosition;
private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
private System.Windows.Forms.Button btnPre;
}
}
\ No newline at end of file
TSA-V/FrmBoardPutCom.cs
......@@ -40,6 +40,7 @@ namespace TSA_V
public bool SetOperateInfo(BoardInfo board, string bomName, List<ComponetInfo> list)
{
BoardManager.CurrBoard = board;
this.board = board;
oldConList = list;
comList = new List<ComponetInfo>();
......@@ -125,7 +126,7 @@ namespace TSA_V
LogUtil.info("正在备料中：元器件库【" + bomName + "】位号【" + lblTagNo.Text + "】物料编号【" + currCom.PN + "】料盘编号【" + currCom.PositionNum + "】");
if (currIndex.Equals(0))
{
btnPre.Enabled = false;
btnPre.Enabled = false;
btnNext.Enabled = true;
}
else if (currIndex.Equals(comList.Count - 1))
......@@ -144,7 +145,7 @@ namespace TSA_V
}
else if (TSAVBean.Status.Equals(TSAVStatus.Runing))
{
Work.MoveToBag(currPosition);
Work.MoveToBag(currPosition, currCom);
}
}
private void btnPre_Click(object sender, EventArgs e)
......@@ -167,10 +168,10 @@ namespace TSA_V
{
TSAVPosition position = null;
position = CSVPositionReader<TSAVPosition>.GetPositonByNum(com.PositionNum);
LabelInfo label = LedLabelController.GetLabel(position, com, true);
LabelInfo label = LedLabelController.GetLabel(position, com, false);
LedLabelController.UpdateScreen(label);
}
catch(Exception ex)
catch (Exception ex)
{
LogUtil.error("备料后更新电子屏出错：" + ex.ToString());
}
......@@ -240,7 +241,7 @@ namespace TSA_V
if (TSAVBean.Status > TSAVStatus.Reset)
{
Work.StopWork();
}
}
TSAVBean.IsInPut = false;
}
......
TSA-V/FrmMenu.cs
......@@ -476,7 +476,7 @@ namespace TSA_V
private void btnReplenish_Click(object sender, EventArgs e)
{
if (WorkModeUtil.NoRotaryDisk)
if (WorkModeUtil.OnlyGB)
{
string msg = ResourceControl.GetString("GuobanMode", "操作失败，当前为过板模式");
MessageBoxMidle.Show(this, msg, ResourceCulture.GetString("提示"), MessageBoxButtons.OK, MessageBoxIcon.Error);
......
TSA-V/FrmPutCom.Designer.cs
......@@ -58,7 +58,7 @@
//
this.lblMoveStr.AutoSize = true;
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.Size = new System.Drawing.Size(58, 21);
this.lblMoveStr.TabIndex = 294;
......@@ -90,7 +90,7 @@
//
this.btnSaveCount.AutoSize = true;
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.Size = new System.Drawing.Size(74, 21);
this.btnSaveCount.TabIndex = 291;
......@@ -102,10 +102,10 @@
//
this.txtPartNum.Enabled = false;
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.Name = "txtPartNum";
this.txtPartNum.Size = new System.Drawing.Size(220, 29);
this.txtPartNum.Size = new System.Drawing.Size(172, 29);
this.txtPartNum.TabIndex = 290;
//
// label4
......@@ -113,7 +113,7 @@
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.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.Text = "位号：";
this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -161,10 +161,10 @@
//
this.txtPosition.Enabled = false;
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.Name = "txtPosition";
this.txtPosition.Size = new System.Drawing.Size(163, 29);
this.txtPosition.Size = new System.Drawing.Size(93, 29);
this.txtPosition.TabIndex = 79;
//
// label1
......@@ -172,7 +172,7 @@
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.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.Text = "料盘位置：";
this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -180,10 +180,10 @@
// txtNum
//
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.Name = "txtNum";
this.txtNum.Size = new System.Drawing.Size(163, 29);
this.txtNum.Size = new System.Drawing.Size(93, 29);
this.txtNum.TabIndex = 77;
//
// label3
......@@ -191,7 +191,7 @@
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.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.Text = "数量：";
this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -200,10 +200,10 @@
//
this.txtName.Enabled = false;
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.Name = "txtName";
this.txtName.Size = new System.Drawing.Size(220, 29);
this.txtName.Size = new System.Drawing.Size(172, 29);
this.txtName.TabIndex = 74;
//
// label2
......@@ -211,7 +211,7 @@
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.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.Text = "物料编号：";
this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -220,11 +220,11 @@
//
this.txtDes.Enabled = false;
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.Multiline = true;
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;
//
// label5
......@@ -232,7 +232,7 @@
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.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.Text = "描述：";
this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......
TSA-V/Properties/Resource.en-US.resx
......@@ -2432,22 +2432,22 @@
<value> Descibe： </value>
</data>
<data name="FrmBoardPutCom_label4_Text" xml:space="preserve">
<value> Material Code： </value>
<value>Material Code:</value>
</data>
<data name="FrmBoardPutCom_label1_Text" xml:space="preserve">
<value> Plate Position： </value>
<value>Plate Position:</value>
</data>
<data name="FrmBoardPutCom_label3_Text" xml:space="preserve">
<value> Number： </value>
<value>Number:</value>
</data>
<data name="FrmBoardPutCom_btnCancel_Text" xml:space="preserve">
<value> End </value>
<value>End</value>
</data>
<data name="FrmBoardPutCom_btnNext_Text" xml:space="preserve">
<value> Next </value>
<value>Next</value>
</data>
<data name="FrmBoardPutCom_btnPre_Text" xml:space="preserve">
<value> Previous </value>
<value>Previous</value>
</data>
<data name="UploadFile" xml:space="preserve">
<value> Please upload the program file. </value>
......
TSA-V/Smart-Workstation.csproj
......@@ -9,7 +9,7 @@
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TSA_V</RootNamespace>
<AssemblyName>NW_Client</AssemblyName>
<AssemblyName>NEO STATION</AssemblyName>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!