Skip to content

李娜 / SO664-AssemblyLine

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

1

1 个父辈 716e62a7
内嵌 并排
正在显示 17 个修改的文件 包含 515 行增加 和 513 行删除
source/AssemblyLineClient/FrmEquipBase.Designer.cs
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
this.panBase.Controls.Add(this.btnStart); this.panBase.Controls.Add(this.btnStart);
this.panBase.Controls.Add(this.btnInStore); this.panBase.Controls.Add(this.btnInStore);
this.panBase.Controls.Add(this.btnStop); this.panBase.Controls.Add(this.btnStop);
this.panBase.Location = new System.Drawing.Point(2, 3); this.panBase.Location = new System.Drawing.Point(3, 3);
this.panBase.Name = "panBase"; this.panBase.Name = "panBase";
this.panBase.Size = new System.Drawing.Size(1177, 50); this.panBase.Size = new System.Drawing.Size(1177, 50);
this.panBase.TabIndex = 259; this.panBase.TabIndex = 259;
......
source/AssemblyLineClient/FrmEquipBase.cs
...@@ -17,14 +17,13 @@ using UserFromControl; ...@@ -17,14 +17,13 @@ using UserFromControl;
namespace OnlineStore.AssemblyLine namespace OnlineStore.AssemblyLine
{ {
internal partial class FrmEquipBase : FrmBase internal partial class FrmEquipBase : FrmBase
{ {
//internal static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
internal FrmEquipBase() internal FrmEquipBase()
{ {
InitializeComponent(); InitializeComponent();
} }
protected EquipBase equipBase = null; internal EquipBase equipBase = null;
protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>(); protected Dictionary<string, IOTextControl> DIControlList = new Dictionary<string, IOTextControl>();
protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>(); protected Dictionary<string, IOTextControl> DOControlList = new Dictionary<string, IOTextControl>();
...@@ -94,10 +93,14 @@ namespace OnlineStore.AssemblyLine ...@@ -94,10 +93,14 @@ namespace OnlineStore.AssemblyLine
{ {
FormStatus(true); FormStatus(true);
} }
else
{
MessageBox.Show(equipBase.WarnMsg,"启动失败",MessageBoxButtons.OK,MessageBoxIcon.Error);
}
} }
else else
{ {
MessageBox.Show(equipBase.Name + "已启动，不能重复启动"); MessageBox.Show(equipBase.Name + "已启动，不能重复启动","提示",MessageBoxButtons.OK, MessageBoxIcon.Warning );
} }
} }
protected void StopRun() protected void StopRun()
...@@ -106,7 +109,7 @@ namespace OnlineStore.AssemblyLine ...@@ -106,7 +109,7 @@ namespace OnlineStore.AssemblyLine
{ {
if (equipBase.runStatus <= LineRunStatus.Wait) if (equipBase.runStatus <= LineRunStatus.Wait)
{ {
MessageBox.Show(equipBase.Name + "请先启动设备"); MessageBox.Show(equipBase.Name + "请先启动设备", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
} }
else else
{ {
...@@ -131,7 +134,7 @@ namespace OnlineStore.AssemblyLine ...@@ -131,7 +134,7 @@ namespace OnlineStore.AssemblyLine
} }
else else
{ {
MessageBox.Show(equipBase.Name + "请先启动设备"); MessageBox.Show(equipBase.Name + "请先启动设备", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning );
} }
} }
internal virtual void FormStatus(bool status) internal virtual void FormStatus(bool status)
......
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -111,12 +111,9 @@ namespace OnlineStore.AssemblyLine ...@@ -111,12 +111,9 @@ namespace OnlineStore.AssemblyLine
{ {
return; return;
} }
if ( this.Visible) ReadIOList();
{ ReadBtnDO();
ReadIOList(); lblName.BackColor = equipBean.GetShowColor();
ReadBtnDO();
}
lblName.BackColor = equipBean.GetShowColor();
if (equipBean.runStatus > LineRunStatus.Wait) if (equipBean.runStatus > LineRunStatus.Wait)
{ {
if (btnStart.Enabled) if (btnStart.Enabled)
...@@ -125,20 +122,20 @@ namespace OnlineStore.AssemblyLine ...@@ -125,20 +122,20 @@ namespace OnlineStore.AssemblyLine
} }
} }
else else
{ {
if (!btnStart.Enabled) if (!btnStart.Enabled)
{ {
FormStatus(false ); FormStatus(false);
} }
} }
if (!equipBean.OutEndSendShelfOut.Equals(chbBoxSendShelf.Checked)&&(!IsInCheck)) if (!equipBean.OutEndSendShelfOut.Equals(chbBoxSendShelf.Checked) && (!IsInCheck))
{ {
chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut; chbBoxSendShelf.Checked = equipBean.OutEndSendShelfOut;
} }
lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() + lblAgvInfo.Text = "AGV-" + equipBean.Config.AgvInName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvInName).ToString() +
"\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + ""; "\t AGV-" + equipBean.Config.AgvOutName + " 状态：" + AgvClient.GetAction(equipBean.Config.AgvOutName).ToString() + "";
string canOut = equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块"; string canOut = equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块";
lblStoreStatus.Text = KTK_Store.GetRunStr( equipBean.runStatus) + "(" + canOut + ")"; lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus) + "(" + canOut + ")";
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
string text = ""; string text = "";
List<InOutParam> ps = new List<InOutParam>(equipBean.waitInStoreList); List<InOutParam> ps = new List<InOutParam>(equipBean.waitInStoreList);
...@@ -159,7 +156,7 @@ namespace OnlineStore.AssemblyLine ...@@ -159,7 +156,7 @@ namespace OnlineStore.AssemblyLine
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(equipBean.Name + "界面定时器出错：" ,ex); LogUtil.error(equipBean.Name + "界面定时器出错：", ex);
} }
} }
...@@ -477,7 +474,7 @@ namespace OnlineStore.AssemblyLine ...@@ -477,7 +474,7 @@ namespace OnlineStore.AssemblyLine
int sizePosition = FormUtil.GetIntValue(txtSizePosition); int sizePosition = FormUtil.GetIntValue(txtSizePosition);
equipBean.Config.UpdateUpdownP2(size, sizePosition); equipBean.Config.UpdateUpdownP2(size, sizePosition);
LineManager.SaveFeedingEquipConfig(equipBean.Config); LineManager.SaveFeedingEquipConfig(equipBean.Config);
MessageBox.Show("保存成功！"); MessageBox.Show("保存成功！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
} }
private void btnLineRun_Click(object sender, EventArgs e) private void btnLineRun_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmHYEquip.Designer.cs
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
this.groupBox1.Controls.Add(this.txtSlaveId); this.groupBox1.Controls.Add(this.txtSlaveId);
this.groupBox1.Controls.Add(this.cmbWriteIO); this.groupBox1.Controls.Add(this.cmbWriteIO);
this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.groupBox1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.groupBox1.Location = new System.Drawing.Point(497, 392); this.groupBox1.Location = new System.Drawing.Point(497, 391);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(731, 111); this.groupBox1.Size = new System.Drawing.Size(731, 111);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
...@@ -362,7 +362,7 @@ ...@@ -362,7 +362,7 @@
this.groupDo.Controls.Add(this.HY_LineRun); this.groupDo.Controls.Add(this.HY_LineRun);
this.groupDo.Controls.Add(this.HY_TopCylinder_Up); this.groupDo.Controls.Add(this.HY_TopCylinder_Up);
this.groupDo.Controls.Add(this.HY_LineBackRun); this.groupDo.Controls.Add(this.HY_LineBackRun);
this.groupDo.Location = new System.Drawing.Point(497, 188); this.groupDo.Location = new System.Drawing.Point(497, 192);
this.groupDo.Name = "groupDo"; this.groupDo.Name = "groupDo";
this.groupDo.Size = new System.Drawing.Size(731, 195); this.groupDo.Size = new System.Drawing.Size(731, 195);
this.groupDo.TabIndex = 255; this.groupDo.TabIndex = 255;
...@@ -611,9 +611,9 @@ ...@@ -611,9 +611,9 @@
this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblThisSta.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblThisSta.ForeColor = System.Drawing.Color.Red; this.lblThisSta.ForeColor = System.Drawing.Color.Red;
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(255, 13); this.lblThisSta.Location = new System.Drawing.Point(255, 51);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(470, 157); this.lblThisSta.Size = new System.Drawing.Size(470, 119);
this.lblThisSta.TabIndex = 246; this.lblThisSta.TabIndex = 246;
this.lblThisSta.Text = "等待启动"; this.lblThisSta.Text = "等待启动";
this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; this.lblThisSta.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
...@@ -667,18 +667,18 @@ ...@@ -667,18 +667,18 @@
this.lblHyInfo.AutoSize = true; this.lblHyInfo.AutoSize = true;
this.lblHyInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblHyInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblHyInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblHyInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblHyInfo.Location = new System.Drawing.Point(16, 19); this.lblHyInfo.Location = new System.Drawing.Point(6, 103);
this.lblHyInfo.Name = "lblHyInfo"; this.lblHyInfo.Name = "lblHyInfo";
this.lblHyInfo.Size = new System.Drawing.Size(68, 17); this.lblHyInfo.Size = new System.Drawing.Size(68, 17);
this.lblHyInfo.TabIndex = 281; this.lblHyInfo.TabIndex = 281;
this.lblHyInfo.Text = "运动信息："; this.lblHyInfo.Text = "设备信息：";
// //
// lblMoveInfo // lblMoveInfo
// //
this.lblMoveInfo.AutoSize = true; this.lblMoveInfo.AutoSize = true;
this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblMoveInfo.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblMoveInfo.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblMoveInfo.Location = new System.Drawing.Point(16, 94); this.lblMoveInfo.Location = new System.Drawing.Point(6, 19);
this.lblMoveInfo.Name = "lblMoveInfo"; this.lblMoveInfo.Name = "lblMoveInfo";
this.lblMoveInfo.Size = new System.Drawing.Size(68, 17); this.lblMoveInfo.Size = new System.Drawing.Size(68, 17);
this.lblMoveInfo.TabIndex = 280; this.lblMoveInfo.TabIndex = 280;
...@@ -968,7 +968,7 @@ ...@@ -968,7 +968,7 @@
this.axisMoveControl1.Location = new System.Drawing.Point(5, 3); this.axisMoveControl1.Location = new System.Drawing.Point(5, 3);
this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.axisMoveControl1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.axisMoveControl1.Name = "axisMoveControl1"; this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(566, 427); this.axisMoveControl1.Size = new System.Drawing.Size(566, 398);
this.axisMoveControl1.TabIndex = 0; this.axisMoveControl1.TabIndex = 0;
// //
// FrmHYEquip // FrmHYEquip
......
source/AssemblyLineClient/FrmHYEquip.cs
...@@ -42,23 +42,23 @@ namespace OnlineStore.AssemblyLine ...@@ -42,23 +42,23 @@ namespace OnlineStore.AssemblyLine
foreach (int heigth in LineManager.GetTrayList()) foreach (int heigth in LineManager.GetTrayList())
{ {
cmbSizeList.Items.Add(heigth); cmbSizeList.Items.Add(heigth);
} }
cmbSizeList.SelectedIndex = 0; cmbSizeList.SelectedIndex = 0;
} }
else else
{ {
tabControl1.TabPages.Remove(tabPage2); tabControl1.TabPages.Remove(tabPage2);
} }
LoadDP2(); LoadDP2();
chbDebug.Checked = equipBean.IsDebug; chbDebug.Checked = equipBean.IsDebug;
lblStoreStatus.Text = KTK_Store.GetRunStr( equipBean.runStatus); lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
lblName.Text = equipBean.Name; lblName.Text = equipBean.Name;
this.Text = equipBean.Name; this.Text = equipBean.Name;
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString(); txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
lblHyInfo.Text = equipBean.GetHYDesc(); lblHyInfo.Text = equipBean.GetHYDesc();
LoadDOBtn(groupDo); LoadDOBtn(groupDo);
IsLoad = true; IsLoad = true;
} }
...@@ -114,11 +114,10 @@ namespace OnlineStore.AssemblyLine ...@@ -114,11 +114,10 @@ namespace OnlineStore.AssemblyLine
{ {
return; return;
} }
if (this.Visible)
{ ReadIOList();
ReadIOList(); ReadBtnDO();
ReadBtnDO();
}
lblName.BackColor = equipBean.GetShowColor(); lblName.BackColor = equipBean.GetShowColor();
if (equipBean.runStatus > LineRunStatus.Wait) if (equipBean.runStatus > LineRunStatus.Wait)
{ {
...@@ -138,20 +137,18 @@ namespace OnlineStore.AssemblyLine ...@@ -138,20 +137,18 @@ namespace OnlineStore.AssemblyLine
} }
lblMoveInfo.Text = equipBean.GetMoveStr(); lblMoveInfo.Text = equipBean.GetMoveStr();
// string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ; // string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = KTK_Store.GetRunStr( equipBean.runStatus); lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg; lblThisSta.Text = equipBean.WarnMsg;
} }
catch (Exception ex) catch (Exception ex)
{ {
LogUtil.error(equipBean.Name + "界面定时器出错：" + ex.ToString()); LogUtil.error(equipBean.Name + "界面定时器出错：" + ex.ToString());
} }
} }
private void FrmTest_FormClosing(object sender, FormClosingEventArgs e) private void FrmTest_FormClosing(object sender, FormClosingEventArgs e)
{ {
// KNDAIManager.NeedShow = false;
try try
{ {
if (this.timer1.Enabled) if (this.timer1.Enabled)
...@@ -176,8 +173,7 @@ namespace OnlineStore.AssemblyLine ...@@ -176,8 +173,7 @@ namespace OnlineStore.AssemblyLine
private void WriteDO(IO_VALUE value) private void WriteDO(IO_VALUE value)
{ {
string deviceName = txtDoName.Text; string deviceName = txtDoName.Text;
int index = FormUtil.GetIntValue(txtDOIndex); int index = FormUtil.GetIntValue(txtDOIndex);
// IO_VALUE value = checkBox1.Checked ? IO_VALUE.HIGH : IO_VALUE.LOW;
int time = FormUtil.GetIntValue(txtWriteTime); int time = FormUtil.GetIntValue(txtWriteTime);
int slaveId = FormUtil.GetIntValue(txtSlaveId); int slaveId = FormUtil.GetIntValue(txtSlaveId);
if (time > 0) if (time > 0)
...@@ -243,7 +239,7 @@ namespace OnlineStore.AssemblyLine ...@@ -243,7 +239,7 @@ namespace OnlineStore.AssemblyLine
internal override void FormStatus(bool isStart) internal override void FormStatus(bool isStart)
{ {
btnStart.Enabled = !isStart; btnStart.Enabled = !isStart;
btnStop.Enabled = true; btnStop.Enabled = true;
//btnInStore.Enabled = isStart; //btnInStore.Enabled = isStart;
btnOutStore.Enabled = isStart; btnOutStore.Enabled = isStart;
} }
...@@ -328,7 +324,7 @@ namespace OnlineStore.AssemblyLine ...@@ -328,7 +324,7 @@ namespace OnlineStore.AssemblyLine
} }
} }
private void btnCloseAll_Click(object sender, EventArgs e) private void btnCloseAll_Click(object sender, EventArgs e)
{ {
foreach (Control con in groupDo.Controls) foreach (Control con in groupDo.Controls)
...@@ -401,7 +397,7 @@ namespace OnlineStore.AssemblyLine ...@@ -401,7 +397,7 @@ namespace OnlineStore.AssemblyLine
equipBean.Config.UpdateUpdownP2(size, sizePosition); equipBean.Config.UpdateUpdownP2(size, sizePosition);
equipBean.Config.UpdateUpdownP3(size, sizeBoxP); equipBean.Config.UpdateUpdownP3(size, sizeBoxP);
LineManager.SaveHYEquipConfig(equipBean.Config); LineManager.SaveHYEquipConfig(equipBean.Config);
MessageBox.Show("保存成功！"); MessageBox.Show("保存成功！","提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
} }
private void LoadDP2() private void LoadDP2()
...@@ -440,7 +436,7 @@ namespace OnlineStore.AssemblyLine ...@@ -440,7 +436,7 @@ namespace OnlineStore.AssemblyLine
equipBean.Config.UpdateUpdownP2Detial(size, height, position); equipBean.Config.UpdateUpdownP2Detial(size, height, position);
LineManager.SaveHYEquipConfig(equipBean.Config); LineManager.SaveHYEquipConfig(equipBean.Config);
LogUtil.info(equipBean.Name + "用户操作：尺寸：" + size + "，高度：" + height + "，P2值：" + position + "，保存成功"); LogUtil.info(equipBean.Name + "用户操作：尺寸：" + size + "，高度：" + height + "，P2值：" + position + "，保存成功");
MessageBox.Show("保存成功！"); MessageBox.Show("保存成功！", "提示",MessageBoxButtons.OK, MessageBoxIcon.Information);
listDetitalP2.Items.Clear(); listDetitalP2.Items.Clear();
...@@ -507,7 +503,7 @@ namespace OnlineStore.AssemblyLine ...@@ -507,7 +503,7 @@ namespace OnlineStore.AssemblyLine
} }
private void btnLineRun_Click(object sender, EventArgs e) private void btnLineRun_Click(object sender, EventArgs e)
{ {
equipBean.LineRun(); equipBean.LineRun();
} }
private void btnStopDown_Click(object sender, EventArgs e) private void btnStopDown_Click(object sender, EventArgs e)
{ {
...@@ -515,11 +511,11 @@ namespace OnlineStore.AssemblyLine ...@@ -515,11 +511,11 @@ namespace OnlineStore.AssemblyLine
} }
private void btnLineBackRun_Click(object sender, EventArgs e) private void btnLineBackRun_Click(object sender, EventArgs e)
{ {
equipBean.LineStop(); equipBean.LineStop();
} }
private void btnFrontStopDown_Click(object sender, EventArgs e) private void btnFrontStopDown_Click(object sender, EventArgs e)
{ {
DoBtnClick(sender); DoBtnClick(sender);
...@@ -544,12 +540,12 @@ namespace OnlineStore.AssemblyLine ...@@ -544,12 +540,12 @@ namespace OnlineStore.AssemblyLine
} }
private void HY_ShortL_StopDown_Click(object sender, EventArgs e) private void HY_ShortL_StopDown_Click(object sender, EventArgs e)
{ {
DoBtnClick(sender); DoBtnClick(sender);
} }
private void HY_LongL_StopDown_Click(object sender, EventArgs e) private void HY_LongL_StopDown_Click(object sender, EventArgs e)
{ {
DoBtnClick(sender); DoBtnClick(sender);
} }
...@@ -559,7 +555,7 @@ namespace OnlineStore.AssemblyLine ...@@ -559,7 +555,7 @@ namespace OnlineStore.AssemblyLine
} }
private void HY_StopCylinder_Down_Click(object sender, EventArgs e) private void HY_StopCylinder_Down_Click(object sender, EventArgs e)
{ {
equipBean.CylinderMove(null, IO_Type.HY_StopCylinder_Up, IO_Type.HY_StopCylinder_Down); equipBean.CylinderMove(null, IO_Type.HY_StopCylinder_Up, IO_Type.HY_StopCylinder_Down);
} }
...@@ -569,7 +565,7 @@ namespace OnlineStore.AssemblyLine ...@@ -569,7 +565,7 @@ namespace OnlineStore.AssemblyLine
} }
private void HY_OL_StopCylinder_Down_Click(object sender, EventArgs e) private void HY_OL_StopCylinder_Down_Click(object sender, EventArgs e)
{ {
equipBean.CylinderMove(null, IO_Type.HY_OL_StopCylinder_Up, IO_Type.HY_OL_StopCylinder_Down); equipBean.CylinderMove(null, IO_Type.HY_OL_StopCylinder_Up, IO_Type.HY_OL_StopCylinder_Down);
} }
...@@ -579,19 +575,20 @@ namespace OnlineStore.AssemblyLine ...@@ -579,19 +575,20 @@ namespace OnlineStore.AssemblyLine
} }
private void HY_LocationCylinder_Down1_Click(object sender, EventArgs e) private void HY_LocationCylinder_Down1_Click(object sender, EventArgs e)
{ {
equipBean.CylinderMove(null, IO_Type.HY_LocationCylinder_Up, IO_Type.HY_LocationCylinder_Down); equipBean.CylinderMove(null, IO_Type.HY_LocationCylinder_Up, IO_Type.HY_LocationCylinder_Down);
} }
private void HY_MoveCylinder_Give_Click(object sender, EventArgs e) private void HY_MoveCylinder_Give_Click(object sender, EventArgs e)
{ {
equipBean.CylinderMove(null, IO_Type.HY_MoveCylinder_Take, IO_Type.HY_MoveCylinder_Give); equipBean.CylinderMove(null, IO_Type.HY_MoveCylinder_Take, IO_Type.HY_MoveCylinder_Give);
} }
private void HY_ClampCylinder_Relax_Click(object sender, EventArgs e) private void HY_ClampCylinder_Relax_Click(object sender, EventArgs e)
{ {
equipBean.CylinderMove(null, IO_Type.HY_ClampCylinder_Work, IO_Type.HY_ClampCylinder_Relax); equipBean.CylinderMove(null, IO_Type.HY_ClampCylinder_Work, IO_Type.HY_ClampCylinder_Relax);
} }
} }
} }
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
this.label12 = new System.Windows.Forms.Label(); this.label12 = new System.Windows.Forms.Label();
this.label13 = new System.Windows.Forms.Label(); this.label13 = new System.Windows.Forms.Label();
this.label14 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label();
this.tabPage4 = new System.Windows.Forms.TabPage();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.lblPosId = new System.Windows.Forms.Label(); this.lblPosId = new System.Windows.Forms.Label();
this.btnUpdateStatus = new System.Windows.Forms.Button(); this.btnUpdateStatus = new System.Windows.Forms.Button();
...@@ -62,7 +61,6 @@ ...@@ -62,7 +61,6 @@
this.btnInStoreTset = new System.Windows.Forms.Button(); this.btnInStoreTset = new System.Windows.Forms.Button();
this.button2 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button();
this.button1 = new System.Windows.Forms.Button(); this.button1 = new System.Windows.Forms.Button();
this.listView1 = new System.Windows.Forms.ListView();
this.tabPage5 = new System.Windows.Forms.TabPage(); this.tabPage5 = new System.Windows.Forms.TabPage();
this.panel5 = new System.Windows.Forms.Panel(); this.panel5 = new System.Windows.Forms.Panel();
this.picLine = new System.Windows.Forms.PictureBox(); this.picLine = new System.Windows.Forms.PictureBox();
...@@ -133,7 +131,6 @@ ...@@ -133,7 +131,6 @@
this.panel3.SuspendLayout(); this.panel3.SuspendLayout();
this.tableLayoutPanel2.SuspendLayout(); this.tableLayoutPanel2.SuspendLayout();
this.panel4.SuspendLayout(); this.panel4.SuspendLayout();
this.tabPage4.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.tabPage5.SuspendLayout(); this.tabPage5.SuspendLayout();
this.panel5.SuspendLayout(); this.panel5.SuspendLayout();
...@@ -151,7 +148,6 @@ ...@@ -151,7 +148,6 @@
this.tabControl1.Controls.Add(this.tabPage1); this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2); this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage3); this.tabControl1.Controls.Add(this.tabPage3);
this.tabControl1.Controls.Add(this.tabPage4);
this.tabControl1.Controls.Add(this.tabPage5); this.tabControl1.Controls.Add(this.tabPage5);
this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.tabControl1.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.tabControl1.Location = new System.Drawing.Point(8, 81); this.tabControl1.Location = new System.Drawing.Point(8, 81);
...@@ -164,6 +160,7 @@ ...@@ -164,6 +160,7 @@
// //
// tabPage1 // tabPage1
// //
this.tabPage1.Controls.Add(this.groupBox1);
this.tabPage1.Controls.Add(this.logBox); this.tabPage1.Controls.Add(this.logBox);
this.tabPage1.Location = new System.Drawing.Point(4, 29); this.tabPage1.Location = new System.Drawing.Point(4, 29);
this.tabPage1.Name = "tabPage1"; this.tabPage1.Name = "tabPage1";
...@@ -178,9 +175,9 @@ ...@@ -178,9 +175,9 @@
| System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right))); | System.Windows.Forms.AnchorStyles.Right)));
this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.logBox.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.logBox.Location = new System.Drawing.Point(3, 5); this.logBox.Location = new System.Drawing.Point(3, 3);
this.logBox.Name = "logBox"; this.logBox.Name = "logBox";
this.logBox.Size = new System.Drawing.Size(1317, 599); this.logBox.Size = new System.Drawing.Size(1317, 601);
this.logBox.TabIndex = 106; this.logBox.TabIndex = 106;
this.logBox.Text = ""; this.logBox.Text = "";
this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged); this.logBox.VisibleChanged += new System.EventHandler(this.logBox_VisibleChanged);
...@@ -424,17 +421,6 @@ ...@@ -424,17 +421,6 @@
this.label14.TabIndex = 198; this.label14.TabIndex = 198;
this.label14.Text = "绿色：忙碌中"; this.label14.Text = "绿色：忙碌中";
// //
// tabPage4
//
this.tabPage4.Controls.Add(this.groupBox1);
this.tabPage4.Controls.Add(this.listView1);
this.tabPage4.Location = new System.Drawing.Point(4, 29);
this.tabPage4.Name = "tabPage4";
this.tabPage4.Size = new System.Drawing.Size(1328, 609);
this.tabPage4.TabIndex = 3;
this.tabPage4.Text = " 设备状态 ";
this.tabPage4.UseVisualStyleBackColor = true;
//
// groupBox1 // groupBox1
// //
this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.groupBox1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
...@@ -446,7 +432,7 @@ ...@@ -446,7 +432,7 @@
this.groupBox1.Controls.Add(this.btnInStoreTset); this.groupBox1.Controls.Add(this.btnInStoreTset);
this.groupBox1.Controls.Add(this.button2); this.groupBox1.Controls.Add(this.button2);
this.groupBox1.Controls.Add(this.button1); this.groupBox1.Controls.Add(this.button1);
this.groupBox1.Location = new System.Drawing.Point(417, 102); this.groupBox1.Location = new System.Drawing.Point(32, 60);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(872, 61); this.groupBox1.Size = new System.Drawing.Size(872, 61);
this.groupBox1.TabIndex = 195; this.groupBox1.TabIndex = 195;
...@@ -474,7 +460,7 @@ ...@@ -474,7 +460,7 @@
this.btnUpdateStatus.TabIndex = 195; this.btnUpdateStatus.TabIndex = 195;
this.btnUpdateStatus.Text = "更改为调试状态"; this.btnUpdateStatus.Text = "更改为调试状态";
this.btnUpdateStatus.UseVisualStyleBackColor = false; this.btnUpdateStatus.UseVisualStyleBackColor = false;
this.btnUpdateStatus.Click += new System.EventHandler(this.btnUpdateStatus_Click); //this.btnUpdateStatus.Click += new System.EventHandler(this.btnUpdateStatus_Click);
// //
// txtPosId // txtPosId
// //
...@@ -528,24 +514,6 @@ ...@@ -528,24 +514,6 @@
this.button1.UseVisualStyleBackColor = false; this.button1.UseVisualStyleBackColor = false;
this.button1.Click += new System.EventHandler(this.button1_Click); this.button1.Click += new System.EventHandler(this.button1_Click);
// //
// listView1
//
this.listView1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.listView1.BackColor = System.Drawing.Color.White;
this.listView1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listView1.FullRowSelect = true;
this.listView1.GridLines = true;
this.listView1.HideSelection = false;
this.listView1.Location = new System.Drawing.Point(5, 7);
this.listView1.MultiSelect = false;
this.listView1.Name = "listView1";
this.listView1.Size = new System.Drawing.Size(1319, 582);
this.listView1.TabIndex = 191;
this.listView1.UseCompatibleStateImageBehavior = false;
this.listView1.View = System.Windows.Forms.View.Details;
this.listView1.SelectedIndexChanged += new System.EventHandler(this.listView1_SelectedIndexChanged);
//
// tabPage5 // tabPage5
// //
this.tabPage5.Controls.Add(this.panel5); this.tabPage5.Controls.Add(this.panel5);
...@@ -1028,7 +996,6 @@ ...@@ -1028,7 +996,6 @@
this.panel3.ResumeLayout(false); this.panel3.ResumeLayout(false);
this.tableLayoutPanel2.ResumeLayout(false); this.tableLayoutPanel2.ResumeLayout(false);
this.panel4.ResumeLayout(false); this.panel4.ResumeLayout(false);
this.tabPage4.ResumeLayout(false);
this.groupBox1.ResumeLayout(false); this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout(); this.groupBox1.PerformLayout();
this.tabPage5.ResumeLayout(false); this.tabPage5.ResumeLayout(false);
...@@ -1055,7 +1022,6 @@ ...@@ -1055,7 +1022,6 @@
private System.Windows.Forms.Timer timer1; private System.Windows.Forms.Timer timer1;
private System.Windows.Forms.Label lblStatus; private System.Windows.Forms.Label lblStatus;
private System.Windows.Forms.TabPage tabPage1; private System.Windows.Forms.TabPage tabPage1;
private System.Windows.Forms.ListView listView1;
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.Button button1; private System.Windows.Forms.Button button1;
private System.Windows.Forms.Label lblWarnMsg; private System.Windows.Forms.Label lblWarnMsg;
...@@ -1125,7 +1091,6 @@ ...@@ -1125,7 +1091,6 @@
private System.Windows.Forms.Label lblCID; private System.Windows.Forms.Label lblCID;
private System.Windows.Forms.Label label6; private System.Windows.Forms.Label label6;
private System.Windows.Forms.Label label5; private System.Windows.Forms.Label label5;
private System.Windows.Forms.TabPage tabPage4;
private System.Windows.Forms.Label label8; private System.Windows.Forms.Label label8;
private System.Windows.Forms.ToolStripMenuItem toolName; private System.Windows.Forms.ToolStripMenuItem toolName;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator23; private System.Windows.Forms.ToolStripSeparator toolStripSeparator23;
......
source/AssemblyLineClient/FrmLineStore.cs
...@@ -56,7 +56,7 @@ namespace OnlineStore.AssemblyLine ...@@ -56,7 +56,7 @@ namespace OnlineStore.AssemblyLine
AddForm(" 流水线IO ", frmIOStatus); AddForm(" 流水线IO ", frmIOStatus);
LoadMoveList(); LoadMoveList();
LoadListView(); //LoadListView();
托盘初始化ToolStripMenuItem.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenRFIDWrite).Equals(1); 托盘初始化ToolStripMenuItem.Visible = ConfigAppSettings.GetIntValue(Setting_Init.OpenRFIDWrite).Equals(1);
if (autoValue.Equals(1)) if (autoValue.Equals(1))
...@@ -116,8 +116,7 @@ namespace OnlineStore.AssemblyLine ...@@ -116,8 +116,7 @@ namespace OnlineStore.AssemblyLine
this.Visible = true; this.Visible = true;
this.WindowState = FormWindowState.Maximized; this.WindowState = FormWindowState.Maximized;
this.notifyIcon1.Visible = false; this.notifyIcon1.Visible = false;
this.ShowInTaskbar = true; this.ShowInTaskbar = true;
tabControl1.TabPages.Remove(tabPage4);
//tabControl1.TabPages.Remove(tabPage5); //tabControl1.TabPages.Remove(tabPage5);
picLine.Image = ManagerUtil.M_Line; picLine.Image = ManagerUtil.M_Line;
timer1.Start(); timer1.Start();
...@@ -219,7 +218,7 @@ namespace OnlineStore.AssemblyLine ...@@ -219,7 +218,7 @@ namespace OnlineStore.AssemblyLine
{ {
if (lineBean.runStatus != LineRunStatus.Wait) if (lineBean.runStatus != LineRunStatus.Wait)
{ {
MessageBox.Show(lineBean.Name + "当前状态：" + lineBean.runStatus + "，不能启动！"); MessageBox.Show(lineBean.Name + "当前状态：" + lineBean.runStatus + "，不能启动！","提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return; return;
} }
LogUtil.info("点击 开始启动"); LogUtil.info("点击 开始启动");
...@@ -258,7 +257,7 @@ namespace OnlineStore.AssemblyLine ...@@ -258,7 +257,7 @@ namespace OnlineStore.AssemblyLine
{ {
if (lineBean.runStatus.Equals(LineRunStatus.Wait)) if (lineBean.runStatus.Equals(LineRunStatus.Wait))
{ {
MessageBox.Show(lineBean.Name + "流水线未启动，不需要停止"); MessageBox.Show(lineBean.Name + "流水线未启动，不需要停止", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return; return;
} }
LogUtil.info(lineBean.Name + "点击：停止"); LogUtil.info(lineBean.Name + "点击：停止");
...@@ -274,7 +273,7 @@ namespace OnlineStore.AssemblyLine ...@@ -274,7 +273,7 @@ namespace OnlineStore.AssemblyLine
{ {
if (lineBean.runStatus.Equals(LineRunStatus.Wait)) if (lineBean.runStatus.Equals(LineRunStatus.Wait))
{ {
MessageBox.Show(lineBean.Name + "流水线未启动，无法复位"); MessageBox.Show(lineBean.Name + "流水线未启动，无法复位", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
return; return;
} }
LogUtil.info(lineBean.Name + "点击：复位"); LogUtil.info(lineBean.Name + "点击：复位");
...@@ -364,10 +363,7 @@ namespace OnlineStore.AssemblyLine ...@@ -364,10 +363,7 @@ namespace OnlineStore.AssemblyLine
{ {
LogM(); LogM();
UpdateControl(); UpdateControl();
if (!listView1.Visible)
{
return;
}
string canScanCode = ""; string canScanCode = "";
if (AgvClient.CurrCancelState) if (AgvClient.CurrCancelState)
...@@ -393,7 +389,6 @@ namespace OnlineStore.AssemblyLine ...@@ -393,7 +389,6 @@ namespace OnlineStore.AssemblyLine
{ {
if (move.alarmType.Equals(LineAlarmType.None).Equals(false)) if (move.alarmType.Equals(LineAlarmType.None).Equals(false))
{ {
warnMsg += move.LastAlarmTime.ToLongTimeString() + " " + move.WarnMsg + "\r\n"; warnMsg += move.LastAlarmTime.ToLongTimeString() + " " + move.WarnMsg + "\r\n";
} }
else else
...@@ -403,8 +398,7 @@ namespace OnlineStore.AssemblyLine ...@@ -403,8 +398,7 @@ namespace OnlineStore.AssemblyLine
} }
} }
lblWarnMsg.Text = warnMsg; lblWarnMsg.Text = warnMsg;
UpdateListView();
if (lineBean.runStatus > LineRunStatus.Wait) if (lineBean.runStatus > LineRunStatus.Wait)
{ {
if (启动AToolStripMenuItem.Enabled.Equals(true)) if (启动AToolStripMenuItem.Enabled.Equals(true))
...@@ -428,162 +422,10 @@ namespace OnlineStore.AssemblyLine ...@@ -428,162 +422,10 @@ namespace OnlineStore.AssemblyLine
SetMenuS(复位RToolStripMenuItem, false); SetMenuS(复位RToolStripMenuItem, false);
SetMenuS(停止TToolStripMenuItem, false); SetMenuS(停止TToolStripMenuItem, false);
} }
//if (listView1.Visible)
} //{
// UpdateListView();
#region ListView显示 //}
private void LoadListView()
{
this.listView1.Columns.Clear();
AddHealder("设备名称", 110);
AddHealder("启用", 40);
AddHealder("报警", 110);
AddHealder("状态", 110);
AddHealder("BOX_CID", 80);
AddHealder("在线", 40);
AddHealder("BOX_报警", 110);
AddHealder("BOX状态", 110);
//AddHealder("BOX状态", listView1.Size.Width - 100 - 80 - 80 - 100 - 100 - 100 -40- 8);
foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
{
ListViewItem lvi = new ListViewItem();
lvi.Text = move.Name;
lvi.SubItems.Add(move.Config.IsDebug.Equals(1) ? "✘" : "✔");
lvi.SubItems.Add(move.alarmType.ToString());
// lvi.SubItems.Add(move.lineStatus.ToString());
lvi.SubItems.Add(move.GetRunStr());
BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
if (box != null)
{
string online = "✘";
lvi.SubItems.Add(box.CId.ToString());
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
{
online = "✔";
}
lvi.SubItems.Add(online);
lvi.SubItems.Add(box.SAlarmType.ToString());
lvi.SubItems.Add(box.ToShowStr());
}
else
{
lvi.SubItems.Add("");
lvi.SubItems.Add("");
lvi.SubItems.Add("");
lvi.SubItems.Add("");
}
this.listView1.Items.Add(lvi);
}
ListViewItem emptyView = new ListViewItem();
this.listView1.Items.Add(emptyView);
foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
{
ListViewItem lvi = new ListViewItem();
lvi.Text = equip.Name;
lvi.SubItems.Add(equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
lvi.SubItems.Add(equip.alarmType.ToString());
lvi.SubItems.Add(equip.GetRunStr());
this.listView1.Items.Add(lvi);
}
this.listView1.Items.Add((ListViewItem)emptyView.Clone());
foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
{
ListViewItem lvi = new ListViewItem();
lvi.Text = equip.Name;
lvi.SubItems.Add(equip.IsDebug.Equals(1) ? "✘" : "✔");
lvi.SubItems.Add(equip.alarmType.ToString());
lvi.SubItems.Add(equip.GetRunStr());
this.listView1.Items.Add(lvi);
}
this.listView1.Items.Add((ListViewItem)emptyView.Clone());
cmbBoxIndex.Items.Clear();
foreach (int key in lineBean.MoveEquipMap.Keys)
{
cmbBoxIndex.Items.Add("BOX-" + key);
}
if (cmbBoxIndex.Items.Count > 0)
{
cmbBoxIndex.SelectedIndex = 0;
}
}
private void AddHealder(string name, int widht)
{
ColumnHeader preSendwire = new ColumnHeader();
preSendwire.Text = name; //设置列标题
preSendwire.Width = widht; //设置列宽度
preSendwire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
this.listView1.Columns.Add(preSendwire); //将列头添加到ListView控件。
}
private void UpdateListView()
{
if (listView1.Visible)
{
int i = 0;
int item_debug_index = 1;
int item_alarm_index = 2;
int item_runStr_index = 3;
int item_cid_index = 4;
int item_SAlarmType_index = 6;
int item_LastMsgTime_index = 5;
int item_BoxStr_index = 7;
foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
{
ListViewItem lvi = new ListViewItem();
lvi.Text = move.Name;
SetItemText(i, item_debug_index, move.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, move.alarmType.ToString());
SetItemText(i, item_runStr_index, move.GetRunStr());
BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
if (box != null)
{
SetItemText(i, item_cid_index, box.CId.ToString());
string online = "✘";
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
{
online = "✔";
}
SetItemText(i, item_LastMsgTime_index, online);
SetItemText(i, item_SAlarmType_index, box.SAlarmType.ToString());
SetItemText(i, item_BoxStr_index, box.ToShowStr());
}
else
{
SetItemText(i, item_cid_index, "");
SetItemText(i, item_LastMsgTime_index, "");
SetItemText(i, item_SAlarmType_index, "");
SetItemText(i, item_BoxStr_index, "");
}
SetItemColor(i, move.GetShowColor());
i++;
}
i++;
foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
{
SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.GetShowColor());
i++;
}
i++;
foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
{
SetItemText(i, item_debug_index, equip.IsDebug.Equals(1) ? "✘" : "✔");
SetItemText(i, item_alarm_index, equip.alarmType.ToString());
SetItemText(i, item_runStr_index, equip.GetRunStr());
SetItemColor(i, equip.GetShowColor());
i++;
}
i++;
}
} }
private void SetMenuS(ToolStripMenuItem toolMenu, bool isEn) private void SetMenuS(ToolStripMenuItem toolMenu, bool isEn)
{ {
...@@ -592,25 +434,6 @@ namespace OnlineStore.AssemblyLine ...@@ -592,25 +434,6 @@ namespace OnlineStore.AssemblyLine
toolMenu.Enabled = isEn; toolMenu.Enabled = isEn;
} }
} }
private void SetItemColor(int i, Color color)
{
if (!listView1.Items[i].BackColor.Equals(color))
{
listView1.Items[i].BackColor = color;
}
}
private void SetItemText(int rowIndex, int subIndex, string value)
{
if (this.listView1.Items[rowIndex].SubItems.Count > subIndex)
{
if (!this.listView1.Items[rowIndex].SubItems[subIndex].Text.Equals(value))
{
this.listView1.Items[rowIndex].SubItems[subIndex].Text = value;
}
}
}
#endregion
private void tabControl1_DrawItem(object sender, DrawItemEventArgs e) private void tabControl1_DrawItem(object sender, DrawItemEventArgs e)
{ {
...@@ -692,56 +515,9 @@ namespace OnlineStore.AssemblyLine ...@@ -692,56 +515,9 @@ namespace OnlineStore.AssemblyLine
} }
} }
private void listView1_SelectedIndexChanged(object sender, EventArgs e)
{
btnUpdateStatus.Visible = false;
if (listView1.SelectedItems != null && listView1.SelectedItems.Count > 0)
{
int index = listView1.SelectedItems[0].Index;
string name = listView1.Items[index].SubItems[0].Text;
name = "BOX-" + (index + 1);
BoxInfo boxInfo = LineServer.GetBoxInfo(index + 1);
if (boxInfo != null && boxInfo.SRunStatus >= 1)
{
if (boxInfo.SStatus.Equals((int)LineStatus.Debugging))
{
btnUpdateStatus.Text = "更改[" + name + "]为工作状态";
}
else
{
btnUpdateStatus.Text = "更改[" + name + "]为调试状态";
}
btnUpdateStatus.Visible = true;
}
}
}
private void btnUpdateStatus_Click(object sender, EventArgs e)
{
if (listView1.SelectedItems != null && listView1.SelectedItems.Count > 0)
{
int index = listView1.SelectedItems[0].Index;
string name = "BOX-" + (index + 1);
BoxInfo boxInfo = LineServer.GetBoxInfo(index + 1);
if (boxInfo != null && boxInfo.SRunStatus >= 1)
{
if (boxInfo.SStatus.Equals((int)LineStatus.Debugging))
{
LogUtil.info("点击【 更改[" + name + "]为工作状态 】");
LineServer.UpdateBoxDebug(boxInfo.ID, 0);
}
else
{
LogUtil.info("点击【 更改[" + name + "]为调试状态 】");
LineServer.UpdateBoxDebug(boxInfo.ID, 1);
}
btnUpdateStatus.Visible = false;
}
}
}
private void 托盘初始化ToolStripMenuItem_Click(object sender, EventArgs e) private void 托盘初始化ToolStripMenuItem_Click(object sender, EventArgs e)
...@@ -805,17 +581,7 @@ namespace OnlineStore.AssemblyLine ...@@ -805,17 +581,7 @@ namespace OnlineStore.AssemblyLine
msg += "-------------------结束打印托盘信息"; msg += "-------------------结束打印托盘信息";
MessageBox.Show(msg, "托盘信息列表"); MessageBox.Show(msg, "托盘信息列表");
} }
private void btnClearTray_Click(object sender, EventArgs e)
{
DialogResult resut = MessageBox.Show("确定手动清空所有托盘信息？", "提示", MessageBoxButtons.YesNo);
if (resut.Equals(DialogResult.Yes))
{
TrayManager.ClearTrayInfo();
}
}
private void logBox_VisibleChanged(object sender, EventArgs e) private void logBox_VisibleChanged(object sender, EventArgs e)
{ {
...@@ -1036,6 +802,7 @@ namespace OnlineStore.AssemblyLine ...@@ -1036,6 +802,7 @@ namespace OnlineStore.AssemblyLine
} }
private EquipBase seleEquip = null; private EquipBase seleEquip = null;
private EquipControl selControl = null; private EquipControl selControl = null;
private Dictionary<int, FrmEquipBase> FormMap = new Dictionary<int, FrmEquipBase>();
private void Control_Click(object sender ,EventArgs s) private void Control_Click(object sender ,EventArgs s)
{ {
if (sender is EquipControl) if (sender is EquipControl)
...@@ -1089,23 +856,58 @@ namespace OnlineStore.AssemblyLine ...@@ -1089,23 +856,58 @@ namespace OnlineStore.AssemblyLine
} }
} }
private void OpendForm(int deviceId) private void OpendForm(int deviceId)
{ {
if (FormMap.ContainsKey(deviceId))
{
if (FormMap[deviceId] == null)
{
FormMap.Remove(deviceId);
}
else
{
FormMap[deviceId].Show();
FormMap[deviceId].Focus();
return;
}
}
FrmEquipBase frm;
if (lineBean.MoveEquipMap.ContainsKey(deviceId)) if (lineBean.MoveEquipMap.ContainsKey(deviceId))
{ {
FrmMoveEquip frm = new FrmMoveEquip(lineBean.MoveEquipMap[deviceId]); frm = new FrmMoveEquip(lineBean.MoveEquipMap[deviceId]);
frm.ShowDialog();
} }
else if (lineBean.FeedingEquipMap.ContainsKey(deviceId)) else if (lineBean.FeedingEquipMap.ContainsKey(deviceId))
{ {
FrmFeedingEquip frm = new FrmFeedingEquip(lineBean.FeedingEquipMap[deviceId]); frm = new FrmFeedingEquip(lineBean.FeedingEquipMap[deviceId]);
frm.ShowDialog();
} }
else if (lineBean.HYEquipMap.ContainsKey(deviceId)) else if (lineBean.HYEquipMap.ContainsKey(deviceId))
{ {
FrmHYEquip frm = new FrmHYEquip(lineBean.HYEquipMap[deviceId]); frm = new FrmHYEquip(lineBean.HYEquipMap[deviceId]);
frm.ShowDialog(); }
else
{
return;
}
frm.FormClosed += Frm_FormClosed;
FormMap.Add(deviceId, frm);
frm.Show();
frm.Focus();
}
private void Frm_FormClosed(object sender, FormClosedEventArgs e)
{
if (sender is FrmEquipBase)
{
FrmEquipBase frm = (FrmEquipBase)sender;
if (FormMap.ContainsKey(frm.equipBase.DeviceID))
{
FormMap.Remove(frm.equipBase.DeviceID);
}
} }
} }
private void control_InDetial_Click(object sender, EventArgs e) private void control_InDetial_Click(object sender, EventArgs e)
{ {
if (seleEquip != null) if (seleEquip != null)
...@@ -1213,5 +1015,233 @@ namespace OnlineStore.AssemblyLine ...@@ -1213,5 +1015,233 @@ namespace OnlineStore.AssemblyLine
} }
} }
#endregion #endregion
#region ListView显示
//private void btnUpdateStatus_Click(object sender, EventArgs e)
//{
// if (listView1.SelectedItems != null && listView1.SelectedItems.Count > 0)
// {
// int index = listView1.SelectedItems[0].Index;
// string name = "BOX-" + (index + 1);
// BoxInfo boxInfo = LineServer.GetBoxInfo(index + 1);
// if (boxInfo != null && boxInfo.SRunStatus >= 1)
// {
// if (boxInfo.SStatus.Equals((int)LineStatus.Debugging))
// {
// LogUtil.info("点击【 更改[" + name + "]为工作状态 】");
// LineServer.UpdateBoxDebug(boxInfo.ID, 0);
// }
// else
// {
// LogUtil.info("点击【 更改[" + name + "]为调试状态 】");
// LineServer.UpdateBoxDebug(boxInfo.ID, 1);
// }
// btnUpdateStatus.Visible = false;
// }
// }
//}
//private void listView1_SelectedIndexChanged(object sender, EventArgs e)
//{
// btnUpdateStatus.Visible = false;
// if (listView1.SelectedItems != null && listView1.SelectedItems.Count > 0)
// {
// int index = listView1.SelectedItems[0].Index;
// string name = listView1.Items[index].SubItems[0].Text;
// name = "BOX-" + (index + 1);
// BoxInfo boxInfo = LineServer.GetBoxInfo(index + 1);
// if (boxInfo != null && boxInfo.SRunStatus >= 1)
// {
// if (boxInfo.SStatus.Equals((int)LineStatus.Debugging))
// {
// btnUpdateStatus.Text = "更改[" + name + "]为工作状态";
// }
// else
// {
// btnUpdateStatus.Text = "更改[" + name + "]为调试状态";
// }
// btnUpdateStatus.Visible = true;
// }
// }
//}
//private void LoadListView()
//{
// this.listView1.Columns.Clear();
// AddHealder("设备名称", 110);
// AddHealder("启用", 40);
// AddHealder("报警", 110);
// AddHealder("状态", 110);
// AddHealder("BOX_CID", 80);
// AddHealder("在线", 40);
// AddHealder("BOX_报警", 110);
// AddHealder("BOX状态", 110);
// //AddHealder("BOX状态", listView1.Size.Width - 100 - 80 - 80 - 100 - 100 - 100 -40- 8);
// foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
// {
// ListViewItem lvi = new ListViewItem();
// lvi.Text = move.Name;
// lvi.SubItems.Add(move.Config.IsDebug.Equals(1) ? "✘" : "✔");
// lvi.SubItems.Add(move.alarmType.ToString());
// // lvi.SubItems.Add(move.lineStatus.ToString());
// lvi.SubItems.Add(move.GetRunStr());
// BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
// if (box != null)
// {
// string online = "✘";
// lvi.SubItems.Add(box.CId.ToString());
// if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
// {
// online = "✔";
// }
// lvi.SubItems.Add(online);
// lvi.SubItems.Add(box.SAlarmType.ToString());
// lvi.SubItems.Add(box.ToShowStr());
// }
// else
// {
// lvi.SubItems.Add("");
// lvi.SubItems.Add("");
// lvi.SubItems.Add("");
// lvi.SubItems.Add("");
// }
// this.listView1.Items.Add(lvi);
// }
// ListViewItem emptyView = new ListViewItem();
// this.listView1.Items.Add(emptyView);
// foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
// {
// ListViewItem lvi = new ListViewItem();
// lvi.Text = equip.Name;
// lvi.SubItems.Add(equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
// lvi.SubItems.Add(equip.alarmType.ToString());
// lvi.SubItems.Add(equip.GetRunStr());
// this.listView1.Items.Add(lvi);
// }
// this.listView1.Items.Add((ListViewItem)emptyView.Clone());
// foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
// {
// ListViewItem lvi = new ListViewItem();
// lvi.Text = equip.Name;
// lvi.SubItems.Add(equip.IsDebug.Equals(1) ? "✘" : "✔");
// lvi.SubItems.Add(equip.alarmType.ToString());
// lvi.SubItems.Add(equip.GetRunStr());
// this.listView1.Items.Add(lvi);
// }
// this.listView1.Items.Add((ListViewItem)emptyView.Clone());
// cmbBoxIndex.Items.Clear();
// foreach (int key in lineBean.MoveEquipMap.Keys)
// {
// cmbBoxIndex.Items.Add("BOX-" + key);
// }
// if (cmbBoxIndex.Items.Count > 0)
// {
// cmbBoxIndex.SelectedIndex = 0;
// }
//}
//private void AddHealder(string name, int widht)
//{
// ColumnHeader preSendwire = new ColumnHeader();
// preSendwire.Text = name; //设置列标题
// preSendwire.Width = widht; //设置列宽度
// preSendwire.TextAlign = HorizontalAlignment.Left; //设置列的对齐方式
// this.listView1.Columns.Add(preSendwire); //将列头添加到ListView控件。
//}
//private void UpdateListView()
//{
// if (listView1.Visible)
// {
// int i = 0;
// int item_debug_index = 1;
// int item_alarm_index = 2;
// int item_runStr_index = 3;
// int item_cid_index = 4;
// int item_SAlarmType_index = 6;
// int item_LastMsgTime_index = 5;
// int item_BoxStr_index = 7;
// foreach (MoveEquip move in lineBean.MoveEquipMap.Values)
// {
// ListViewItem lvi = new ListViewItem();
// lvi.Text = move.Name;
// SetItemText(i, item_debug_index, move.Config.IsDebug.Equals(1) ? "✘" : "✔");
// SetItemText(i, item_alarm_index, move.alarmType.ToString());
// SetItemText(i, item_runStr_index, move.GetRunStr());
// BoxInfo box = LineServer.GetBoxInfo(move.DeviceID);
// if (box != null)
// {
// SetItemText(i, item_cid_index, box.CId.ToString());
// string online = "✘";
// if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
// {
// online = "✔";
// }
// SetItemText(i, item_LastMsgTime_index, online);
// SetItemText(i, item_SAlarmType_index, box.SAlarmType.ToString());
// SetItemText(i, item_BoxStr_index, box.ToShowStr());
// }
// else
// {
// SetItemText(i, item_cid_index, "");
// SetItemText(i, item_LastMsgTime_index, "");
// SetItemText(i, item_SAlarmType_index, "");
// SetItemText(i, item_BoxStr_index, "");
// }
// SetItemColor(i, move.GetShowColor());
// i++;
// }
// i++;
// foreach (FeedingEquip equip in lineBean.FeedingEquipMap.Values)
// {
// SetItemText(i, item_debug_index, equip.Config.IsDebug.Equals(1) ? "✘" : "✔");
// SetItemText(i, item_alarm_index, equip.alarmType.ToString());
// SetItemText(i, item_runStr_index, equip.GetRunStr());
// SetItemColor(i, equip.GetShowColor());
// i++;
// }
// i++;
// foreach (HYEquipBase equip in lineBean.HYEquipMap.Values)
// {
// SetItemText(i, item_debug_index, equip.IsDebug.Equals(1) ? "✘" : "✔");
// SetItemText(i, item_alarm_index, equip.alarmType.ToString());
// SetItemText(i, item_runStr_index, equip.GetRunStr());
// SetItemColor(i, equip.GetShowColor());
// i++;
// }
// i++;
// }
//}
//private void SetItemColor(int i, Color color)
//{
// if (!listView1.Items[i].BackColor.Equals(color))
// {
// listView1.Items[i].BackColor = color;
// }
//}
//private void SetItemText(int rowIndex, int subIndex, string value)
//{
// if (this.listView1.Items[rowIndex].SubItems.Count > subIndex)
// {
// if (!this.listView1.Items[rowIndex].SubItems[subIndex].Text.Equals(value))
// {
// this.listView1.Items[rowIndex].SubItems[subIndex].Text = value;
// }
// }
//}
#endregion
} }
} }
source/AssemblyLineClient/FrmMoveEquip.cs
...@@ -116,11 +116,10 @@ namespace OnlineStore.AssemblyLine ...@@ -116,11 +116,10 @@ namespace OnlineStore.AssemblyLine
{ {
return; return;
} }
if ( this.Visible)
{
ReadIOList(); ReadIOList();
ReadBtnDO(); ReadBtnDO();
}
lblName.BackColor = equipBean.GetShowColor(); lblName.BackColor = equipBean.GetShowColor();
if (equipBean.runStatus > LineRunStatus.Wait) if (equipBean.runStatus > LineRunStatus.Wait)
{ {
...@@ -371,7 +370,7 @@ namespace OnlineStore.AssemblyLine ...@@ -371,7 +370,7 @@ namespace OnlineStore.AssemblyLine
} }
else else
{ {
MessageBox.Show("未启动或不在空闲中，无法入库测试！"); MessageBox.Show("未启动或不在空闲中，无法入库测试！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
} }
} }
...@@ -384,7 +383,7 @@ namespace OnlineStore.AssemblyLine ...@@ -384,7 +383,7 @@ namespace OnlineStore.AssemblyLine
} }
else else
{ {
MessageBox.Show("未启动或不在空闲中，无法入库测试！"); MessageBox.Show("未启动或不在空闲中，无法入库测试！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Warning);
} }
} }
......
source/AssemblyLineClient/useControl/AxisMoveControl.Designer.cs
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
this.lblAxPrfPos = new System.Windows.Forms.Label(); this.lblAxPrfPos = new System.Windows.Forms.Label();
this.lblAxisPrfMode = new System.Windows.Forms.Label(); this.lblAxisPrfMode = new System.Windows.Forms.Label();
this.label50 = new System.Windows.Forms.Label(); this.label50 = new System.Windows.Forms.Label();
this.btnComAlarmClear = new System.Windows.Forms.Button();
this.groupBox1 = new System.Windows.Forms.GroupBox(); this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtBusyStatus = new System.Windows.Forms.TextBox(); this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label(); this.label11 = new System.Windows.Forms.Label();
...@@ -72,7 +73,7 @@ ...@@ -72,7 +73,7 @@
this.label6 = new System.Windows.Forms.Label(); this.label6 = new System.Windows.Forms.Label();
this.txtHomeSingle = new System.Windows.Forms.TextBox(); this.txtHomeSingle = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel(); this.panel1 = new System.Windows.Forms.Panel();
this.btnComAlarmClear = new System.Windows.Forms.Button(); this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.btnAxisStop = new System.Windows.Forms.Button(); this.btnAxisStop = new System.Windows.Forms.Button();
this.btnAxisReturnHome = new System.Windows.Forms.Button(); this.btnAxisReturnHome = new System.Windows.Forms.Button();
this.cmbAxis = new System.Windows.Forms.ComboBox(); this.cmbAxis = new System.Windows.Forms.ComboBox();
...@@ -84,8 +85,6 @@ ...@@ -84,8 +85,6 @@
this.txtASpeed = new System.Windows.Forms.TextBox(); this.txtASpeed = new System.Windows.Forms.TextBox();
this.label1 = new System.Windows.Forms.Label(); this.label1 = new System.Windows.Forms.Label();
this.label47 = new System.Windows.Forms.Label(); this.label47 = new System.Windows.Forms.Label();
this.btnReadPosition = new System.Windows.Forms.Button();
this.btnAxisVMove = new System.Windows.Forms.Button();
this.label8 = new System.Windows.Forms.Label(); this.label8 = new System.Windows.Forms.Label();
this.btnAxisRMove = new System.Windows.Forms.Button(); this.btnAxisRMove = new System.Windows.Forms.Button();
this.lblCountPulse = new System.Windows.Forms.TextBox(); this.lblCountPulse = new System.Windows.Forms.TextBox();
...@@ -98,8 +97,9 @@ ...@@ -98,8 +97,9 @@
this.txtAxisValue = new System.Windows.Forms.TextBox(); this.txtAxisValue = new System.Windows.Forms.TextBox();
this.txtAxisDeviceName = new System.Windows.Forms.TextBox(); this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = new System.Windows.Forms.Label(); this.lblServerOn = new System.Windows.Forms.Label();
this.btnAxisVMove = new System.Windows.Forms.Button();
this.btnReadPosition = new System.Windows.Forms.Button();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.groupAxis.SuspendLayout(); this.groupAxis.SuspendLayout();
this.groupBox2.SuspendLayout(); this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
this.groupBox2.Controls.Add(this.lblAxPrfPos); this.groupBox2.Controls.Add(this.lblAxPrfPos);
this.groupBox2.Controls.Add(this.lblAxisPrfMode); this.groupBox2.Controls.Add(this.lblAxisPrfMode);
this.groupBox2.Controls.Add(this.label50); this.groupBox2.Controls.Add(this.label50);
this.groupBox2.Location = new System.Drawing.Point(9, 265); this.groupBox2.Location = new System.Drawing.Point(9, 255);
this.groupBox2.Margin = new System.Windows.Forms.Padding(2); this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2); this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
...@@ -404,6 +404,18 @@ ...@@ -404,6 +404,18 @@
this.label50.TabIndex = 1; this.label50.TabIndex = 1;
this.label50.Text = "规划模式:"; this.label50.Text = "规划模式:";
// //
// btnComAlarmClear
//
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(563, 297);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34);
this.btnComAlarmClear.TabIndex = 50;
this.btnComAlarmClear.Text = "清除报警";
this.btnComAlarmClear.UseVisualStyleBackColor = true;
this.btnComAlarmClear.Visible = false;
this.btnComAlarmClear.Click += new System.EventHandler(this.btnComAlarmClear_Click);
//
// groupBox1 // groupBox1
// //
this.groupBox1.Controls.Add(this.txtBusyStatus); this.groupBox1.Controls.Add(this.txtBusyStatus);
...@@ -588,20 +600,19 @@ ...@@ -588,20 +600,19 @@
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(7, 18); this.panel1.Location = new System.Drawing.Point(7, 18);
this.panel1.Name = "panel1"; this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(540, 241); this.panel1.Size = new System.Drawing.Size(540, 237);
this.panel1.TabIndex = 219; this.panel1.TabIndex = 219;
// //
// btnComAlarmClear // linkLabel1
// //
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.linkLabel1.AutoSize = true;
this.btnComAlarmClear.Location = new System.Drawing.Point(563, 297); this.linkLabel1.Location = new System.Drawing.Point(191, 146);
this.btnComAlarmClear.Name = "btnComAlarmClear"; this.linkLabel1.Name = "linkLabel1";
this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34); this.linkLabel1.Size = new System.Drawing.Size(32, 17);
this.btnComAlarmClear.TabIndex = 50; this.linkLabel1.TabIndex = 333;
this.btnComAlarmClear.Text = "清除报警"; this.linkLabel1.TabStop = true;
this.btnComAlarmClear.UseVisualStyleBackColor = true; this.linkLabel1.Text = "复制";
this.btnComAlarmClear.Visible = false; this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked);
this.btnComAlarmClear.Click += new System.EventHandler(this.btnComAlarmClear_Click);
// //
// btnAxisStop // btnAxisStop
// //
...@@ -610,7 +621,7 @@ ...@@ -610,7 +621,7 @@
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText; this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(427, 50); this.btnAxisStop.Location = new System.Drawing.Point(426, 46);
this.btnAxisStop.Name = "btnAxisStop"; this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(110, 114); this.btnAxisStop.Size = new System.Drawing.Size(110, 114);
...@@ -626,7 +637,7 @@ ...@@ -626,7 +637,7 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText; this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(307, 129); this.btnAxisReturnHome.Location = new System.Drawing.Point(306, 125);
this.btnAxisReturnHome.Name = "btnAxisReturnHome"; this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34); this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34);
...@@ -640,7 +651,7 @@ ...@@ -640,7 +651,7 @@
this.cmbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; this.cmbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAxis.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.cmbAxis.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAxis.FormattingEnabled = true; this.cmbAxis.FormattingEnabled = true;
this.cmbAxis.Location = new System.Drawing.Point(71, 13); this.cmbAxis.Location = new System.Drawing.Point(70, 9);
this.cmbAxis.Name = "cmbAxis"; this.cmbAxis.Name = "cmbAxis";
this.cmbAxis.Size = new System.Drawing.Size(227, 28); this.cmbAxis.Size = new System.Drawing.Size(227, 28);
this.cmbAxis.TabIndex = 301; this.cmbAxis.TabIndex = 301;
...@@ -651,7 +662,7 @@ ...@@ -651,7 +662,7 @@
this.btnDelMove.BackColor = System.Drawing.SystemColors.Control; this.btnDelMove.BackColor = System.Drawing.SystemColors.Control;
this.btnDelMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnDelMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDelMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnDelMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelMove.Location = new System.Drawing.Point(344, 184); this.btnDelMove.Location = new System.Drawing.Point(343, 180);
this.btnDelMove.Name = "btnDelMove"; this.btnDelMove.Name = "btnDelMove";
this.btnDelMove.Size = new System.Drawing.Size(140, 45); this.btnDelMove.Size = new System.Drawing.Size(140, 45);
this.btnDelMove.TabIndex = 332; this.btnDelMove.TabIndex = 332;
...@@ -667,7 +678,7 @@ ...@@ -667,7 +678,7 @@
this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText; this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(307, 9); this.btnOpenAxis.Location = new System.Drawing.Point(306, 5);
this.btnOpenAxis.Name = "btnOpenAxis"; this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(110, 34); this.btnOpenAxis.Size = new System.Drawing.Size(110, 34);
...@@ -679,7 +690,7 @@ ...@@ -679,7 +690,7 @@
// txtMiddleSpeed // txtMiddleSpeed
// //
this.txtMiddleSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtMiddleSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtMiddleSpeed.Location = new System.Drawing.Point(85, 194); this.txtMiddleSpeed.Location = new System.Drawing.Point(84, 190);
this.txtMiddleSpeed.MaxLength = 6; this.txtMiddleSpeed.MaxLength = 6;
this.txtMiddleSpeed.Name = "txtMiddleSpeed"; this.txtMiddleSpeed.Name = "txtMiddleSpeed";
this.txtMiddleSpeed.Size = new System.Drawing.Size(73, 26); this.txtMiddleSpeed.Size = new System.Drawing.Size(73, 26);
...@@ -693,7 +704,7 @@ ...@@ -693,7 +704,7 @@
this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText; this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(427, 9); this.btnCloseAxis.Location = new System.Drawing.Point(426, 5);
this.btnCloseAxis.Name = "btnCloseAxis"; this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(110, 34); this.btnCloseAxis.Size = new System.Drawing.Size(110, 34);
...@@ -707,7 +718,7 @@ ...@@ -707,7 +718,7 @@
this.btnAddMove.BackColor = System.Drawing.SystemColors.Control; this.btnAddMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAddMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAddMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAddMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddMove.Location = new System.Drawing.Point(195, 184); this.btnAddMove.Location = new System.Drawing.Point(194, 180);
this.btnAddMove.Name = "btnAddMove"; this.btnAddMove.Name = "btnAddMove";
this.btnAddMove.Size = new System.Drawing.Size(140, 45); this.btnAddMove.Size = new System.Drawing.Size(140, 45);
this.btnAddMove.TabIndex = 330; this.btnAddMove.TabIndex = 330;
...@@ -723,7 +734,7 @@ ...@@ -723,7 +734,7 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText; this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(207, 99); this.txtASpeed.Location = new System.Drawing.Point(206, 95);
this.txtASpeed.MaxLength = 12; this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed"; this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -734,7 +745,7 @@ ...@@ -734,7 +745,7 @@
// label1 // label1
// //
this.label1.AutoSize = true; this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(20, 199); this.label1.Location = new System.Drawing.Point(19, 195);
this.label1.Name = "label1"; this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17); this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.TabIndex = 329; this.label1.TabIndex = 329;
...@@ -746,7 +757,7 @@ ...@@ -746,7 +757,7 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default; this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText; this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(142, 104); this.label47.Location = new System.Drawing.Point(141, 100);
this.label47.Name = "label47"; this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(59, 17); this.label47.Size = new System.Drawing.Size(59, 17);
...@@ -754,45 +765,11 @@ ...@@ -754,45 +765,11 @@
this.label47.Text = "目标速度:"; this.label47.Text = "目标速度:";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight; this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
// //
// btnReadPosition
//
this.btnReadPosition.BackColor = System.Drawing.SystemColors.Control;
this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default;
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(563, 374);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(110, 34);
this.btnReadPosition.TabIndex = 278;
this.btnReadPosition.Text = "读取位置";
this.btnReadPosition.UseVisualStyleBackColor = true;
this.btnReadPosition.Visible = false;
this.btnReadPosition.Click += new System.EventHandler(this.btnReadPosition_Click);
//
// btnAxisVMove
//
this.btnAxisVMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisVMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisVMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(563, 337);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(110, 34);
this.btnAxisVMove.TabIndex = 249;
this.btnAxisVMove.Text = "匀速运动";
this.btnAxisVMove.UseVisualStyleBackColor = true;
this.btnAxisVMove.Visible = false;
this.btnAxisVMove.Click += new System.EventHandler(this.btnAxisVMove_Click);
//
// label8 // label8
// //
this.label8.AutoSize = true; this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(18, 149); this.label8.Location = new System.Drawing.Point(17, 145);
this.label8.Name = "label8"; this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17); this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.TabIndex = 255; this.label8.TabIndex = 255;
...@@ -805,7 +782,7 @@ ...@@ -805,7 +782,7 @@
this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText; this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(307, 89); this.btnAxisRMove.Location = new System.Drawing.Point(306, 85);
this.btnAxisRMove.Name = "btnAxisRMove"; this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(110, 34); this.btnAxisRMove.Size = new System.Drawing.Size(110, 34);
...@@ -817,7 +794,7 @@ ...@@ -817,7 +794,7 @@
// lblCountPulse // lblCountPulse
// //
this.lblCountPulse.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCountPulse.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCountPulse.Location = new System.Drawing.Point(83, 144); this.lblCountPulse.Location = new System.Drawing.Point(82, 140);
this.lblCountPulse.Name = "lblCountPulse"; this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true; this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(103, 26); this.lblCountPulse.Size = new System.Drawing.Size(103, 26);
...@@ -830,7 +807,7 @@ ...@@ -830,7 +807,7 @@
this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText; this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(307, 49); this.btnAxisAMove.Location = new System.Drawing.Point(306, 45);
this.btnAxisAMove.Name = "btnAxisAMove"; this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No; this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(110, 34); this.btnAxisAMove.Size = new System.Drawing.Size(110, 34);
...@@ -844,7 +821,7 @@ ...@@ -844,7 +821,7 @@
this.label49.AutoSize = true; this.label49.AutoSize = true;
this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label49.Location = new System.Drawing.Point(10, 18); this.label49.Location = new System.Drawing.Point(9, 14);
this.label49.Name = "label49"; this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17); this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.TabIndex = 233; this.label49.TabIndex = 233;
...@@ -857,7 +834,7 @@ ...@@ -857,7 +834,7 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam; this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText; this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(207, 57); this.txtAPosition.Location = new System.Drawing.Point(206, 53);
this.txtAPosition.MaxLength = 12; this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition"; this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No; this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
...@@ -870,7 +847,7 @@ ...@@ -870,7 +847,7 @@
this.label46.AutoSize = true; this.label46.AutoSize = true;
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(26, 104); this.label46.Location = new System.Drawing.Point(25, 100);
this.label46.Name = "label46"; this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17); this.label46.Size = new System.Drawing.Size(35, 17);
this.label46.TabIndex = 239; this.label46.TabIndex = 239;
...@@ -883,7 +860,7 @@ ...@@ -883,7 +860,7 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default; this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText; this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(142, 62); this.label48.Location = new System.Drawing.Point(141, 58);
this.label48.Name = "label48"; this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No; this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(59, 17); this.label48.Size = new System.Drawing.Size(59, 17);
...@@ -896,7 +873,7 @@ ...@@ -896,7 +873,7 @@
this.label45.AutoSize = true; this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(26, 62); this.label45.Location = new System.Drawing.Point(25, 58);
this.label45.Name = "label45"; this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(35, 17); this.label45.Size = new System.Drawing.Size(35, 17);
this.label45.TabIndex = 240; this.label45.TabIndex = 240;
...@@ -906,7 +883,7 @@ ...@@ -906,7 +883,7 @@
// txtAxisValue // txtAxisValue
// //
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(71, 99); this.txtAxisValue.Location = new System.Drawing.Point(70, 95);
this.txtAxisValue.MaxLength = 10; this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue"; this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true; this.txtAxisValue.ReadOnly = true;
...@@ -917,7 +894,7 @@ ...@@ -917,7 +894,7 @@
// txtAxisDeviceName // txtAxisDeviceName
// //
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(71, 57); this.txtAxisDeviceName.Location = new System.Drawing.Point(70, 53);
this.txtAxisDeviceName.MaxLength = 10; this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName"; this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true; this.txtAxisDeviceName.ReadOnly = true;
...@@ -936,20 +913,43 @@ ...@@ -936,20 +913,43 @@
this.lblServerOn.Size = new System.Drawing.Size(0, 19); this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.TabIndex = 268; this.lblServerOn.TabIndex = 268;
// //
// timer1 // btnAxisVMove
// //
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.btnAxisVMove.BackColor = System.Drawing.SystemColors.Control;
this.btnAxisVMove.Cursor = System.Windows.Forms.Cursors.Default;
this.btnAxisVMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(563, 337);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(110, 34);
this.btnAxisVMove.TabIndex = 249;
this.btnAxisVMove.Text = "匀速运动";
this.btnAxisVMove.UseVisualStyleBackColor = true;
this.btnAxisVMove.Visible = false;
this.btnAxisVMove.Click += new System.EventHandler(this.btnAxisVMove_Click);
// //
// linkLabel1 // btnReadPosition
// //
this.linkLabel1.AutoSize = true; this.btnReadPosition.BackColor = System.Drawing.SystemColors.Control;
this.linkLabel1.Location = new System.Drawing.Point(192, 150); this.btnReadPosition.Cursor = System.Windows.Forms.Cursors.Default;
this.linkLabel1.Name = "linkLabel1"; this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.linkLabel1.Size = new System.Drawing.Size(32, 17); this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.linkLabel1.TabIndex = 333; this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.linkLabel1.TabStop = true; this.btnReadPosition.Location = new System.Drawing.Point(563, 374);
this.linkLabel1.Text = "复制"; this.btnReadPosition.Name = "btnReadPosition";
this.linkLabel1.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkLabel1_LinkClicked); this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(110, 34);
this.btnReadPosition.TabIndex = 278;
this.btnReadPosition.Text = "读取位置";
this.btnReadPosition.UseVisualStyleBackColor = true;
this.btnReadPosition.Visible = false;
this.btnReadPosition.Click += new System.EventHandler(this.btnReadPosition_Click);
//
// timer1
//
this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// AxisMoveControl // AxisMoveControl
// //
......
source/AssemblyLineClient/useControl/AxisMoveControl.cs
...@@ -267,7 +267,7 @@ namespace OnlineStore.AssemblyLine ...@@ -267,7 +267,7 @@ namespace OnlineStore.AssemblyLine
private void ReadAxisStatus() private void ReadAxisStatus()
{ {
string groupText = cmbAxis.Text + "-状态监控"; string groupText = cmbAxis.Text + "-状态监控";
if (!groupBox2.Equals(groupText)) if (!groupBox2.Text.Equals(groupText))
{ {
groupBox2.Text = groupText; groupBox2.Text = groupText;
} }
......
source/AssemblyLineClient/useControl/EquipControl.cs
...@@ -82,7 +82,7 @@ namespace OnlineStore.AssemblyLine ...@@ -82,7 +82,7 @@ namespace OnlineStore.AssemblyLine
lblStatus.Text = equip.GetRunStr(); lblStatus.Text = equip.GetRunStr();
toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入"; toolTip1.ToolTipTitle = ""+equip.Name+"：双击进入";
lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔"); lblDebug.Text = "启用：" + (equip.IsDebug ? "✘" : "✔");
if (equip.DeviceID < 200) if (equip.DeviceID < 100)
{ {
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
{ {
...@@ -100,40 +100,53 @@ namespace OnlineStore.AssemblyLine ...@@ -100,40 +100,53 @@ namespace OnlineStore.AssemblyLine
{ {
lblMoveInfo.Text = "暂无出入库"; lblMoveInfo.Text = "暂无出入库";
} }
if (equip.DeviceID < 100)
{
BoxInfo box = LineServer.GetBoxInfo(equip.DeviceID);
string online = "✘";
if (box != null)
{
//lvi.SubItems.Add(box.CId.ToString());
//lvi.SubItems.Add(online);
//lvi.SubItems.Add(box.SAlarmType.ToString());
//lvi.SubItems.Add(box.ToShowStr());
if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond) BoxInfo box = LineServer.GetBoxInfo(equip.DeviceID);
{ string online = "✘";
online = "✔"; if (box != null)
} {
if (box.SAlarmType.Equals(LineAlarm.None)) if ((DateTime.Now - box.LastMsgTime).TotalSeconds < LineServer.ClientKeepSecond)
{ {
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr(); online = "✔";
lblBox.BackColor = Color.Green; }
} if (box.SAlarmType.Equals(LineAlarm.None))
else {
{ lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr(); lblBox.BackColor = Color.Green;
lblBox.BackColor = Color.Red;
}
} }
else else
{ {
lblBox.Text = "BOX状态：" + online; lblBox.Text = "BOX[" + box.CId.ToString() + "]：" + online + " " + box.ToShowStr();
lblBox.BackColor = Color.Gray; lblBox.BackColor = Color.Red;
} }
} }
else
{
lblBox.Text = "BOX状态：" + online;
lblBox.BackColor = Color.Gray;
}
} }
else if (equip.DeviceID < 200)
{
if (equip.MoveInfo.MoveType.Equals(LineMoveType.InStore))
{
lblMoveInfo.Text = "料架" + equip.CurrShelfId + "，入库：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
}
else if (equip.MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{
lblMoveInfo.Text = "料架"+equip.CurrShelfId+"，出库：" + equip.MoveInfo.MoveParam.PosId + "_" + equip.MoveInfo.MoveParam.WareCode;
}
else if (equip.SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture))
{
lblMoveInfo.Text = "托盘[" + equip.currTrayNum + "]处理中";
}
else
{
lblMoveInfo.Text = "暂无出入库";
}
}
else else
{ {
if (equip.MoveInfo.MoveType.Equals(LineMoveType.OutStore)) if (equip.MoveInfo.MoveType.Equals(LineMoveType.OutStore))
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -15,6 +15,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -15,6 +15,8 @@ namespace OnlineStore.DeviceLibrary
{ {
public bool MoveStop = false; public bool MoveStop = false;
public string CurrShelfId = "";//当前的料架ID
public string LastOutShelfId = "";//最后一个出口
public LineMoveInfo SecondMoveInfo = null; public LineMoveInfo SecondMoveInfo = null;
public bool IsDebug = false; public bool IsDebug = false;
...@@ -593,9 +595,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -593,9 +595,8 @@ namespace OnlineStore.DeviceLibrary
string msg = ""; string msg = "";
int tLength = 15; int tLength = 15;
if (!String.IsNullOrEmpty(RFIDIP)) if (!String.IsNullOrEmpty(RFIDIP))
{ {
msg += "上个托盘：" + preTrayNum + "\n"; msg += "当前托盘：" + currTrayNum + " 上个托盘：" + preTrayNum + "\n";
msg += "当前托盘：" + currTrayNum + "\n";
} }
msg += "runS： " + runStatus + "\n"; msg += "runS： " + runStatus + "\n";
msg += "alarm： " + alarmType +" "+LastAlarmTime.ToLongTimeString()+ "\n"; msg += "alarm： " + alarmType +" "+LastAlarmTime.ToLongTimeString()+ "\n";
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -19,8 +19,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -19,8 +19,6 @@ namespace OnlineStore.DeviceLibrary
{ {
public FeedingEquip_Config Config; public FeedingEquip_Config Config;
public bool OutEndSendShelfOut = false; public bool OutEndSendShelfOut = false;
public string CurrShelfId = "";//当前的料架ID
public string LastOutShelfId = "";//最后一个出口
public AxisBean BatchAxis = null; public AxisBean BatchAxis = null;
public FeedingEquip(string cid, FeedingEquip_Config config) public FeedingEquip(string cid, FeedingEquip_Config config)
{ {
...@@ -39,10 +37,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -39,10 +37,6 @@ namespace OnlineStore.DeviceLibrary
RFIDIP = RFIDManager.GetRFIP(DeviceID); RFIDIP = RFIDManager.GetRFIP(DeviceID);
} }
/// <summary>
/// 开始运行
/// </summary>
public override bool StartRun(bool isDebug = false) public override bool StartRun(bool isDebug = false)
{ {
if (CanStartRun().Equals(false)) if (CanStartRun().Equals(false))
...@@ -942,9 +936,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -942,9 +936,8 @@ namespace OnlineStore.DeviceLibrary
{ {
msg += "出库信息：" + LastOutParam.ToShortStr() + "\r\n"; msg += "出库信息：" + LastOutParam.ToShortStr() + "\r\n";
} }
msg += "上个托盘：" + preTrayNum + "\n"; msg += "当前托盘：" + currTrayNum + " 上个托盘：" + preTrayNum + "\n";
msg += "当前托盘：" + currTrayNum + "\n";
msg += "runS： " + runStatus + "\n"; msg += "runS： " + runStatus + "\n";
msg += "alarm： " + alarmType + "\n"; msg += "alarm： " + alarmType + "\n";
msg += "MoveT：" + MoveInfo.MoveType + "\n"; msg += "MoveT：" + MoveInfo.MoveType + "\n";
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -474,6 +474,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -474,6 +474,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (getPosTask.IsCompleted && LastPosParam != null) if (getPosTask.IsCompleted && LastPosParam != null)
{ {
MoveInfo.MoveParam = LastPosParam;
MoveInfo.NextMoveStep(LineMoveStep.FI_32_WaitTray); MoveInfo.NextMoveStep(LineMoveStep.FI_32_WaitTray);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(100));
InLog(" " + MoveInfo.SLog + " 开始拦截空托盘 " + LastPosParam.ToStr() + ""); InLog(" " + MoveInfo.SLog + " 开始拦截空托盘 " + LastPosParam.ToStr() + "");
...@@ -506,6 +507,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -506,6 +507,7 @@ namespace OnlineStore.DeviceLibrary
InLog("获取库位" + MoveInfo.SLog + "： 上料轴开始慢速上升到P3点，不等待结果"); InLog("获取库位" + MoveInfo.SLog + "： 上料轴开始慢速上升到P3点，不等待结果");
BatchAxisToP3(false, false); BatchAxisToP3(false, false);
} }
MoveInfo.MoveParam = LastPosParam;
ClearTimeoutAlarm("等待空托盘到达超时"); ClearTimeoutAlarm("等待空托盘到达超时");
} }
else if (MoveInfo.IsTimeOut(180)) else if (MoveInfo.IsTimeOut(180))
......
source/DeviceLibrary/assemblyLine/HY/HYEquipBase.cs
...@@ -14,11 +14,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,11 +14,11 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 当前设备对应的横移出口的设备ID /// 当前设备对应的横移出口的设备ID
/// </summary> /// </summary>
protected int HyOutDeviceId = 0; public int HyOutDeviceId = 0;
/// <summary> /// <summary>
/// 当前设备对应的横移入口的设备ID /// 当前设备对应的横移入口的设备ID
/// </summary> /// </summary>
private int HyInDeviceId = 0; public int HyInDeviceId = 0;
public static HYEquipBase GetHY(string cid, HYEquip_Config config) public static HYEquipBase GetHY(string cid, HYEquip_Config config)
{ {
int hynum = (config.Id % 100); int hynum = (config.Id % 100);
...@@ -131,11 +131,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -131,11 +131,13 @@ namespace OnlineStore.DeviceLibrary
buf.Append(" 取放料设备：" + dName + "\r\n"); buf.Append(" 取放料设备：" + dName + "\r\n");
if (Config.IsSideWayIn) if (Config.IsSideWayIn)
{ {
buf.Append("C1线横移入口：✔" + "\r\n"); dName = LineManager.Line.AllEquipMap[HyOutDeviceId].Name;
buf.Append("C1线横移入口：✔" + "，对应出口"+dName+"\r\n");
} }
if (Config.IsSideWayOut) if (Config.IsSideWayOut)
{ {
buf.Append("C1线横移出口：✔" + "\r\n"); dName = LineManager.Line.AllEquipMap[HyInDeviceId].Name;
buf.Append("C1线横移出口：✔" + "，对应入口" + dName + "\r\n");
} }
if (Config.IsOutLineIn) if (Config.IsOutLineIn)
{ {
......
source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs
...@@ -769,29 +769,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -769,29 +769,29 @@ namespace OnlineStore.DeviceLibrary
{ {
return false; return false;
} }
InOutParam inoup = trayInfo.InoutPar; InOutParam param = trayInfo.InoutPar;
if (trayInfo.IsFull && trayInfo.InoutPar.InStoreNg && this.DeviceID.Equals(216)) if (trayInfo.IsFull && trayInfo.InoutPar.InStoreNg && this.DeviceID.Equals(216))
{ {
LogInfo(" 托盘需要横移到出料线：入料NG料" + "" + inoup.ToStr()); LogInfo(" 托盘需要横移到出料线：入料NG料" + "" + param.ToStr());
//如果分配了库位，需要调用取消 //如果分配了库位，需要调用取消
if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "") if (trayInfo.InoutPar.WareCode != "" && trayInfo.InoutPar.PosId != "")
{ {
SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode); SServerManager.cancelPutInTask(Name, trayInfo.InoutPar.WareCode);
} }
MoveInfo.MoveParam = inoup; MoveInfo.MoveParam = param;
return true ; return true ;
} }
else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel && this.DeviceID.Equals(216)) else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && param.urgentReel && this.DeviceID.Equals(216))
{ {
//紧急料到NG箱 //紧急料到NG箱
LogInfo(" 托盘需要横移到出料线：紧急出料" + "" + inoup.ToStr()); LogInfo(" 托盘需要横移到出料线：紧急出料" + "" + param.ToStr());
MoveInfo.MoveParam = inoup; MoveInfo.MoveParam = param;
return true; return true;
} }
else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && inoup.urgentReel.Equals(false) && inoup.cutReel.Equals(false)) else if (trayInfo.InOrOutStore.Equals(ReelType.OutStore) && param.urgentReel.Equals(false) && param.cutReel.Equals(false))
{ {
LogInfo(" 托盘需要横移到出料线：工单出库料" + "" + inoup.ToStr()); LogInfo(" 托盘需要横移到出料线：工单出库料" + "" + param.ToStr());
List<int> mustLine = new List<int>(); List<int> mustLine = new List<int>();
List<int> firstLine = new List<int>(); List<int> firstLine = new List<int>();
//urgentReel: true 表示紧急料,需要出到料串上 //urgentReel: true 表示紧急料,需要出到料串上
...@@ -800,23 +800,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -800,23 +800,23 @@ namespace OnlineStore.DeviceLibrary
//rfid: 分配的料架RFID //rfid: 分配的料架RFID
//rfidLoc: //rfidLoc:
//是否是小盘 //是否是小盘
if (inoup.rfidLoc <= 0) if (param.rfidLoc <= 0)
{ {
//-1时随意放 //-1时随意放
} }
else if (inoup.smallReel) else if (param.smallReel)
{ {
if (inoup.rfidLoc >= 70 && inoup.rfidLoc <= 72) if (param.rfidLoc >= 70 && param.rfidLoc <= 72)
{ {
// 70,71,72时只能分配到3 / 4号皮带线; // 70,71,72时只能分配到3 / 4号皮带线;
mustLine = new List<int> { 213, 216 }; mustLine = new List<int> { 213, 216 };
} }
else if (inoup.rfidLoc <= 46) else if (param.rfidLoc <= 46)
{ {
// 小料时,架位为1 - 46优先走1 / 2号皮带线 // 小料时,架位为1 - 46优先走1 / 2号皮带线
firstLine = new List<int> { 204, 206 }; firstLine = new List<int> { 204, 206 };
} }
else if (inoup.rfidLoc >= 47) else if (param.rfidLoc >= 47)
{ {
// ,47 - 92优先走3 / 4号皮带线, // ,47 - 92优先走3 / 4号皮带线,
firstLine = new List<int> { 213, 216 }; firstLine = new List<int> { 213, 216 };
...@@ -827,16 +827,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -827,16 +827,16 @@ namespace OnlineStore.DeviceLibrary
//大料12号只能走1号2后皮带线 //大料12号只能走1号2后皮带线
// 料架的架位大料时,架位1 - 6，12号优先走1 / 2号皮带线, // 料架的架位大料时,架位1 - 6，12号优先走1 / 2号皮带线,
//7 - 11优先走3 / 4号皮带线 //7 - 11优先走3 / 4号皮带线
if (inoup.rfidLoc.Equals(12)) if (param.rfidLoc.Equals(12))
{ {
// 大料12号只能走1号2后皮带线 // 大料12号只能走1号2后皮带线
mustLine = new List<int> { 204, 206 }; mustLine = new List<int> { 204, 206 };
} }
else if (inoup.rfidLoc <= 6) else if (param.rfidLoc <= 6)
{ {
firstLine = new List<int> { 204, 206 }; firstLine = new List<int> { 204, 206 };
} }
else if (inoup.rfidLoc >= 7) else if (param.rfidLoc >= 7)
{ {
firstLine = new List<int> { 213, 216 }; firstLine = new List<int> { 213, 216 };
} }
...@@ -846,8 +846,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -846,8 +846,8 @@ namespace OnlineStore.DeviceLibrary
{ {
if (mustLine.Contains(DeviceID)) if (mustLine.Contains(DeviceID))
{ {
LogInfo(" 托盘需要横移到出料线：工单出料，必须线" + "" + inoup.ToStr()); LogInfo(" 托盘需要横移到出料线：工单出料，必须线" + "" + param.ToStr());
MoveInfo.MoveParam = inoup; MoveInfo.MoveParam = param;
return true; return true;
} }
} }
...@@ -855,8 +855,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -855,8 +855,8 @@ namespace OnlineStore.DeviceLibrary
{ {
if (firstLine.Contains(DeviceID) ) if (firstLine.Contains(DeviceID) )
{ {
LogInfo(" 托盘需要横移到出料线：工单出料，优先线" + "" + inoup.ToStr()); LogInfo(" 托盘需要横移到出料线：工单出料，优先线" + "" + param.ToStr());
MoveInfo.MoveParam = inoup; MoveInfo.MoveParam = param;
return true; return true;
} }
else else
...@@ -864,16 +864,16 @@ namespace OnlineStore.DeviceLibrary ...@@ -864,16 +864,16 @@ namespace OnlineStore.DeviceLibrary
TimeSpan span = DateTime.Now - trayInfo.LastUpdateTime; TimeSpan span = DateTime.Now - trayInfo.LastUpdateTime;
if (span.TotalSeconds > 300) if (span.TotalSeconds > 300)
{ {
LogInfo(" 托盘需要横移到出料线：工单出料，超时五分钟" + "" + inoup.ToStr()); LogInfo(" 托盘需要横移到出料线：工单出料，超时五分钟" + "" + param.ToStr());
MoveInfo.MoveParam = inoup; MoveInfo.MoveParam = param;
return true; return true;
} }
} }
} }
else else
{ {
LogInfo(" 托盘需要横移到出料线：工单出料，随意放" + "" + inoup.ToStr()); LogInfo(" 托盘需要横移到出料线：工单出料，随意放" + "" + param.ToStr());
MoveInfo.MoveParam = inoup; MoveInfo.MoveParam = param;
return true; return true;
} }
} }
......
source/DeviceLibrary/assemblyLine/HY/HY_C1_SLStation.cs
...@@ -17,7 +17,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -17,7 +17,7 @@ namespace OnlineStore.DeviceLibrary
{ {
public HY_C1_SLStation(string cid, HYEquip_Config config) : base(cid, config) public HY_C1_SLStation(string cid, HYEquip_Config config) : base(cid, config)
{ {
Name = (" C1THY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper(); Name = (" C1HY" + (DeviceID % 100).ToString().PadLeft(2, '0') + " ").ToUpper();
} }
public override bool StartRun(bool isDebug = false) public override bool StartRun(bool isDebug = false)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!