Skip to content

李娜 / SO827-AssemblyLine

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

1

1 个父辈 59875bb0
内嵌 并排
正在显示 2 个修改的文件 包含 22 行增加 和 20 行删除
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
...@@ -142,7 +142,7 @@ ...@@ -142,7 +142,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(496, 175); this.groupBox1.Location = new System.Drawing.Point(500, 175);
this.groupBox1.Name = "groupBox1"; this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(373, 151); this.groupBox1.Size = new System.Drawing.Size(373, 151);
this.groupBox1.TabIndex = 105; this.groupBox1.TabIndex = 105;
...@@ -353,9 +353,9 @@ ...@@ -353,9 +353,9 @@
this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before); this.groupDO.Controls.Add(this.BeforeAfterCylinder_Before);
this.groupDO.Controls.Add(this.TopCylinder_Up); this.groupDO.Controls.Add(this.TopCylinder_Up);
this.groupDO.Controls.Add(this.UpDownCylinder_Up); this.groupDO.Controls.Add(this.UpDownCylinder_Up);
this.groupDO.Location = new System.Drawing.Point(496, 332); this.groupDO.Location = new System.Drawing.Point(500, 332);
this.groupDO.Name = "groupDO"; this.groupDO.Name = "groupDO";
this.groupDO.Size = new System.Drawing.Size(661, 117); this.groupDO.Size = new System.Drawing.Size(652, 117);
this.groupDO.TabIndex = 255; this.groupDO.TabIndex = 255;
this.groupDO.TabStop = false; this.groupDO.TabStop = false;
this.groupDO.Text = "IO操作测试"; this.groupDO.Text = "IO操作测试";
...@@ -365,7 +365,7 @@ ...@@ -365,7 +365,7 @@
this.ClampCylinder_Work.BackColor = System.Drawing.Color.White; this.ClampCylinder_Work.BackColor = System.Drawing.Color.White;
this.ClampCylinder_Work.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.ClampCylinder_Work.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ClampCylinder_Work.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.ClampCylinder_Work.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ClampCylinder_Work.Location = new System.Drawing.Point(527, 26); this.ClampCylinder_Work.Location = new System.Drawing.Point(520, 26);
this.ClampCylinder_Work.Name = "ClampCylinder_Work"; this.ClampCylinder_Work.Name = "ClampCylinder_Work";
this.ClampCylinder_Work.Size = new System.Drawing.Size(120, 34); this.ClampCylinder_Work.Size = new System.Drawing.Size(120, 34);
this.ClampCylinder_Work.TabIndex = 262; this.ClampCylinder_Work.TabIndex = 262;
...@@ -378,7 +378,7 @@ ...@@ -378,7 +378,7 @@
this.BeforeAfterCylinder_After.BackColor = System.Drawing.Color.White; this.BeforeAfterCylinder_After.BackColor = System.Drawing.Color.White;
this.BeforeAfterCylinder_After.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.BeforeAfterCylinder_After.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BeforeAfterCylinder_After.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.BeforeAfterCylinder_After.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BeforeAfterCylinder_After.Location = new System.Drawing.Point(271, 66); this.BeforeAfterCylinder_After.Location = new System.Drawing.Point(264, 66);
this.BeforeAfterCylinder_After.Name = "BeforeAfterCylinder_After"; this.BeforeAfterCylinder_After.Name = "BeforeAfterCylinder_After";
this.BeforeAfterCylinder_After.Size = new System.Drawing.Size(120, 34); this.BeforeAfterCylinder_After.Size = new System.Drawing.Size(120, 34);
this.BeforeAfterCylinder_After.TabIndex = 261; this.BeforeAfterCylinder_After.TabIndex = 261;
...@@ -391,7 +391,7 @@ ...@@ -391,7 +391,7 @@
this.UpDownCylinder_Down.BackColor = System.Drawing.Color.White; this.UpDownCylinder_Down.BackColor = System.Drawing.Color.White;
this.UpDownCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.UpDownCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.UpDownCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.UpDownCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.UpDownCylinder_Down.Location = new System.Drawing.Point(399, 66); this.UpDownCylinder_Down.Location = new System.Drawing.Point(392, 66);
this.UpDownCylinder_Down.Name = "UpDownCylinder_Down"; this.UpDownCylinder_Down.Name = "UpDownCylinder_Down";
this.UpDownCylinder_Down.Size = new System.Drawing.Size(120, 34); this.UpDownCylinder_Down.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Down.TabIndex = 260; this.UpDownCylinder_Down.TabIndex = 260;
...@@ -404,7 +404,7 @@ ...@@ -404,7 +404,7 @@
this.TopCylinder_Down.BackColor = System.Drawing.Color.White; this.TopCylinder_Down.BackColor = System.Drawing.Color.White;
this.TopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.TopCylinder_Down.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.TopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TopCylinder_Down.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TopCylinder_Down.Location = new System.Drawing.Point(143, 66); this.TopCylinder_Down.Location = new System.Drawing.Point(136, 66);
this.TopCylinder_Down.Name = "TopCylinder_Down"; this.TopCylinder_Down.Name = "TopCylinder_Down";
this.TopCylinder_Down.Size = new System.Drawing.Size(120, 34); this.TopCylinder_Down.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Down.TabIndex = 259; this.TopCylinder_Down.TabIndex = 259;
...@@ -417,7 +417,7 @@ ...@@ -417,7 +417,7 @@
this.StopDown2.BackColor = System.Drawing.Color.White; this.StopDown2.BackColor = System.Drawing.Color.White;
this.StopDown2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.StopDown2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.StopDown2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.StopDown2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.StopDown2.Location = new System.Drawing.Point(15, 66); this.StopDown2.Location = new System.Drawing.Point(8, 66);
this.StopDown2.Name = "StopDown2"; this.StopDown2.Name = "StopDown2";
this.StopDown2.Size = new System.Drawing.Size(120, 34); this.StopDown2.Size = new System.Drawing.Size(120, 34);
this.StopDown2.TabIndex = 258; this.StopDown2.TabIndex = 258;
...@@ -430,7 +430,7 @@ ...@@ -430,7 +430,7 @@
this.ClampCylinder_Relax.BackColor = System.Drawing.Color.White; this.ClampCylinder_Relax.BackColor = System.Drawing.Color.White;
this.ClampCylinder_Relax.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.ClampCylinder_Relax.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.ClampCylinder_Relax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.ClampCylinder_Relax.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.ClampCylinder_Relax.Location = new System.Drawing.Point(527, 66); this.ClampCylinder_Relax.Location = new System.Drawing.Point(520, 66);
this.ClampCylinder_Relax.Name = "ClampCylinder_Relax"; this.ClampCylinder_Relax.Name = "ClampCylinder_Relax";
this.ClampCylinder_Relax.Size = new System.Drawing.Size(120, 34); this.ClampCylinder_Relax.Size = new System.Drawing.Size(120, 34);
this.ClampCylinder_Relax.TabIndex = 255; this.ClampCylinder_Relax.TabIndex = 255;
...@@ -443,7 +443,7 @@ ...@@ -443,7 +443,7 @@
this.StopDown1.BackColor = System.Drawing.Color.White; this.StopDown1.BackColor = System.Drawing.Color.White;
this.StopDown1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.StopDown1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.StopDown1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.StopDown1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.StopDown1.Location = new System.Drawing.Point(15, 26); this.StopDown1.Location = new System.Drawing.Point(8, 26);
this.StopDown1.Name = "StopDown1"; this.StopDown1.Name = "StopDown1";
this.StopDown1.Size = new System.Drawing.Size(120, 34); this.StopDown1.Size = new System.Drawing.Size(120, 34);
this.StopDown1.TabIndex = 256; this.StopDown1.TabIndex = 256;
...@@ -456,7 +456,7 @@ ...@@ -456,7 +456,7 @@
this.BeforeAfterCylinder_Before.BackColor = System.Drawing.Color.White; this.BeforeAfterCylinder_Before.BackColor = System.Drawing.Color.White;
this.BeforeAfterCylinder_Before.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.BeforeAfterCylinder_Before.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.BeforeAfterCylinder_Before.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.BeforeAfterCylinder_Before.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.BeforeAfterCylinder_Before.Location = new System.Drawing.Point(271, 26); this.BeforeAfterCylinder_Before.Location = new System.Drawing.Point(264, 26);
this.BeforeAfterCylinder_Before.Name = "BeforeAfterCylinder_Before"; this.BeforeAfterCylinder_Before.Name = "BeforeAfterCylinder_Before";
this.BeforeAfterCylinder_Before.Size = new System.Drawing.Size(120, 34); this.BeforeAfterCylinder_Before.Size = new System.Drawing.Size(120, 34);
this.BeforeAfterCylinder_Before.TabIndex = 249; this.BeforeAfterCylinder_Before.TabIndex = 249;
...@@ -469,7 +469,7 @@ ...@@ -469,7 +469,7 @@
this.TopCylinder_Up.BackColor = System.Drawing.Color.White; this.TopCylinder_Up.BackColor = System.Drawing.Color.White;
this.TopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.TopCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.TopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.TopCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.TopCylinder_Up.Location = new System.Drawing.Point(143, 26); this.TopCylinder_Up.Location = new System.Drawing.Point(136, 26);
this.TopCylinder_Up.Name = "TopCylinder_Up"; this.TopCylinder_Up.Name = "TopCylinder_Up";
this.TopCylinder_Up.Size = new System.Drawing.Size(120, 34); this.TopCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.TopCylinder_Up.TabIndex = 246; this.TopCylinder_Up.TabIndex = 246;
...@@ -482,7 +482,7 @@ ...@@ -482,7 +482,7 @@
this.UpDownCylinder_Up.BackColor = System.Drawing.Color.White; this.UpDownCylinder_Up.BackColor = System.Drawing.Color.White;
this.UpDownCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.UpDownCylinder_Up.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.UpDownCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.UpDownCylinder_Up.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.UpDownCylinder_Up.Location = new System.Drawing.Point(399, 26); this.UpDownCylinder_Up.Location = new System.Drawing.Point(392, 26);
this.UpDownCylinder_Up.Name = "UpDownCylinder_Up"; this.UpDownCylinder_Up.Name = "UpDownCylinder_Up";
this.UpDownCylinder_Up.Size = new System.Drawing.Size(120, 34); this.UpDownCylinder_Up.Size = new System.Drawing.Size(120, 34);
this.UpDownCylinder_Up.TabIndex = 252; this.UpDownCylinder_Up.TabIndex = 252;
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblThisSta.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblThisSta.Location = new System.Drawing.Point(199, 127); this.lblThisSta.Location = new System.Drawing.Point(199, 127);
this.lblThisSta.Name = "lblThisSta"; this.lblThisSta.Name = "lblThisSta";
this.lblThisSta.Size = new System.Drawing.Size(947, 28); this.lblThisSta.Size = new System.Drawing.Size(942, 28);
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;
...@@ -535,9 +535,9 @@ ...@@ -535,9 +535,9 @@
// //
// clampJawControl1 // clampJawControl1
// //
this.clampJawControl1.Location = new System.Drawing.Point(874, 173); this.clampJawControl1.Location = new System.Drawing.Point(876, 173);
this.clampJawControl1.Name = "clampJawControl1"; this.clampJawControl1.Name = "clampJawControl1";
this.clampJawControl1.Size = new System.Drawing.Size(286, 159); this.clampJawControl1.Size = new System.Drawing.Size(283, 159);
this.clampJawControl1.TabIndex = 279; this.clampJawControl1.TabIndex = 279;
// //
// groupBox6 // groupBox6
...@@ -551,7 +551,7 @@ ...@@ -551,7 +551,7 @@
this.groupBox6.Controls.Add(this.lblThisSta); this.groupBox6.Controls.Add(this.lblThisSta);
this.groupBox6.Location = new System.Drawing.Point(6, 6); this.groupBox6.Location = new System.Drawing.Point(6, 6);
this.groupBox6.Name = "groupBox6"; this.groupBox6.Name = "groupBox6";
this.groupBox6.Size = new System.Drawing.Size(1151, 166); this.groupBox6.Size = new System.Drawing.Size(1146, 166);
this.groupBox6.TabIndex = 278; this.groupBox6.TabIndex = 278;
this.groupBox6.TabStop = false; this.groupBox6.TabStop = false;
this.groupBox6.Text = "当前状态"; this.groupBox6.Text = "当前状态";
...@@ -563,7 +563,7 @@ ...@@ -563,7 +563,7 @@
this.lblInoutInfo.ForeColor = System.Drawing.Color.Green; this.lblInoutInfo.ForeColor = System.Drawing.Color.Green;
this.lblInoutInfo.Location = new System.Drawing.Point(2, 17); this.lblInoutInfo.Location = new System.Drawing.Point(2, 17);
this.lblInoutInfo.Name = "lblInoutInfo"; this.lblInoutInfo.Name = "lblInoutInfo";
this.lblInoutInfo.Size = new System.Drawing.Size(1143, 23); this.lblInoutInfo.Size = new System.Drawing.Size(1138, 23);
this.lblInoutInfo.TabIndex = 281; this.lblInoutInfo.TabIndex = 281;
this.lblInoutInfo.Text = "当前出入库："; this.lblInoutInfo.Text = "当前出入库：";
// //
...@@ -587,7 +587,7 @@ ...@@ -587,7 +587,7 @@
this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight; this.lblInstoreList.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblInstoreList.Location = new System.Drawing.Point(199, 45); this.lblInstoreList.Location = new System.Drawing.Point(199, 45);
this.lblInstoreList.Name = "lblInstoreList"; this.lblInstoreList.Name = "lblInstoreList";
this.lblInstoreList.Size = new System.Drawing.Size(947, 77); this.lblInstoreList.Size = new System.Drawing.Size(942, 77);
this.lblInstoreList.TabIndex = 277; this.lblInstoreList.TabIndex = 277;
// //
// tabPage2 // tabPage2
......
source/DeviceLibrary/baan/ClampJawBean.cs
...@@ -11,11 +11,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -11,11 +11,13 @@ namespace OnlineStore.DeviceLibrary
{ {
public class ClampJawBean public class ClampJawBean
{ {
public string Name = "";
public ConfigClampJaw config = null; public ConfigClampJaw config = null;
public Rmaxis rmaxis = null; public Rmaxis rmaxis = null;
public ClampJawBean (ConfigClampJaw config) public ClampJawBean (ConfigClampJaw config)
{ {
this.config = config; this.config = config;
Name = config.DisplayStr + "(" + config.PortName + "_" + config.AxisNo + ")";
OpenPort(); OpenPort();
} }
public bool OpenPort() public bool OpenPort()
...@@ -33,7 +35,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -33,7 +35,7 @@ namespace OnlineStore.DeviceLibrary
bool result = rmaxis.OpenPort(config.PortName, config.AxisNo); bool result = rmaxis.OpenPort(config.PortName, config.AxisNo);
if (!result) if (!result)
{ {
LogUtil.error(config.DisplayStr + " OpenPort 失败：" ); LogUtil.error(Name + " OpenPort 失败：" );
} }
} }
return rmaxis.IsPortOpen; return rmaxis.IsPortOpen;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!