Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 09dde46d
全部展开
内嵌 并排
正在显示 27 个修改的文件 包含 285 行增加 和 281 行删除
source/AssemblyLineClient/App.config
......@@ -45,6 +45,7 @@
<add key ="ABBServerPort" value ="21"/>
<!--是否打开托盘编码界面-->
<add key ="OpenRFIDWrite" value ="1"/>
<add key="DefaultPWD" value ="123456"/>
</appSettings>
<log4net>
<appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender">
......
source/AssemblyLineClient/FrmDischargeLine.Designer.cs
......@@ -53,6 +53,7 @@
this.lblTrayNum = new System.Windows.Forms.Label();
this.lblInstoreList = new System.Windows.Forms.Label();
this.panel1 = new System.Windows.Forms.Panel();
this.lblName = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -362,7 +363,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(648, 19);
this.chbDebug.Location = new System.Drawing.Point(683, 20);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -388,7 +389,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(790, 21);
this.lblStoreStatus.Location = new System.Drawing.Point(788, 22);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -400,9 +401,9 @@
this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(6, 14);
this.btnStart.Location = new System.Drawing.Point(190, 12);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 34);
this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false;
......@@ -413,9 +414,9 @@
this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(118, 14);
this.btnStop.Location = new System.Drawing.Point(305, 12);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 34);
this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false;
......@@ -427,9 +428,9 @@
this.btnReset.Enabled = false;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(230, 14);
this.btnReset.Location = new System.Drawing.Point(420, 12);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(110, 34);
this.btnReset.Size = new System.Drawing.Size(110, 40);
this.btnReset.TabIndex = 95;
this.btnReset.Text = "复位";
this.btnReset.UseVisualStyleBackColor = false;
......@@ -440,9 +441,9 @@
this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(345, 14);
this.btnOutStore.Location = new System.Drawing.Point(535, 12);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 34);
this.btnOutStore.Size = new System.Drawing.Size(110, 40);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出料测试";
this.btnOutStore.UseVisualStyleBackColor = false;
......@@ -516,6 +517,7 @@
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.lblName);
this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.lblStoreStatus);
this.panel1.Controls.Add(this.btnOutStore);
......@@ -527,6 +529,17 @@
this.panel1.Size = new System.Drawing.Size(1369, 68);
this.panel1.TabIndex = 258;
//
// lblName
//
this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 12);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 248;
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmDischargeLine
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -595,6 +608,7 @@
private System.Windows.Forms.Button btnRun2;
private System.Windows.Forms.Button btnRun3;
private System.Windows.Forms.Button btnRun1;
private System.Windows.Forms.Label lblName;
}
}
source/AssemblyLineClient/FrmDischargeLine.cs
......@@ -77,26 +77,26 @@ namespace OnlineStore.AssemblyLine
if ( this.Visible)
{
ReadIOList();
lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus)+"("+canOut+")";
// string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus) ;
lblThisSta.Text = equipBean.WarnMsg;
string text = "";
List<InOutParam> ps = new List<InOutParam>(equipBean.waitOutStoreList);
if (ps.Count > 0)
{
text = "等待出料列表：\r";
foreach (InOutParam param in ps)
{
text += param.ToStr() + "\r";
}
}
if (!lblInstoreList.Text.Equals(text))
{
lblInstoreList.Text = text;
}
//string text = "";
//List<InOutParam> ps = new List<InOutParam>(equipBean.waitOutStoreList);
//if (ps.Count > 0)
//{
// text = "等待出料列表：\r";
// foreach (InOutParam param in ps)
// {
// text += param.ToStr() + "\r";
// }
//}
//if (!lblInstoreList.Text.Equals(text))
//{
// lblInstoreList.Text = text;
//}
}catch(Exception ex)
{
LogUtil.error(equipBean.Name+ "界面定时器出错："+ex.ToString());
......@@ -182,7 +182,7 @@ namespace OnlineStore.AssemblyLine
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg;
lblName.Text = equipBean.Name;
IsLoad = true;
}
......
source/AssemblyLineClient/FrmFeedingEquip.cs
......@@ -103,10 +103,10 @@ namespace OnlineStore.AssemblyLine
if (chbAutoRead.Checked && this.Visible)
{
ReadIOList();
lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库" : "不可出库";
string canOut =equipBean.Config.IsCanOut.Equals(1) ? "紧急出料模块" : "入料模块";
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus) + "(" + canOut + ")";
lblThisSta.Text = equipBean.WarnMsg;
string text = "";
......@@ -236,6 +236,7 @@ namespace OnlineStore.AssemblyLine
txtBp1.Text = equipBean.Config.BatchAxisP1.ToString();
txtBP2.Text = equipBean.Config.BatchAxisP2.ToString();
txtBP3.Text = equipBean.Config.BatchAxisP3.ToString();
lblName.Text = equipBean.Name;
IsLoad = true;
}
......
source/AssemblyLineClient/FrmLineStore.cs
......@@ -408,10 +408,10 @@ namespace OnlineStore.AssemblyLine
}
lblStatus.Text = KTK_Store.GetRunStr(lineBean.lineStatus, lineBean.runStatus)+canScanCode;
lblWarnMsg.Text = LineManager.Line.WarnMsg;
if (lineBean.isNotScanCode && lblWarnMsg.Text.Equals(""))
{
lblWarnMsg.Text = "未扫到二维码，请重新放入料盘";
}
//if (lineBean.isNotScanCode && lblWarnMsg.Text.Equals(""))
//{
// lblWarnMsg.Text = "未扫到二维码，请重新放入料盘";
//}
if (lblWarnMsg.Text.Equals(""))
{
lblWarnMsg.Text = TrayManager.TrayErrorMsg;
......
source/AssemblyLineClient/FrmMoveEquip.Designer.cs
......@@ -67,6 +67,7 @@
this.btnP2 = new System.Windows.Forms.Button();
this.txtP2 = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.lblName = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -392,7 +393,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(648, 19);
this.chbDebug.Location = new System.Drawing.Point(795, 21);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -418,7 +419,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(790, 21);
this.lblStoreStatus.Location = new System.Drawing.Point(917, 23);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -430,9 +431,9 @@
this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(6, 14);
this.btnStart.Location = new System.Drawing.Point(188, 12);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 34);
this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false;
......@@ -443,9 +444,9 @@
this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(118, 14);
this.btnStop.Location = new System.Drawing.Point(301, 12);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 34);
this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false;
......@@ -457,9 +458,9 @@
this.btnReset.Enabled = false;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(230, 14);
this.btnReset.Location = new System.Drawing.Point(414, 12);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(110, 34);
this.btnReset.Size = new System.Drawing.Size(110, 40);
this.btnReset.TabIndex = 95;
this.btnReset.Text = "复位";
this.btnReset.UseVisualStyleBackColor = false;
......@@ -470,9 +471,9 @@
this.btnInStore.BackColor = System.Drawing.Color.White;
this.btnInStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnInStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInStore.Location = new System.Drawing.Point(457, 14);
this.btnInStore.Location = new System.Drawing.Point(640, 12);
this.btnInStore.Name = "btnInStore";
this.btnInStore.Size = new System.Drawing.Size(110, 34);
this.btnInStore.Size = new System.Drawing.Size(110, 40);
this.btnInStore.TabIndex = 102;
this.btnInStore.Text = "入库测试";
this.btnInStore.UseVisualStyleBackColor = false;
......@@ -483,9 +484,9 @@
this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(345, 14);
this.btnOutStore.Location = new System.Drawing.Point(527, 12);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 34);
this.btnOutStore.Size = new System.Drawing.Size(110, 40);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出库测试";
this.btnOutStore.UseVisualStyleBackColor = false;
......@@ -599,7 +600,7 @@
this.btnP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP3.ForeColor = System.Drawing.Color.Blue;
this.btnP3.Location = new System.Drawing.Point(316, 76);
this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -626,6 +627,7 @@
// btnSave
//
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(180, 136);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(110, 34);
......@@ -654,7 +656,7 @@
this.btnMoveToP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(316, 32);
this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -693,7 +695,7 @@
this.btnP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP2.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP2.ForeColor = System.Drawing.Color.Blue;
this.btnP2.Location = new System.Drawing.Point(12, 76);
this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -721,6 +723,7 @@
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.lblName);
this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.lblStoreStatus);
this.panel1.Controls.Add(this.btnOutStore);
......@@ -733,6 +736,18 @@
this.panel1.Size = new System.Drawing.Size(1369, 68);
this.panel1.TabIndex = 258;
//
// lblName
//
this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 12);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 250;
this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmMoveEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -818,6 +833,7 @@
private System.Windows.Forms.TextBox txtWriteTime;
private System.Windows.Forms.Label label5;
private AxisMoveControl axisMoveControl1;
private System.Windows.Forms.Label lblName;
}
}
source/AssemblyLineClient/FrmMoveEquip.cs
......@@ -57,6 +57,7 @@ namespace OnlineStore.AssemblyLine
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg;
txtP1.Text = equipBean.Config.UpDownAxisP1.ToString();
lblName.Text = equipBean.Name;
IsLoad = true;
}
......@@ -104,7 +105,7 @@ namespace OnlineStore.AssemblyLine
if ( this.Visible)
{
ReadIOList();
lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库" : "不可出库";
......
source/AssemblyLineClient/FrmProvidingEquip.Designer.cs
......@@ -66,6 +66,7 @@
this.txtP2 = new System.Windows.Forms.TextBox();
this.axisMoveControl1 = new OnlineStore.AssemblyLine.AxisMoveControl();
this.panel1 = new System.Windows.Forms.Panel();
this.lblName = new System.Windows.Forms.Label();
this.groupBox1.SuspendLayout();
this.groupBox4.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -391,7 +392,7 @@
//
this.chbDebug.AutoSize = true;
this.chbDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbDebug.Location = new System.Drawing.Point(648, 19);
this.chbDebug.Location = new System.Drawing.Point(673, 22);
this.chbDebug.Name = "chbDebug";
this.chbDebug.Size = new System.Drawing.Size(84, 24);
this.chbDebug.TabIndex = 247;
......@@ -417,7 +418,7 @@
this.lblStoreStatus.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblStoreStatus.ForeColor = System.Drawing.Color.Green;
this.lblStoreStatus.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.lblStoreStatus.Location = new System.Drawing.Point(790, 21);
this.lblStoreStatus.Location = new System.Drawing.Point(788, 24);
this.lblStoreStatus.Name = "lblStoreStatus";
this.lblStoreStatus.Size = new System.Drawing.Size(65, 20);
this.lblStoreStatus.TabIndex = 245;
......@@ -429,9 +430,9 @@
this.btnStart.BackColor = System.Drawing.Color.White;
this.btnStart.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStart.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStart.Location = new System.Drawing.Point(6, 14);
this.btnStart.Location = new System.Drawing.Point(190, 13);
this.btnStart.Name = "btnStart";
this.btnStart.Size = new System.Drawing.Size(110, 34);
this.btnStart.Size = new System.Drawing.Size(110, 40);
this.btnStart.TabIndex = 86;
this.btnStart.Text = "启动调试";
this.btnStart.UseVisualStyleBackColor = false;
......@@ -442,9 +443,9 @@
this.btnStop.BackColor = System.Drawing.Color.White;
this.btnStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnStop.Location = new System.Drawing.Point(118, 14);
this.btnStop.Location = new System.Drawing.Point(305, 13);
this.btnStop.Name = "btnStop";
this.btnStop.Size = new System.Drawing.Size(110, 34);
this.btnStop.Size = new System.Drawing.Size(110, 40);
this.btnStop.TabIndex = 87;
this.btnStop.Text = "停止";
this.btnStop.UseVisualStyleBackColor = false;
......@@ -456,9 +457,9 @@
this.btnReset.Enabled = false;
this.btnReset.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReset.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReset.Location = new System.Drawing.Point(230, 14);
this.btnReset.Location = new System.Drawing.Point(420, 13);
this.btnReset.Name = "btnReset";
this.btnReset.Size = new System.Drawing.Size(110, 34);
this.btnReset.Size = new System.Drawing.Size(110, 40);
this.btnReset.TabIndex = 95;
this.btnReset.Text = "复位";
this.btnReset.UseVisualStyleBackColor = false;
......@@ -469,9 +470,9 @@
this.btnOutStore.BackColor = System.Drawing.Color.White;
this.btnOutStore.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOutStore.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOutStore.Location = new System.Drawing.Point(345, 14);
this.btnOutStore.Location = new System.Drawing.Point(535, 13);
this.btnOutStore.Name = "btnOutStore";
this.btnOutStore.Size = new System.Drawing.Size(110, 34);
this.btnOutStore.Size = new System.Drawing.Size(110, 40);
this.btnOutStore.TabIndex = 101;
this.btnOutStore.Text = "出料测试";
this.btnOutStore.UseVisualStyleBackColor = false;
......@@ -577,7 +578,7 @@
this.btnP3.Cursor = System.Windows.Forms.Cursors.Default;
this.btnP3.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP3.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP3.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP3.ForeColor = System.Drawing.Color.Blue;
this.btnP3.Location = new System.Drawing.Point(316, 76);
this.btnP3.Name = "btnP3";
this.btnP3.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -605,6 +606,7 @@
//
this.btnSave.BackColor = System.Drawing.SystemColors.Control;
this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnSave.ForeColor = System.Drawing.Color.Blue;
this.btnSave.Location = new System.Drawing.Point(180, 136);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(110, 34);
......@@ -632,7 +634,7 @@
this.btnMoveToP1.Cursor = System.Windows.Forms.Cursors.Default;
this.btnMoveToP1.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnMoveToP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnMoveToP1.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnMoveToP1.ForeColor = System.Drawing.Color.Blue;
this.btnMoveToP1.Location = new System.Drawing.Point(316, 32);
this.btnMoveToP1.Name = "btnMoveToP1";
this.btnMoveToP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -671,7 +673,7 @@
this.btnP2.Cursor = System.Windows.Forms.Cursors.Default;
this.btnP2.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnP2.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnP2.ForeColor = System.Drawing.Color.Blue;
this.btnP2.Location = new System.Drawing.Point(12, 76);
this.btnP2.Name = "btnP2";
this.btnP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -702,12 +704,12 @@
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(821, 388);
this.axisMoveControl1.TabIndex = 0;
this.axisMoveControl1.Load += new System.EventHandler(this.axisMoveControl1_Load);
//
// panel1
//
this.panel1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.panel1.Controls.Add(this.lblName);
this.panel1.Controls.Add(this.chbDebug);
this.panel1.Controls.Add(this.lblStoreStatus);
this.panel1.Controls.Add(this.btnOutStore);
......@@ -719,6 +721,18 @@
this.panel1.Size = new System.Drawing.Size(1372, 68);
this.panel1.TabIndex = 258;
//
// lblName
//
this.lblName.BackColor = System.Drawing.Color.DodgerBlue;
this.lblName.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblName.ForeColor = System.Drawing.Color.Black;
this.lblName.Location = new System.Drawing.Point(5, 13);
this.lblName.Name = "lblName";
this.lblName.Size = new System.Drawing.Size(180, 40);
this.lblName.TabIndex = 259;
this.lblName.Text = "出料流水线";
this.lblName.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
//
// FrmProvidingEquip
//
this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
......@@ -803,6 +817,7 @@
private System.Windows.Forms.Label label4;
internal System.Windows.Forms.Button btnP2;
internal System.Windows.Forms.TextBox txtP2;
private System.Windows.Forms.Label lblName;
}
}
source/AssemblyLineClient/FrmProvidingEquip.cs
......@@ -78,26 +78,26 @@ namespace OnlineStore.AssemblyLine
if ( this.Visible)
{
ReadIOList();
lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
//lblTrayNum.Text = "托盘编码：" + TrayManager.GetTrayNum(equipBean.DeviceID);
}
string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus)+"("+canOut+")";
// string canOut = LineManager.Line.CanOutStore(equipBean.DeviceID) ? "可出库":"不可出库" ;
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus) ;
lblThisSta.Text = equipBean.WarnMsg;
string text = "";
List<InOutParam> ps = new List<InOutParam>(equipBean.waitOutStoreList);
if (ps.Count > 0)
{
text = "等待出料列表：\r";
foreach (InOutParam param in ps)
{
text += param.ToStr() + "\r";
}
}
if (!lblInstoreList.Text.Equals(text))
{
lblInstoreList.Text = text;
}
//string text = "";
//List<InOutParam> ps = new List<InOutParam>(equipBean.waitOutStoreList);
//if (ps.Count > 0)
//{
// text = "等待出料列表：\r";
// foreach (InOutParam param in ps)
// {
// text += param.ToStr() + "\r";
// }
//}
//if (!lblInstoreList.Text.Equals(text))
//{
// lblInstoreList.Text = text;
//}
}catch(Exception ex)
{
LogUtil.error(equipBean.Name+ "界面定时器出错："+ex.ToString());
......@@ -196,7 +196,7 @@ namespace OnlineStore.AssemblyLine
lblStoreStatus.Text = KTK_Store.GetRunStr(equipBean.lineStatus, equipBean.runStatus);
lblThisSta.Text = equipBean.WarnMsg;
lblName.Text = equipBean.Name;
IsLoad = true;
}
......@@ -337,12 +337,6 @@ namespace OnlineStore.AssemblyLine
IOManager.instance.WriteSingleDO(io.IO_IP, io.SlaveID, io.GetIOAddr(), IO_VALUE.LOW);
}
}
private void axisMoveControl1_Load(object sender, EventArgs e)
{
}
private void btnBoxP_Click(object sender, EventArgs e)
{
......@@ -354,7 +348,6 @@ namespace OnlineStore.AssemblyLine
equipBase.UpdownAxis.AbsMove(position, speed);
}
}
private void btnMoveto_Click(object sender, EventArgs e)
{
int position = FormUtil.GetIntValue(txtP2);
......@@ -365,7 +358,6 @@ namespace OnlineStore.AssemblyLine
equipBase.UpdownAxis.AbsMove(position, speed);
}
}
private void btnMoveToP1_Click(object sender, EventArgs e)
{
int position = FormUtil.GetIntValue(txtP1);
......@@ -376,10 +368,8 @@ namespace OnlineStore.AssemblyLine
equipBase.UpdownAxis.AbsMove(position, speed);
}
}
private void cmbSizeList_SelectedIndexChanged(object sender, EventArgs e)
{
if (cmbSizeList.SelectedIndex < 0)
{
return;
......
source/AssemblyLineClient/FrmPwd.Designer.cs
......@@ -79,7 +79,6 @@
this.txtPwd.PasswordChar = '*';
this.txtPwd.Size = new System.Drawing.Size(215, 33);
this.txtPwd.TabIndex = 276;
this.txtPwd.Text = "123456";
this.txtPwd.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtPwd_KeyDown);
//
// FrmPwd
......
source/AssemblyLineClient/FrmPwd.cs
......@@ -26,6 +26,7 @@ namespace OnlineStore.AssemblyLine
private void FrmPwd_Load(object sender, EventArgs e)
{
this.DialogResult = DialogResult.None;
txtPwd.Text = ConfigAppSettings.GetValue(Setting_Init.DefaultPWD);
}
private void btnNext_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmPwd.resx
......@@ -112,12 +112,12 @@
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, internalKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, internalKeyToken=b77a5c561934e089</value>
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, internalKeyToken=b03f5f7f11d50a3a" />
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAABAA8AMDAQAAEABABoBgAA9gAAACgoEAABAAQAyAQAAF4HAAAgIBAAAQAEAOgCAAAmDAAAGBgQAAEA
......
source/AssemblyLineClient/useControl/AxisMoveControl.cs
......@@ -47,13 +47,13 @@ namespace OnlineStore.AssemblyLine
}
private void btnOpenAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【打开伺服】，端口号【" + PortName + "】地址【" + SlvAddr + "】 ");
LogUtil.info("点击【打开伺服】，【" + PortName + "_" + SlvAddr + "】 ");
equipBase.RunAxis(false, axisList[comboBox1.SelectedIndex]);
}
private void btnCloseAxis_Click(object sender, EventArgs e)
{
LogUtil.info("点击【关闭伺服】，端口号【" + PortName + "】地址【" + SlvAddr + "】 ");
LogUtil.info("点击【关闭伺服】，【" + PortName + "_" + SlvAddr + "】 ");
// ACServerManager.ServoOff(PortName, SlvAddr);
equipBase.CloseAxis(axisList[comboBox1.SelectedIndex]);
}
......@@ -62,7 +62,7 @@ namespace OnlineStore.AssemblyLine
{
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【绝对运动】，端口号【" + PortName + "】地址【" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
LogUtil.info("点击【绝对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
ACServerManager.AbsMove(PortName, SlvAddr, position, speed);
}
......@@ -70,27 +70,26 @@ namespace OnlineStore.AssemblyLine
{
int position = FormUtil.GetIntValue(txtAPosition);
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【相对运动】，端口号【" + PortName + "】地址【" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
LogUtil.info("点击【相对运动】，【" + PortName + "_" + SlvAddr + "】位置【" + position + "】速度【" + speed + "】");
ACServerManager.RelMove(PortName, SlvAddr, position, speed);
}
private void btnAxisVMove_Click(object sender, EventArgs e)
{
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【匀速运动】，端口号【" + PortName + "】地址【" + SlvAddr + "】 速度【" + speed + "】");
LogUtil.info("点击【匀速运动】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
ACServerManager.SpeedMove(PortName, SlvAddr, speed);
}
private void btnAxisStop_Click(object sender, EventArgs e)
{
LogUtil.info("点击【停止运动】，端口号【" + PortName + "】地址【" + SlvAddr + "】 ");
LogUtil.info("点击【停止运动】，【" + PortName + "_" + SlvAddr + "】 ");
ACServerManager.SuddenStop(PortName, SlvAddr);
}
private void btnComAlarmClear_Click(object sender, EventArgs e)
{
LogUtil.info("点击【清理报警】，端口号【" + PortName + "】地址【" + SlvAddr + "】 ");
LogUtil.info("点击【清理报警】，【" + PortName + "_" + SlvAddr + "】 ");
ACServerManager.AlarmClear(PortName, SlvAddr);
Thread.Sleep(100);
ACServerManager.ServoOn(PortName, SlvAddr);
......@@ -99,7 +98,7 @@ namespace OnlineStore.AssemblyLine
private void btnAxisReturnHome_Click(object sender, EventArgs e)
{
int speed = FormUtil.GetIntValue(txtASpeed);
LogUtil.info("点击【原点返回】，端口号【" + PortName + "】地址【" + SlvAddr + "】 速度【" + speed + "】");
LogUtil.info("点击【原点返回】，【" + PortName + "_" + SlvAddr + "】 速度【" + speed + "】");
ACServerManager.HomeMove(PortName, SlvAddr, speed);
}
......@@ -133,11 +132,11 @@ namespace OnlineStore.AssemblyLine
Color color = Color.Black;
if (comboBox1.SelectedIndex.Equals(0))
{
color = Color.Red;
color = Color.Blue;
}
else if (comboBox1.SelectedIndex.Equals(1))
{
color = Color.Blue;
color = Color.Red;
}
btnOpenAxis.ForeColor = color;
btnCloseAxis.ForeColor = color;
......
source/AssemblyLineClient/记录.txt
......@@ -9,3 +9,27 @@
移栽出入库升降轴：P1:待机位置。P2:流水线下降端，P3:Box门口下降端
出料模块 升降轴：P1:待机位置。P2:流水线下降端，P3:出料皮带线下降端
入料模块 提升轴：P1:待机位置。P2:下降位置，P3:缓慢上升目标位置
入料模块：
提升伺服向下回原点，料架进入工位前，提升伺服需要上升到P1待机位，
料架进入工位后，提升伺服下降到P2，然后定位气缸上升，定位装置前进。
source/Common/Setting_Init.cs
......@@ -75,5 +75,6 @@ namespace OnlineStore.Common
public static string ABBServerPort = "ABBServerPort";
public static string OpenRFIDWrite = "OpenRFIDWrite";
public static string DefaultPWD = "DefaultPWD";
}
}
source/DeviceLibrary/LineConfig/Config_FeedingEquip_1.csv
......@@ -6,9 +6,9 @@ PRO,0,对应的横移模块,SidesWayNum,1,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,1,COM1,0,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
PRO,0,提升上料轴目标速度,BatchAxis_TargetSpeed,150,,,,,
PRO,0,提升上料轴加速度,BatchAxis_AddSpeed,400,,,,,
PRO,0,提升上料轴减速度,BatchAxis_DelSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_2.csv
......@@ -6,9 +6,9 @@ PRO,0,对应的横移模块,SidesWayNum,0,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,3,COM1,0,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
PRO,0,提升上料轴目标速度,BatchAxis_TargetSpeed,150,,,,,
PRO,0,提升上料轴加速度,BatchAxis_AddSpeed,400,,,,,
PRO,0,提升上料轴减速度,BatchAxis_DelSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_3.csv
......@@ -6,9 +6,9 @@ PRO,0,对应的横移模块,SidesWayNum,2,,,,,
PRO,0,是否是用来出料,IsCanOut,0,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,5,COM1,0,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
PRO,0,提升上料轴目标速度,BatchAxis_TargetSpeed,150,,,,,
PRO,0,提升上料轴加速度,BatchAxis_AddSpeed,400,,,,,
PRO,0,提升上料轴减速度,BatchAxis_DelSpeed,400,,,,,
......
source/DeviceLibrary/LineConfig/Config_FeedingEquip_4.csv
......@@ -6,9 +6,9 @@ PRO,0,对应的横移模块,SidesWayNum,3,,,,,
PRO,0,是否是用来出料,IsCanOut,1,,,,,
,,,,,,,,,
AXIS,0,提升上料轴,Batch_Axis,7,COM1,0,,,
PRO,0,提升上料轴原位待机点 P1,BatchAxisP1,1000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,10000,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,500,,,,,
PRO,0,提升上料轴上升待机点 P1,BatchAxisP1,10000,,,,,
PRO,0,提升上料轴下降位置P2,BatchAxisP2,-500,,,,,
PRO,0,提升上料缓慢上升目标位置P3,BatchAxisP3,10000,,,,,
PRO,0,提升上料轴目标速度,BatchAxis_TargetSpeed,150,,,,,
PRO,0,提升上料轴加速度,BatchAxis_AddSpeed,400,,,,,
PRO,0,提升上料轴减速度,BatchAxis_DelSpeed,400,,,,,
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -66,10 +66,6 @@ namespace OnlineStore.DeviceLibrary
return false;
}
/// <summary>
/// 入料装置重置
/// </summary>
public override bool Reset()
{
StopMove();
......@@ -83,13 +79,16 @@ namespace OnlineStore.DeviceLibrary
return true;
}return false;
}
private void StartReset()
{
ResetClearData();
lineStatus = LineStatus.ResetMove;
LogInfo(MoveInfo.MoveType + "：FR_01_StopCylinderMove：放料阻挡气缸上升,顶升气缸下降");
IOMove(IO_Type.SL_HddLed, IO_VALUE.HIGH);
MoveInfo.NextMoveStep(LineMoveStep.FR_01_StopCylinderMove);
MoveInfo.NextMoveStep(LineMoveStep.FR_01_BatchAxisHome);
LogInfo(MoveInfo.MoveType + "："+MoveInfo.MoveStep+ "：提升伺服回原点，升降伺服回原点，所有阻挡气缸上升");
BatchAxis.HomeMove(MoveInfo);
UpdownAxis.HomeMove(MoveInfo);
if (Config.SidesWayNum <= 0)
{
IOMove(IO_Type.FL_StopCylinder_Down1, IO_VALUE.LOW);
......@@ -97,12 +96,20 @@ namespace OnlineStore.DeviceLibrary
//顶升气缸下降
CylinderMove(null, IO_Type.FL_TopCylinder_Up, IO_Type.FL_TopCylinder_Down);
}
//线体停止
IOMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.LOW);
//阻挡上升
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
isInPro = false;
}
/// <summary>
/// 复位处理
/// </summary>
//复位时，应该先提升伺服回原点，然后提升伺服下降到P2点，放开定位气缸，顶升气缸下降，提升伺服在上升到P1点。
protected override void ResetProcess()
{
if (MoveInfo.IsInWait)
......@@ -116,30 +123,29 @@ namespace OnlineStore.DeviceLibrary
case LineMoveStep.Wait:
StartReset();
break;
case LineMoveStep.FR_01_StopCylinderMove:
LogInfo(MoveInfo.MoveType + "：FR_03_TrayLocation_After：升降轴托盘气缸后退");
MoveInfo.NextMoveStep(LineMoveStep.FR_03_TrayLocation_After);
TrayLCylinderAfter(MoveInfo);
case LineMoveStep.FR_01_BatchAxisHome:
LogInfo(MoveInfo.MoveType + "：FR_03_BatchAxisToP2：提升伺服下降到P2点，升降伺服上升到待机点");
MoveInfo.NextMoveStep(LineMoveStep.FR_03_BatchAxisToP2);
BatchAxis.AbsMove(MoveInfo, Config.BatchAxisP2, Config.BatchAxis_P2Speed);
UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
break;
case LineMoveStep.FR_03_TrayLocation_After:
LogInfo(MoveInfo.MoveType + "：FR_04_LocationCylinder_Down：定位气缸下降");
case LineMoveStep.FR_03_BatchAxisToP2:
LogInfo(MoveInfo.MoveType + "：FR_04_LocationCylinder_Down： 放开定位气缸");
MoveInfo.NextMoveStep(LineMoveStep.FR_04_LocationCylinder_Down);
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down);
TrayLCylinderAfter(MoveInfo);
break;
case LineMoveStep.FR_04_LocationCylinder_Down:
LogInfo(MoveInfo.MoveType + "：FR_05_AxisHomeMove：2伺服原点返回");
MoveInfo.NextMoveStep(LineMoveStep.FR_05_AxisHomeMove);
BatchAxis.HomeMove(MoveInfo);
UpdownAxis.HomeMove(MoveInfo);
LogInfo(MoveInfo.MoveType + "：FR_05_TopCylinderDown：SL1定位气缸下降SOL");
MoveInfo.NextMoveStep(LineMoveStep.FR_05_TopCylinderDown);
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down);
break;
case LineMoveStep.FR_05_AxisHomeMove:
LogInfo(MoveInfo.MoveType + "：FR_06_AxisToP1：2伺服到P1点");
MoveInfo.NextMoveStep(LineMoveStep.FR_06_AxisToP1);
case LineMoveStep.FR_05_TopCylinderDown:
LogInfo(MoveInfo.MoveType + "：FR_06_BatchAxisToP1：提升伺服在上升到P1点");
MoveInfo.NextMoveStep(LineMoveStep.FR_06_BatchAxisToP1);
BatchAxis.AbsMove (MoveInfo, Config.BatchAxisP1, Config.BatchAxis_P1Speed);
UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
break;
case LineMoveStep.FR_06_AxisToP1:
case LineMoveStep.FR_06_BatchAxisToP1:
LogInfo(MoveInfo.MoveType + "：FR_07_MoveCylinder_Up：上料横移机构上升SOL");
MoveInfo.NextMoveStep(LineMoveStep.FR_07_MoveCylinder_Up);
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
......@@ -186,10 +192,10 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SL_Line_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.LOW);
}
/// <summary>
......@@ -282,7 +288,7 @@ namespace OnlineStore.DeviceLibrary
}
/// <summary>
/// 升降轴定位气缸前进
/// 升降盘定位气缸前进
/// </summary>
public void TrayLCylinderBefore(LineMoveInfo moveinfo = null)
{
......@@ -297,7 +303,7 @@ namespace OnlineStore.DeviceLibrary
}
}
/// <summary>
/// 升降轴定位气缸后退
/// 升降盘定位气缸后退
/// </summary>
public void TrayLCylinderAfter(LineMoveInfo moveinfo = null)
{
......
source/DeviceLibrary/assemblyLine/FeedingEquip_Partial.cs
......@@ -356,10 +356,7 @@ namespace OnlineStore.DeviceLibrary
#region 入料流程
/// <summary>
/// 判断是否有料架，若有开始入料
/// </summary>
/// <returns></returns>
private bool StartInStoreP()
{
//若定位工位，阻挡工位，入料口有一个有料架，需要进行处理
......@@ -367,6 +364,10 @@ namespace OnlineStore.DeviceLibrary
{
StartInStoreMove(null);
}
else if (IOValue(IO_Type.SL_Out_Check).Equals(IO_VALUE.HIGH))
{
//线体出口检测到料架，需要通知AGV小车
}
return false ;
}
......@@ -376,9 +377,21 @@ namespace OnlineStore.DeviceLibrary
lineStatus = LineStatus.InStoreExecute;
MoveInfo.NewMove(LineMoveType.InStore);
MoveInfo.MoveParam = new InOutParam();
//判断是哪个工位有料架
if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.HIGH))
{
//定位工位有料架，直接开始入料
MoveInfo.NextMoveStep(LineMoveStep.FI_07_LocationCylinder_Up);
InStoreLog(" 定位工位检测到料架：FI_07_LocationCylinder_Up缓冲阻挡上升， 定位气缸上升");
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Down, IO_Type.SW4_LocationCylinder_Up);
}
else
{
MoveInfo.NextMoveStep(LineMoveStep.FI_01_TrayLocation_After);
TrayLCylinderAfter(MoveInfo);
InStoreLog("检测到料架， FI_01_TrayLocation_After ：升降盘定位气缸下降");
}
return true ;
}
private void LineInStoreProcess()
......@@ -403,17 +416,26 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.Line_Run, IO_VALUE.HIGH);
//等待指定时间
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
InStoreLog(" FI_03_InLineStart 入料检测：阻挡工位有料架，进料阻挡上升，缓冲阻挡下降，流水线转动2000");
InStoreLog(" FI_03_InLineStart 入料检测：阻挡检测有料架，进料阻挡上升，缓冲阻挡下降，流水线转动2000");
}
else if (IOValue(IO_Type.SL_Entry_Check).Equals(IO_VALUE.HIGH))
{
//判断料架的编码是否正确
int num = TrayManager.GetShelfNum(DeviceID);
if (num <= 0)
{
MoveInfo.EndMove();
runStatus = LineRunStatus.Runing;
LogUtil.info(" 入料检测有料架，获取不到正确的料架编号，入料结束");
return;
}
MoveInfo.NextMoveStep(LineMoveStep.FI_03_LineStart);
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH);//进料阻挡下降
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡上升
IOMove(IO_Type.Line_Run, IO_VALUE.HIGH);
//等待指定时间
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
InStoreLog(" FI_03_InLineStart 入料检测：入料工位有料架，进料阻挡下降，缓冲阻挡上升，流水线转动2000");
InStoreLog(" FI_03_InLineStart 入料检测：入料检测有料架，进料阻挡下降，缓冲阻挡上升，流水线转动2000");
}
else
{
......@@ -435,14 +457,15 @@ namespace OnlineStore.DeviceLibrary
if (MoveInfo.MoveStep.Equals(LineMoveStep.Wait))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_01_TrayLocation_After);
TrayLCylinderAfter(MoveInfo);
InStoreLog(" FI_01_TrayLocation_After 开始：升降盘定位气缸下降");
TrayLCylinderAfter(MoveInfo);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_01_TrayLocation_After))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_02_LocationCylinder_Down);
InStoreLog(" FI_02_LocationCylinder_Down 开始：定位气缸下降，提升伺服移动到P1");
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down);
InStoreLog(" FI_02_LocationCylinder_Down 开始：定位气缸下降");
BatchAxis.AbsMove(Config.BatchAxisP1, Config.BatchAxis_P1Speed);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_02_LocationCylinder_Down))
{
......@@ -535,14 +558,7 @@ namespace OnlineStore.DeviceLibrary
{
MoveInfo.NextMoveStep(LineMoveStep.FI_15_SaveSize);
LastHeight = GetHeight();
if (IOValue(IO_Type.SL_TrayCheck1).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SL_TrayCheck2).Equals(IO_VALUE.HIGH))
{
LastWidth = 7;
}
else if (IOValue(IO_Type.SL_TrayCheck3).Equals(IO_VALUE.HIGH) && IOValue(IO_Type.SL_TrayCheck4).Equals(IO_VALUE.HIGH))
{
LastWidth = 13;
}
LastWidth = GetWidth();
InStoreLog(" FI_15_SaveSize 料盘移栽：记录高度尺寸 高度【" + LastHeight + "】宽度【" + LastWidth + "】");
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_15_SaveSize))
......@@ -637,20 +653,17 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(MoveInfo, IO_Type.SL_OutTopCylinder_Down, IO_Type.SL_OutTopCylinder_Up);
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_34_OutCheck))
{
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_35_OutTopCylinder_Up))
{
//TODO
MoveInfo.NextMoveStep(LineMoveStep.FI_36_SideWayLineRun);
InStoreLog(" FI_36_SideWayLineRun 上料完成， 线体横移电机运转，等待料架到达出口");
InStoreLog(" FI_36_SideWayLineRun 上料完成， 线体横移电机运转，等待SL1线体出口横移检测");
IOMove(IO_Type.SL_LocationSideWay_Run, IO_VALUE.HIGH);
IOMove(IO_Type.SL_OutSideWay_Run, IO_VALUE.HIGH);
MoveInfo.OneWaitCanEndStep = true;
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_Out_Check, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_SideWay_OutCheck, IO_VALUE.HIGH));
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_36_SideWayLineRun))
{
......@@ -731,6 +744,27 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(msg + ",归类为" + LastHeight);
return LastHeight;
}
private int GetWidth()
{
int width = 15;
if (IOValue(IO_Type.SL_TrayCheck4).Equals(IO_VALUE.HIGH))
{
width = 15;
}
else if (IOValue(IO_Type.SL_TrayCheck3).Equals(IO_VALUE.HIGH))
{
width = 13;
}
else if (IOValue(IO_Type.SL_TrayCheck2).Equals(IO_VALUE.HIGH))
{
width = 11;
}
else if (IOValue(IO_Type.SL_TrayCheck1).Equals(IO_VALUE.HIGH))
{
width = 7;
}
return width;
}
#endregion
......@@ -856,8 +890,9 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_01_TrayLocation_After))
{
MoveInfo.NextMoveStep(LineMoveStep.FO_02_LocationCylinder_Down);
InStoreLog(" FO_02_LocationCylinder_Down 开始：定位气缸下降，提升轴移动到P1");
CylinderMove(MoveInfo, IO_Type.SL_LocationCylinder_Up, IO_Type.SL_LocationCylinder_Down);
InStoreLog(" FO_02_LocationCylinder_Down 开始：定位气缸下降");
BatchAxis.AbsMove(Config.BatchAxisP1, Config.BatchAxis_P1Speed);
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FO_02_LocationCylinder_Down))
{
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -20,11 +20,6 @@ namespace OnlineStore.DeviceLibrary
{
/// <summary>
/// 是否没有扫到码
/// </summary>
public bool isNotScanCode = false;
/// <summary>
/// 灯闪烁定时器
/// </summary>
private System.Timers.Timer ledProcessTimer = null;
......@@ -437,7 +432,6 @@ namespace OnlineStore.DeviceLibrary
{
if (IsSleep)
{
isNotScanCode = false;
return;
}
if (PreIsHasProcess.Equals(isHasO))
......@@ -473,7 +467,7 @@ namespace OnlineStore.DeviceLibrary
SleepProcess();
//黄灯
if (isNotScanCode || runStatus.Equals(LineRunStatus.HomeMoving) || runStatus.Equals(LineRunStatus.Reset))
if ( runStatus.Equals(LineRunStatus.HomeMoving) || runStatus.Equals(LineRunStatus.Reset))
{
//开机执行中时黄灯闪烁
if (IsDoValue(IO_Type.RunSign_HddLed, IO_VALUE.HIGH))
......@@ -727,80 +721,6 @@ namespace OnlineStore.DeviceLibrary
#region 扫码枪代码
///// <summary>
///// 是否已经扫码
///// </summary>
//private bool IsScanCode = false;
//private string CodeMsg = "";
//private static string ACCode = "";
//public void GetCameraCode()
//{
// if (IsInScan())
// {
// LogUtil.info("上次扫码还未执行完毕,请稍后！");
// return;
// }
// Task.Factory.StartNew(delegate
// {
// IsScanCode = true;
// LastScanTime = DateTime.Now;
// DateTime date = DateTime.Now;
// // IOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
// List<string> codeList = CodeManager.CameraScan();
// if (codeList.Count <= 0)
// {
// codeList = CodeManager.CameraScan();
// }
// List<string> list = new List<string>();
// string outMsg = "";
// string message = "";
// int height = GetHeight();
// int width = GetWidth();
// //= 1 + 123.4x100.5 - 7x12 = CODE
// foreach (string str in codeList)
// {
// if (list.Contains(str.Trim()))
// {
// continue;
// }
// list.Add(str.Trim());
// //string code = "=1+0x0-" + width + "x" + height + "=" + str.Trim();
// string code = width + "x" + height + "%3D" + str.Trim();
// message = message + code + spiltStr;
// }
// if (!outMsg.Equals(""))
// {
// CodeMsg = "盘尺寸错误，清理二维码【" + message + "】";
// LogUtil.error("盘尺寸错误，清理二维码【" + message + "】");
// message = "";
// }
// // KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
// onCodeReceived( message,height,width);
// IsScanCode = false;
// });
//}
//private string spiltStr = "%23%23";
//private DateTime LastScanTime = DateTime.Now;
//private bool IsInScan()
//{
// if (!IsScanCode)
// {
// return false;
// }
// TimeSpan span = DateTime.Now - LastScanTime;
// if (span.TotalSeconds > 60)
// {
// //大于60秒表示超时了，可以重新开始扫码
// return false;
// }
// return true;
//}
/// <summary>
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
......@@ -11,13 +11,6 @@ namespace OnlineStore.DeviceLibrary
partial class LineBean
{
#region 定时处理方法
//private DateTime NextScanTime = DateTime.Now;
//private DateTime NextEmptyGo = DateTime.Now;
//private bool IsWaitToScan = false;
//private bool IsWaitEmptyGo = false;
//private bool isWaitOutGo = false;
//private DateTime WaitOutGoTime = DateTime.Now;
public bool LineCanRun()
{
......
source/DeviceLibrary/assemblyLine/ProvidingEquip.cs
......@@ -125,16 +125,13 @@ namespace OnlineStore.DeviceLibrary
UpdownUpMove();
break;
case LineMoveStep.MH_UpDownCylinder_Up:
MoveInfo.NextMoveStep(LineMoveStep.MH_OtherCylinder_Back);
LogInfo(MoveInfo.MoveType + " ： (上升到位，顶升气缸下降，前后气缸后退，夹紧气缸放松 )开始");
CylinderMove(MoveInfo, IO_Type.TopCylinder_UP, IO_Type.TopCylinder_Down);
CylinderMove(MoveInfo, IO_Type.BeforeAfterCylinder_Before, IO_Type.BeforeAfterCylinder_After);
CylinderMove(MoveInfo, IO_Type.ClampCylinder_Slack, IO_Type.ClampCylinder_Tighten);
break;
case LineMoveStep.MH_OtherCylinder_Back:
MoveInfo.EndMove();
SecondMoveInfo.EndMove();
LogInfo(MoveInfo.MoveType + " 完成！");
......@@ -206,13 +203,10 @@ namespace OnlineStore.DeviceLibrary
}
IOTimeOutProcess();
}
public override bool StartInStoreMove(InOutParam param)
{
return false;
}
protected override void InStoreProcess()
{
}
......
source/DeviceLibrary/baan/AxisBean.cs
......@@ -13,13 +13,6 @@ namespace OnlineStore.DeviceLibrary
{
public ConfigMoveAxis Config =null;
////是否在原点返回
//private bool homeRunning = false;
////是否在移动
//private bool moveRunning = false;
////是否已连接
//public bool isConnect = false;
public static int TimeoutInterval = 500;
......
source/DeviceLibrary/model/StoreStep.cs
......@@ -470,27 +470,28 @@ namespace OnlineStore.DeviceLibrary
#endregion
#region 入料装置原点返回，10000开始
/// <summary>
/// 放料阻挡气缸上升,顶升气缸下降
/// 提升伺服回原点，升降伺服回原点
/// </summary>
FR_01_StopCylinderMove = 10001,
FR_01_BatchAxisHome = 10001,
/// <summary>
/// 升降轴托盘气缸后退
/// 然后提升伺服下降到P2点，升降伺服上升到待机点
/// </summary>
FR_03_TrayLocation_After=10003,
FR_03_BatchAxisToP2 = 10003,
/// <summary>
/// 定位气缸下降
/// 放开定位气缸
/// </summary>
FR_04_LocationCylinder_Down = 10004,
/// <summary>
/// 伺服原点返回
/// 顶升气缸下降
/// </summary>
FR_05_AxisHomeMove =10005,
FR_05_TopCylinderDown = 10005,
/// <summary>
/// 伺服到P1点
/// 提升伺服在上升到P1点
/// </summary>
FR_06_AxisToP1=10006,
FR_06_BatchAxisToP1 = 10006,
/// <summary>
///上料装置：上料横移机构上升SOL
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!