Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 30029a9c
全部展开
内嵌 并排
正在显示 7 个修改的文件 包含 34 行增加 和 29 行删除
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -484,7 +484,7 @@ namespace OnlineStore.AssemblyLine ...@@ -484,7 +484,7 @@ namespace OnlineStore.AssemblyLine
private void btnBStopDown_Click(object sender, EventArgs e) private void btnBStopDown_Click(object sender, EventArgs e)
{ {
BtnMove(btnBStopDown, "缓冲阻挡下降", "缓冲阻挡上升", IO_Type.SL_Buffer_StopDown); BtnMove(btnBStopDown, "SL缓冲阻挡下降", "SL缓冲阻挡上升", IO_Type.SL_Buffer_StopDown);
} }
private void btnBP1_Click(object sender, EventArgs e) private void btnBP1_Click(object sender, EventArgs e)
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -141,7 +141,7 @@ ...@@ -141,7 +141,7 @@
this.groupBox2.Controls.Add(this.btnCopyLog); this.groupBox2.Controls.Add(this.btnCopyLog);
this.groupBox2.Location = new System.Drawing.Point(460, 4); this.groupBox2.Location = new System.Drawing.Point(460, 4);
this.groupBox2.Name = "groupBox2"; this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(860, 75); this.groupBox2.Size = new System.Drawing.Size(860, 71);
this.groupBox2.TabIndex = 196; this.groupBox2.TabIndex = 196;
this.groupBox2.TabStop = false; this.groupBox2.TabStop = false;
this.groupBox2.Text = "状态信息"; this.groupBox2.Text = "状态信息";
...@@ -151,7 +151,7 @@ ...@@ -151,7 +151,7 @@
this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnTrayInfo.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnTrayInfo.BackColor = System.Drawing.Color.White; this.btnTrayInfo.BackColor = System.Drawing.Color.White;
this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnTrayInfo.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnTrayInfo.Location = new System.Drawing.Point(445, 26); this.btnTrayInfo.Location = new System.Drawing.Point(445, 13);
this.btnTrayInfo.Name = "btnTrayInfo"; this.btnTrayInfo.Name = "btnTrayInfo";
this.btnTrayInfo.Size = new System.Drawing.Size(105, 35); this.btnTrayInfo.Size = new System.Drawing.Size(105, 35);
this.btnTrayInfo.TabIndex = 195; this.btnTrayInfo.TabIndex = 195;
...@@ -163,7 +163,7 @@ ...@@ -163,7 +163,7 @@
// //
this.lblCID.AutoSize = true; this.lblCID.AutoSize = true;
this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.lblCID.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCID.Location = new System.Drawing.Point(19, 34); this.lblCID.Location = new System.Drawing.Point(19, 25);
this.lblCID.Name = "lblCID"; this.lblCID.Name = "lblCID";
this.lblCID.Size = new System.Drawing.Size(33, 20); this.lblCID.Size = new System.Drawing.Size(33, 20);
this.lblCID.TabIndex = 95; this.lblCID.TabIndex = 95;
...@@ -173,7 +173,7 @@ ...@@ -173,7 +173,7 @@
// //
this.chbAutoRun.AutoSize = true; this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chbAutoRun.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbAutoRun.Location = new System.Drawing.Point(137, 32); this.chbAutoRun.Location = new System.Drawing.Point(137, 23);
this.chbAutoRun.Name = "chbAutoRun"; this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(140, 24); this.chbAutoRun.Size = new System.Drawing.Size(140, 24);
this.chbAutoRun.TabIndex = 94; this.chbAutoRun.TabIndex = 94;
...@@ -186,7 +186,7 @@ ...@@ -186,7 +186,7 @@
this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.chkDebug.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.chkDebug.AutoSize = true; this.chkDebug.AutoSize = true;
this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.chkDebug.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chkDebug.Location = new System.Drawing.Point(781, 31); this.chkDebug.Location = new System.Drawing.Point(781, 18);
this.chkDebug.Name = "chkDebug"; this.chkDebug.Name = "chkDebug";
this.chkDebug.Size = new System.Drawing.Size(72, 24); this.chkDebug.Size = new System.Drawing.Size(72, 24);
this.chkDebug.TabIndex = 194; this.chkDebug.TabIndex = 194;
...@@ -198,7 +198,7 @@ ...@@ -198,7 +198,7 @@
this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnClearLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnClearLog.BackColor = System.Drawing.Color.White; this.btnClearLog.BackColor = System.Drawing.Color.White;
this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnClearLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnClearLog.Location = new System.Drawing.Point(669, 26); this.btnClearLog.Location = new System.Drawing.Point(669, 13);
this.btnClearLog.Name = "btnClearLog"; this.btnClearLog.Name = "btnClearLog";
this.btnClearLog.Size = new System.Drawing.Size(105, 35); this.btnClearLog.Size = new System.Drawing.Size(105, 35);
this.btnClearLog.TabIndex = 190; this.btnClearLog.TabIndex = 190;
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); this.btnCopyLog.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
this.btnCopyLog.BackColor = System.Drawing.Color.White; this.btnCopyLog.BackColor = System.Drawing.Color.White;
this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnCopyLog.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCopyLog.Location = new System.Drawing.Point(557, 26); this.btnCopyLog.Location = new System.Drawing.Point(557, 13);
this.btnCopyLog.Name = "btnCopyLog"; this.btnCopyLog.Name = "btnCopyLog";
this.btnCopyLog.Size = new System.Drawing.Size(105, 35); this.btnCopyLog.Size = new System.Drawing.Size(105, 35);
this.btnCopyLog.TabIndex = 191; this.btnCopyLog.TabIndex = 191;
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -108,7 +108,7 @@ namespace OnlineStore.DeviceLibrary
//CylinderMove(MoveInfo, IO_Type.SL_OutTopCylinder_Up, IO_Type.SL_OutTopCylinder_Down); //CylinderMove(MoveInfo, IO_Type.SL_OutTopCylinder_Up, IO_Type.SL_OutTopCylinder_Down);
//阻挡上升 //阻挡上升
IOMove(IO_Type.SL_Entry_StopDown, 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_Buffer_StopDown, IO_VALUE.HIGH);
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW); IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
if (Config.SidesWayNum <= 0) if (Config.SidesWayNum <= 0)
{ {
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -898,10 +898,15 @@ namespace OnlineStore.DeviceLibrary ...@@ -898,10 +898,15 @@ namespace OnlineStore.DeviceLibrary
{ {
//此托盘是紧急出料盘，需要通过料架出库 //此托盘是紧急出料盘，需要通过料架出库
bool debugNeed = IsDebug && runStatus >= LineRunStatus.Runing; bool debugNeed = IsDebug && runStatus >= LineRunStatus.Runing;
if (info.PosId.Equals(""))
{
param = new InOutParam(trayNum, "紧急出料测试", "1#AC1_3_2", 12, 7);
}
bool isJinji = info.EmergencyOut && info.IsFull && runStatus >= LineRunStatus.Runing; bool isJinji = info.EmergencyOut && info.IsFull && runStatus >= LineRunStatus.Runing;
if (debugNeed || isJinji ) if (debugNeed || isJinji )
{ {
if (checkAndMove) if (checkAndMove)
{ {
SecondMoveInfo.MoveParam = param; SecondMoveInfo.MoveParam = param;
...@@ -909,11 +914,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -909,11 +914,11 @@ namespace OnlineStore.DeviceLibrary
//判断是否有料架，是否可以出库 //判断是否有料架，是否可以出库
if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.SL_Location_Check).Equals(IO_VALUE.LOW))
{ {
LogUtil.error(Name+" 【" + info.ToStr() + "】需要出库，但是无料架暂不处理",DeviceID+16); LogUtil.error(Name+" 【" + info.ToStr() + "】需要出库，定位工位无料架，暂不处理",DeviceID+16);
} }
else if (OutStoreHeight < 0) else if (OutStoreHeight < 0)
{ {
LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，但是料架没准备好暂不处理", DeviceID + 17); LogUtil.error(Name + " 【" + info.ToStr() + "】需要出库，料架未准备好，暂不处理", DeviceID + 17);
} }
else else
{ {
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
...@@ -87,9 +87,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -87,9 +87,9 @@ namespace OnlineStore.DeviceLibrary
else if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.HIGH)) else if (IOValue(IO_Type.SL_Stop_Check).Equals(IO_VALUE.HIGH))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_03_LineStart); MoveInfo.NextMoveStep(LineMoveStep.FI_03_LineStart);
OutLog("准备出库料架： " + MoveInfo.SLog + " 阻挡工位检测有料架，进料阻挡上升，缓冲阻挡下降，流水线转动 1000"); OutLog("准备出库料架： " + MoveInfo.SLog + " 阻挡工位检测有料架，进料阻挡下降，缓冲阻挡上升，流水线转动 1000");
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH);//进料阻挡上升 IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.HIGH);//进料阻挡下降
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡下降 IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.LOW);//缓冲阻挡上升
IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
//等待指定时间 //等待指定时间
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
...@@ -98,7 +98,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -98,7 +98,7 @@ namespace OnlineStore.DeviceLibrary
else if (IOValue(IO_Type.SL_Entry_Check).Equals(IO_VALUE.HIGH)) else if (IOValue(IO_Type.SL_Entry_Check).Equals(IO_VALUE.HIGH))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_03_LineStart); MoveInfo.NextMoveStep(LineMoveStep.FI_03_LineStart);
OutLog("准备出库料架： " + MoveInfo.SLog + " 进料口检测有料架，进料阻挡下降，缓冲阻挡上升，流水线转动 1000"); OutLog("准备出库料架： " + MoveInfo.SLog + " 进料口检测有料架，进料阻挡上升，缓冲阻挡下降，流水线转动 1000");
IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);//进料阻挡上升 IOMove(IO_Type.SL_Entry_StopDown, IO_VALUE.LOW);//进料阻挡上升
IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH);//缓冲阻挡下降 IOMove(IO_Type.SL_Buffer_StopDown, IO_VALUE.HIGH);//缓冲阻挡下降
IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_Line_Run, IO_VALUE.HIGH);
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -728,20 +728,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -728,20 +728,20 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
///出料检测： 工位检测信号，定位气缸上升 ///出料检测： 工位检测信号，定位气缸上升
/// </summary> /// </summary>
FO_05_LocationCylinder_Up , FO_05_LocationCylinder_Up= 12005,
/// <summary> /// <summary>
/// 出料检测：提升轴下降到位P2 /// 出料检测：提升轴下降到位P2
/// </summary> /// </summary>
FO_06_BatchAxisToP2 , FO_06_BatchAxisToP2 = 12006,
/// <summary> /// <summary>
/// 出料检测：升降盘定位气缸前进 /// 出料检测：升降盘定位气缸前进
/// </summary> /// </summary>
FO_07_TrayLocation_Before, FO_07_TrayLocation_Before= 12007,
/// <summary> /// <summary>
/// 出料检测：上料轴开始慢速上升到P3点 /// 出料检测：上料轴开始慢速上升到P3点
/// </summary> /// </summary>
FO_08_AxisUpMove, FO_08_AxisUpMove= 12008,
/// <summary> /// <summary>
/// 紧急出料移栽：上料轴下降指定的高度，同时升降轴回待机点 /// 紧急出料移栽：上料轴下降指定的高度，同时升降轴回待机点
...@@ -751,45 +751,45 @@ namespace OnlineStore.DeviceLibrary ...@@ -751,45 +751,45 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 紧急出料移栽：上料横移机构取料端 /// 紧急出料移栽：上料横移机构取料端
/// /// </summary> /// /// </summary>
FO_212_MoveCylinder_Take, FO_212_MoveCylinder_Take = 12212,
/// <summary> /// <summary>
/// 紧急出料移栽：上料横移机构下降 /// 紧急出料移栽：上料横移机构下降
/// /// </summary> /// /// </summary>
FO_213_MoveCylinder_Down, FO_213_MoveCylinder_Down = 12213,
/// <summary> /// <summary>
/// 紧急出料移栽：升降伺服下降到指定位置 /// 紧急出料移栽：升降伺服下降到指定位置
/// /// </summary> /// /// </summary>
FO_214_UpdownAxisToP2, FO_214_UpdownAxisToP2 = 12214,
/// <summary> /// <summary>
/// 紧急出料移栽：上料气缸夹紧 /// 紧急出料移栽：上料气缸夹紧
/// /// </summary> /// /// </summary>
FO_215_MoveCylinder_Tighten, FO_215_MoveCylinder_Tighten = 12215,
/// <summary> /// <summary>
/// 紧急出料移栽：升降伺服到P1 /// 紧急出料移栽：升降伺服到P1
/// /// </summary> /// /// </summary>
FO_216_UpdownAxisToP1, FO_216_UpdownAxisToP1 = 12216,
/// <summary> /// <summary>
/// 紧急出料移栽：上料横移机构上升 /// 紧急出料移栽：上料横移机构上升
/// /// </summary> /// /// </summary>
FO_217_MoveCylinder_Up, FO_217_MoveCylinder_Up = 12217,
/// <summary> /// <summary>
/// 紧急出料移栽：上料横移机构到放料端 /// 紧急出料移栽：上料横移机构到放料端
/// /// </summary> /// /// </summary>
FO_218_MoveCylinder_Give, FO_218_MoveCylinder_Give = 12218,
/// <summary> /// <summary>
/// 料盘移栽：升降伺服到P3 /// 料盘移栽：升降伺服到P3
/// </summary> /// </summary>
FO_219_UpdownAxisToP3, FO_219_UpdownAxisToP3 = 12219,
/// <summary> /// <summary>
/// 料盘移栽：出料横移机构放松 /// 料盘移栽：出料横移机构放松
/// </summary> /// </summary>
FO_220_MoveCylinder_Slack, FO_220_MoveCylinder_Slack = 12220,
/// <summary> /// <summary>
/// 料盘移栽：升降伺服回P1 /// 料盘移栽：升降伺服回P1
/// </summary> /// </summary>
FO_221_UpdownAxisToP1, FO_221_UpdownAxisToP1 = 12221,
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!