Skip to content

孙克 / RC1250-AssemblyLine

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

灯状态修改

1 个父辈 8a4f38b7
全部展开
内嵌 并排
正在显示 13 个修改的文件 包含 88 行增加 和 65 行删除
source/AssemblyLineClient/App.config
...@@ -57,6 +57,7 @@ ...@@ -57,6 +57,7 @@
<add key ="NeedScanCode" value ="1"/> <add key ="NeedScanCode" value ="1"/>
<add key ="Agv_Log_Open" value ="0"/> <add key ="Agv_Log_Open" value ="0"/>
<add key ="MaxTrayNum" value ="30"/> <add key ="MaxTrayNum" value ="30"/>
<add key ="UseBuzzer" value ="0"/>
</appSettings> </appSettings>
<!-- <log4net> --> <!-- <log4net> -->
<!-- <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> --> <!-- <appender name="RollingLogFileAppender" type="log4net.Appender.RollingFileAppender"> -->
......
source/AssemblyLineClient/FrmLineStore.Designer.cs
...@@ -99,6 +99,7 @@ ...@@ -99,6 +99,7 @@
this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator(); this.toolStripSeparator8 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
this.timer1 = new System.Windows.Forms.Timer(this.components); this.timer1 = new System.Windows.Forms.Timer(this.components);
this.chbBuzzer = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout(); this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout(); this.tabPage1.SuspendLayout();
this.groupBox3.SuspendLayout(); this.groupBox3.SuspendLayout();
...@@ -308,6 +309,7 @@ ...@@ -308,6 +309,7 @@
// //
// groupBox2 // groupBox2
// //
this.groupBox2.Controls.Add(this.chbBuzzer);
this.groupBox2.Controls.Add(this.btnTrayInfo); this.groupBox2.Controls.Add(this.btnTrayInfo);
this.groupBox2.Controls.Add(this.chbAutoRun); this.groupBox2.Controls.Add(this.chbAutoRun);
this.groupBox2.Controls.Add(this.chkDebug); this.groupBox2.Controls.Add(this.chkDebug);
...@@ -347,7 +349,7 @@ ...@@ -347,7 +349,7 @@
// //
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(211, 25); this.chkDebug.Location = new System.Drawing.Point(158, 25);
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;
...@@ -764,6 +766,18 @@ ...@@ -764,6 +766,18 @@
this.timer1.Interval = 2000; this.timer1.Interval = 2000;
this.timer1.Tick += new System.EventHandler(this.timer1_Tick); this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
// //
// chbBuzzer
//
this.chbBuzzer.AutoSize = true;
this.chbBuzzer.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.chbBuzzer.Location = new System.Drawing.Point(244, 25);
this.chbBuzzer.Name = "chbBuzzer";
this.chbBuzzer.Size = new System.Drawing.Size(98, 24);
this.chbBuzzer.TabIndex = 196;
this.chbBuzzer.Text = "启用蜂鸣器";
this.chbBuzzer.UseVisualStyleBackColor = true;
this.chbBuzzer.CheckedChanged += new System.EventHandler(this.chbBuzzer_CheckedChanged);
//
// FrmLineStore // FrmLineStore
// //
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
...@@ -872,6 +886,7 @@ ...@@ -872,6 +886,7 @@
private System.Windows.Forms.ToolStripSeparator toolStripSeparator13; private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2; private System.Windows.Forms.ToolStripMenuItem toolStripMenuItem2;
private System.Windows.Forms.CheckBox chbAGV; private System.Windows.Forms.CheckBox chbAGV;
private System.Windows.Forms.CheckBox chbBuzzer;
} }
} }
source/AssemblyLineClient/记录.txt
...@@ -264,11 +264,12 @@ PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=800 ...@@ -264,11 +264,12 @@ PRO,0,移栽上下轴流水线取放料详细位置P2,UpDownP2DetialList,0X0=800
问题：入料1 9:36，料架送走以后又发needLeave B20，B26 问题：入料1 9:36，料架送走以后又发needLeave B20，B26
托盘号增加一致性判断，不一致时打印日志并显示文字。 托盘号增加一致性判断，不一致时打印日志并显示文字。
托盘卡时，等待StopChecck2的报警不显示红灯 20200307
灯状态修改：启动流水线绿灯常亮，有出入库是绿灯闪烁
复位过程中黄灯闪烁，信号超时报警黄灯闪烁
急停或无气压报警 红灯闪烁，蜂鸣器亮
上料模块夹走料盘后，需要判断信号是否消失
......
source/Common/Setting_Init.cs
...@@ -86,5 +86,7 @@ namespace OnlineStore.Common ...@@ -86,5 +86,7 @@ namespace OnlineStore.Common
public static string DefaultTrayNum = "DefaultTrayNum"; public static string DefaultTrayNum = "DefaultTrayNum";
public static string MaxTrayNum = "MaxTrayNum"; public static string MaxTrayNum = "MaxTrayNum";
public static string UseBuzzer = "UseBuzzer";
} }
} }
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -319,7 +319,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -319,7 +319,7 @@ namespace OnlineStore.DeviceLibrary
TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样"; TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样";
LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样"); LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，连续两个托盘号一样");
} }
else if (TrayManager.CheckIsRightNum(currTrayNum, preTrayNum)) else if (!TrayManager.CheckIsRightNum(currTrayNum, preTrayNum))
{ {
TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续"; TrayManager.TrayErrorMsg = DateTime.Now.ToLongTimeString() + " " + Name + "托盘号出现错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续";
LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续"); LogUtil.error(Name + "托盘号错乱：上一个托盘[" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]，托盘号不连续");
...@@ -440,19 +440,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -440,19 +440,10 @@ namespace OnlineStore.DeviceLibrary
//一分钟还未检测到 //一分钟还未检测到
if (span.TotalSeconds > LineManager.Config.IOSingle_TimerOut && NoAlarm()) if (span.TotalSeconds > LineManager.Config.IOSingle_TimerOut && NoAlarm())
{ {
if (IsLowAlarm(moveInfo)) ConfigIO io = baseConfig.getWaitIO(wait.IoType);
{ WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] 等待" + NotOkMsg + " 超时";
ConfigIO io = baseConfig.getWaitIO(wait.IoType); Alarm(LineAlarmType.IoSingleTimeOut);
WarnMsg = "提示" + moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] 等待" + NotOkMsg + " 超时"; LogUtil.error(MoveInfo.Name + WarnMsg, DeviceID + 13);
LogUtil.error(MoveInfo.Name + WarnMsg, DeviceID + 13, 30);
}
else
{
ConfigIO io = baseConfig.getWaitIO(wait.IoType);
WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "] 等待" + NotOkMsg + " 超时";
Alarm(LineAlarmType.IoSingleTimeOut);
LogUtil.error(MoveInfo.Name + WarnMsg, DeviceID + 13);
}
} }
else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2) else if (rwSpan.TotalSeconds > 5 && span.TotalSeconds > 6 && span.TotalSeconds < LineManager.Config.IOSingle_TimerOut * 2)
{ {
...@@ -519,15 +510,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -519,15 +510,18 @@ namespace OnlineStore.DeviceLibrary
{ {
WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待" + NotOkMsg WarnMsg = moveInfo.Name + "[" + moveInfo.MoveType + "][" + moveInfo.MoveStep + "]等待" + NotOkMsg
+ "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒"; + "超时[" + Math.Round(span.TotalSeconds, 1) + "]秒";
if (IsLowAlarm(moveInfo) && span.TotalSeconds < moveInfo.TimeOutSeconds * 3) int ms = 10;
if (IsLowAlarm(moveInfo))
{ {
LogUtil.error(WarnMsg, DeviceID + 15,30); ms = 30;
} }
else ms = (int)(MoveInfo.TimeOutSeconds / span.TotalSeconds);
if (ms > 120)
{ {
LogUtil.error(WarnMsg, DeviceID + 15); ms = 120;
Alarm(LineAlarmType.IoSingleTimeOut);
} }
LogUtil.error(WarnMsg, DeviceID + 15, ms);
Alarm(LineAlarmType.IoSingleTimeOut);
} }
} }
catch (Exception ex) catch (Exception ex)
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -632,14 +632,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -632,14 +632,20 @@ namespace OnlineStore.DeviceLibrary
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_17_UpdownAxisToP1)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_17_UpdownAxisToP1))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_17_BatchAxisToP3); MoveInfo.NextMoveStep(LineMoveStep.FI_18_WaitNoLocationCheck);
InLog("料盘移栽" + MoveInfo.SLog + "：等待 SL_AxisLocationCheck=LOW");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_AxisLocationCheck, IO_VALUE.LOW));
}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_18_WaitNoLocationCheck))
{
MoveInfo.NextMoveStep(LineMoveStep.FI_19_BatchAxisToP3);
InLog("料盘移栽" + MoveInfo.SLog + "：提升伺服运动到P3，横移气缸上升"); InLog("料盘移栽" + MoveInfo.SLog + "：提升伺服运动到P3，横移气缸上升");
CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up); CylinderMove(null, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
BatchAxisToP3(); BatchAxisToP3();
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_17_BatchAxisToP3)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_19_BatchAxisToP3))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_18_SaveSize); MoveInfo.NextMoveStep(LineMoveStep.FI_20_SaveSize);
LastHeight = GetHeight(); LastHeight = GetHeight();
LastWidth = GetWidth(); LastWidth = GetWidth();
...@@ -665,24 +671,24 @@ namespace OnlineStore.DeviceLibrary ...@@ -665,24 +671,24 @@ namespace OnlineStore.DeviceLibrary
InLog("料盘移栽" + MoveInfo.SLog + "：记录 高度【" + LastHeight + "】宽度【" + LastWidth + "】"); InLog("料盘移栽" + MoveInfo.SLog + "：记录 高度【" + LastHeight + "】宽度【" + LastWidth + "】");
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_18_SaveSize)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_20_SaveSize))
{ {
if (MoveCylineCanTakeOrGive()) if (MoveCylineCanTakeOrGive())
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_19_CylinderGive); MoveInfo.NextMoveStep(LineMoveStep.FI_21_CylinderGive);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移气缸放料SOL"); InLog("料盘移栽" + MoveInfo.SLog + "：上料横移气缸放料SOL");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Take, IO_Type.SL_MoveCylinder_Give);
} }
else else
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_18_SaveSize); MoveInfo.NextMoveStep(LineMoveStep.FI_20_SaveSize);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移气缸放料SOL前先上升横移气缸"); InLog("料盘移栽" + MoveInfo.SLog + "：上料横移气缸放料SOL前先上升横移气缸");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_19_CylinderGive)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_21_CylinderGive))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_20_WaitTray); MoveInfo.NextMoveStep(LineMoveStep.FI_22_WaitTray);
int targetPositon = Config.GetUpdownP2Detial(LastHeight, LastWidth); int targetPositon = Config.GetUpdownP2Detial(LastHeight, LastWidth);
string log = "：移栽伺服下降到P2:" + targetPositon; string log = "：移栽伺服下降到P2:" + targetPositon;
UpdownAxis.AbsMove(MoveInfo, targetPositon, Config.UpdownAxis_P2Speed); UpdownAxis.AbsMove(MoveInfo, targetPositon, Config.UpdownAxis_P2Speed);
...@@ -690,7 +696,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -690,7 +696,7 @@ namespace OnlineStore.DeviceLibrary
//TODO 此处需要等待空托盘 //TODO 此处需要等待空托盘
if (MoveInfo.ShelfNoTray.Equals(false) && isScan) if (MoveInfo.ShelfNoTray.Equals(false) && isScan)
{ {
InLog("料盘移栽" + MoveInfo.SLog + "：等待空托盘到达 "+ log + "，预扫码"); InLog("料盘移栽" + MoveInfo.SLog + "：等待空托盘到达 " + log + "，预扫码");
//还有料盘，直接扫码 //还有料盘，直接扫码
NextCodeList = new List<string>(); NextCodeList = new List<string>();
try try
...@@ -698,10 +704,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -698,10 +704,10 @@ namespace OnlineStore.DeviceLibrary
Task<List<string>> scanTask = Task.Factory.StartNew(delegate Task<List<string>> scanTask = Task.Factory.StartNew(delegate
{ {
NextCodeList = CodeManager.CameraScan(Config.GetCameraList(),Name); NextCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name);
if (NextCodeList.Count <= 0) if (NextCodeList.Count <= 0)
{ {
NextCodeList = CodeManager.CameraScan(Config.GetCameraList(),Name); NextCodeList = CodeManager.CameraScan(Config.GetCameraList(), Name);
} }
return NextCodeList; return NextCodeList;
}); });
...@@ -718,7 +724,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -718,7 +724,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_20_WaitTray))//TODO else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_22_WaitTray))//TODO
{ {
if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_11_CodeRember)) if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MO_11_CodeRember))
{ {
...@@ -727,7 +733,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -727,7 +733,7 @@ namespace OnlineStore.DeviceLibrary
//InLog("料盘移栽" + MoveInfo.SLog + "：移栽伺服下降到P2:" + targetPositon + ",托盘号【" + currTrayNum + "】，获取库位号，更新托盘信息"); //InLog("料盘移栽" + MoveInfo.SLog + "：移栽伺服下降到P2:" + targetPositon + ",托盘号【" + currTrayNum + "】，获取库位号，更新托盘信息");
//UpdownAxis.AbsMove(MoveInfo, targetPositon, Config.UpdownAxis_P2Speed); //UpdownAxis.AbsMove(MoveInfo, targetPositon, Config.UpdownAxis_P2Speed);
MoveInfo.NextMoveStep(LineMoveStep.FI_22_CylinderDown); MoveInfo.NextMoveStep(LineMoveStep.FI_24_CylinderDown);
InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降， 托盘号【" + currTrayNum + "】，获取库位号，更新托盘信息"); InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降， 托盘号【" + currTrayNum + "】，获取库位号，更新托盘信息");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down);
...@@ -769,22 +775,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -769,22 +775,22 @@ namespace OnlineStore.DeviceLibrary
// InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降，"); // InLog("料盘移栽" + MoveInfo.SLog + "：上料机构下降，");
// CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down); // CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Up, IO_Type.SL_MoveCylinder_Down);
//} //}
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_22_CylinderDown)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_CylinderDown))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_23_CylinderRelax); MoveInfo.NextMoveStep(LineMoveStep.FI_25_CylinderRelax);
InLog("料盘移栽" + MoveInfo.SLog + "：上料气缸放松"); InLog("料盘移栽" + MoveInfo.SLog + "：上料气缸放松");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Tighten, IO_Type.SL_MoveCylinder_Slack); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Tighten, IO_Type.SL_MoveCylinder_Slack);
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_23_CylinderRelax)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_CylinderRelax))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_24_CylinderUp); MoveInfo.NextMoveStep(LineMoveStep.FI_26_CylinderUp);
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升 "); InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升 ");
CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up); CylinderMove(MoveInfo, IO_Type.SL_MoveCylinder_Down, IO_Type.SL_MoveCylinder_Up);
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_24_CylinderUp)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_26_CylinderUp))
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_25_UpDownAxisToP1); MoveInfo.NextMoveStep(LineMoveStep.FI_27_UpDownAxisToP1);
InLog("料盘移栽" + MoveInfo.SLog + "：升降伺服到P1点"); InLog("料盘移栽" + MoveInfo.SLog + "：升降伺服到P1点");
UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed); UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
if (Config.SidesWayNum > 0) if (Config.SidesWayNum > 0)
...@@ -799,7 +805,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -799,7 +805,7 @@ namespace OnlineStore.DeviceLibrary
} }
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_25_UpDownAxisToP1)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.FI_27_UpDownAxisToP1))
{ {
InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升已到位，托盘开始放行 "); InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升已到位，托盘开始放行 ");
SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_MoveOk); SecondMoveInfo.NextMoveStep(LineMoveStep.MO_12_MoveOk);
...@@ -1122,7 +1128,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1122,7 +1128,7 @@ namespace OnlineStore.DeviceLibrary
if (trayCanUse && runStatus.Equals(LineRunStatus.Busy) && MoveInfo.MoveType.Equals(LineMoveType.InStore)) if (trayCanUse && runStatus.Equals(LineRunStatus.Busy) && MoveInfo.MoveType.Equals(LineMoveType.InStore))
{ {
//入料执行中， 且需要空托盘 //入料执行中， 且需要空托盘
if (MoveInfo.MoveStep .Equals(LineMoveStep.FI_20_WaitTray)&&MoveInfo.IsInWait.Equals(false)) if (MoveInfo.MoveStep .Equals(LineMoveStep.FI_22_WaitTray)&&MoveInfo.IsInWait.Equals(false))
//if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray) //if (MoveInfo.MoveStep >= LineMoveStep.FI_11_CylinderUp && MoveInfo.MoveStep <= LineMoveStep.FI_20_WaitTray)
{ {
if (NeedSaveParam) if (NeedSaveParam)
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -415,11 +415,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -415,11 +415,11 @@ namespace OnlineStore.DeviceLibrary
sdIsInprocess = false; sdIsInprocess = false;
return; return;
} }
if (SW23_MoveInfo.MoveType.Equals(LineMoveType.None) && SW23WaitTrayNum > 0) if (SW23_MoveInfo.MoveType.Equals(LineMoveType.None) && SW23WaitTrayNum >= 0)
{ {
Equip_TrayPEndEvent(2, SW23WaitTrayNum); Equip_TrayPEndEvent(2, SW23WaitTrayNum);
} }
if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None) && SW41WaitTrayNum > 0) if (SW41_MoveInfo.MoveType.Equals(LineMoveType.None) && SW41WaitTrayNum >= 0)
{ {
Equip_TrayPEndEvent(4, SW41WaitTrayNum); Equip_TrayPEndEvent(4, SW41WaitTrayNum);
} }
......
source/DeviceLibrary/assemblymanager/ALineManager.cs
...@@ -13,8 +13,8 @@ using System.Windows.Forms; ...@@ -13,8 +13,8 @@ using System.Windows.Forms;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
public class LineManager public class LineManager
{ {
public static bool UseBuzzer = ConfigAppSettings.GetIntValue(Setting_Init.UseBuzzer).Equals(1);
private static bool isInit = false; private static bool isInit = false;
public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals(""); public static bool IsConnectServer = !ConfigAppSettings.GetValue(Setting_Init.http_server).Equals("");
......
source/DeviceLibrary/model/KTK_Store.cs
...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -177,7 +177,7 @@ namespace OnlineStore.DeviceLibrary
/// 没有严重的报警 /// 没有严重的报警
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
protected bool NoErrorAlarm() internal bool NoErrorAlarm()
{ {
if (isInSuddenDown || isNoAirCheck) if (isInSuddenDown || isNoAirCheck)
{ {
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -645,26 +645,30 @@ namespace OnlineStore.DeviceLibrary ...@@ -645,26 +645,30 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
FI_16_CylinderTighten = 11016, FI_16_CylinderTighten = 11016,
/// <summary> /// <summary>
/// 料盘移栽：上料横移机构上升，同时伺服运动到P3 /// 料盘移栽：升降伺服到P1点
/// </summary>
FI_17_UpdownAxisToP1,
/// <summary>
/// 料盘移栽：等待没有伺服料盘检测信号
/// </summary> /// </summary>
FI_17_UpdownAxisToP1 , FI_18_WaitNoLocationCheck,
/// <summary> /// <summary>
/// 料盘移栽：批量轴到P3点，检测是否有料盘 /// 料盘移栽：批量轴到P3点，检测是否有料盘
/// </summary> /// </summary>
FI_17_BatchAxisToP3, FI_19_BatchAxisToP3,
/// <summary> /// <summary>
/// 料盘移栽：记录高度尺寸 /// 料盘移栽：记录高度尺寸
/// </summary> /// </summary>
FI_18_SaveSize , FI_20_SaveSize ,
/// <summary> /// <summary>
/// 料盘移栽： 上料横移气缸放料SOL /// 料盘移栽： 上料横移气缸放料SOL
/// </summary> /// </summary>
FI_19_CylinderGive , FI_21_CylinderGive ,
/// <summary> /// <summary>
/// 料盘移栽：等待空托盘到达，移栽伺服下降到P2，并预扫码 /// 料盘移栽：等待空托盘到达，移栽伺服下降到P2，并预扫码
/// </summary> /// </summary>
FI_20_WaitTray, FI_22_WaitTray,
///// <summary> ///// <summary>
///// 料盘移栽：移栽伺服下降到P2 ///// 料盘移栽：移栽伺服下降到P2
///// </summary> ///// </summary>
...@@ -672,20 +676,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -672,20 +676,20 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 料盘移栽： 上料机构下降 /// 料盘移栽： 上料机构下降
/// </summary> /// </summary>
FI_22_CylinderDown, FI_24_CylinderDown,
/// <summary> /// <summary>
/// 料盘移栽： 上料气缸放松 /// 料盘移栽： 上料气缸放松
/// </summary> /// </summary>
FI_23_CylinderRelax , FI_25_CylinderRelax ,
/// <summary> /// <summary>
/// 料盘移栽：上料横移机构上升，定位或者顶升可以先下降 /// 料盘移栽：上料横移机构上升，定位或者顶升可以先下降
/// </summary> /// </summary>
FI_24_CylinderUp, FI_26_CylinderUp,
/// <summary> /// <summary>
/// 料盘移栽：升降伺服到P1点 /// 料盘移栽：升降伺服到P1点
/// </summary> /// </summary>
FI_25_UpDownAxisToP1, FI_27_UpDownAxisToP1,
///// <summary> ///// <summary>
///// 料盘移栽：上料横移机构到取料端 ///// 料盘移栽：上料横移机构到取料端
///// </summary> ///// </summary>
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -51,18 +51,18 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -51,18 +51,18 @@ namespace OnlineStore.LoadCSVLibrary
/// DI 0 气压检测 Airpressure_Check 4 气压检测 X05 DI-05 /// DI 0 气压检测 Airpressure_Check 4 气压检测 X05 DI-05
/// </summary> /// </summary>
public static string Airpressure_Check = "Airpressure_Check"; public static string Airpressure_Check = "Airpressure_Check";
/// <summary> /// <summary>
/// DO 0 待机状态（指示灯） AutoRun_HddLed 24 待机状态（指示灯） Y01 DO-01 /// DO 0 黄灯 待机状态（指示灯） AutoRun_HddLed 24 待机状态（指示灯） Y01 DO-01
/// </summary> /// </summary>
public static string AutoRun_HddLed = "AutoRun_HddLed"; public static string AutoRun_HddLed = "AutoRun_HddLed";
/// <summary> /// <summary>
/// DO 0 运行状态（指示灯） RunSign_HddLed 25 运行状态（指示灯） Y02 DO-02 /// DO 0 绿灯 运行状态（指示灯） RunSign_HddLed 25 运行状态（指示灯） Y02 DO-02
/// </summary> /// </summary>
public static string RunSign_HddLed = "RunSign_HddLed"; public static string RunSign_HddLed = "RunSign_HddLed";
/// <summary> /// <summary>
/// DO 0 故障状态（指示灯） Alarm_HddLed 26 故障状态（指示灯） Y03 DO-03 /// DO 0 红灯 故障状态（指示灯） Alarm_HddLed 26 故障状态（指示灯） Y03 DO-03
/// </summary> /// </summary>
public static string Alarm_HddLed = "Alarm_HddLed"; public static string Alarm_HddLed = "Alarm_HddLed";
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!