Skip to content

孙克 / RC1250-AssemblyLine

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

增加分流2功能

1 个父辈 ea3d159f
全部展开
内嵌 并排
正在显示 10 个修改的文件 包含 214 行增加 和 29 行删除
RC1250-AssemblyLine.sln
......@@ -15,8 +15,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLineClient", "sourc
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AssemblyLineSystem", "source\AssemblyLineSystem\AssemblyLineSystem.csproj", "{7DE7A34B-77A5-465B-985B-1219FE0A9615}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ABBRobotTest", "ABBRobotTest\ABBRobotTest.csproj", "{C147236C-D1E7-4CD1-9344-79C948110F8F}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
......@@ -47,10 +45,6 @@ Global
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DE7A34B-77A5-465B-985B-1219FE0A9615}.Release|Any CPU.Build.0 = Release|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C147236C-D1E7-4CD1-9344-79C948110F8F}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
source/AssemblyLineClient/FrmIOStatus.cs
......@@ -409,5 +409,41 @@ namespace OnlineStore.AssemblyLine
IOManager.IOMove(IO_Type.Shunt_MotorRun1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt_MotorRun2, IO_VALUE.LOW);
}
private void btnShunt2Stop1_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Stop1, "分流2-前端阻挡下降", "分流2-前端阻挡上升", IO_Type.Shunt2_StopDown1_Front);
}
private void btnShunt2Stop2_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Stop2, "分流2-后端阻挡下降", "分流2-后端阻挡上升", IO_Type.Shunt2_StopDown2_Back);
}
private void btnShunt2updown1_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2updown1, "分流2-机构1上升", "分流2-机构1下降", IO_Type.Shunt2_TopCylinder_Down1, IO_Type.Shunt2_TopCylinder_Up1);
}
private void btnShunt2updown2_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2updown2, "分流2-机构1上升", "分流2-机构1下降", IO_Type.Shunt2_TopCylinder_Down2, IO_Type.Shunt2_TopCylinder_Up2);
}
private void btnShunt2Run1_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Run1, "分流2-机构1皮带运行", "分流2-机构1皮带停止", IO_Type.Shunt2_MotorRun1);
}
private void btnShunt2Run2_Click(object sender, EventArgs e)
{
BtnMove(btnShunt2Run2, "分流2-机构2皮带运行", "分流2-机构2皮带停止", IO_Type.Shunt2_MotorRun2);
}
private void btnShunt2Close_Click(object sender, EventArgs e)
{
IOManager.IOMove(IO_Type.Shunt2_StopDown1_Front, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_StopDown2_Back, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Down1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Up1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Down2, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_TopCylinder_Up2, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_MotorRun1, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Shunt2_MotorRun2, IO_VALUE.LOW);
}
}
}
source/AssemblyLineClient/FrmLineStore.cs
......@@ -125,6 +125,22 @@ namespace OnlineStore.AssemblyLine
{
cmbTray.Items.Add(i.ToString());
}
if (autoValue.Equals(1))
{
开机自动启动ToolStripMenuItem.Text = gouStr + " 开机自动启动";
}
else
{
开机自动启动ToolStripMenuItem.Text = "开机自动启动";
}
if (LineManager.UseBuzzer)
{
启用蜂鸣器ToolStripMenuItem.Text =gouStr+ "启用蜂鸣器";
}
else
{
启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
}
cmbTrayType.SelectedIndex = 0;
cmbTray.SelectedIndex = 0;
LogUtil.logBox = this.logBox;
......@@ -436,11 +452,6 @@ namespace OnlineStore.AssemblyLine
LogUtil.ClearLog();
}
private void debug_enable_checkBox_CheckedChanged(object sender, EventArgs e)
{
LogUtil.debug_opened = chkDebug.Checked;
}
private void btnCopyLog_Click(object sender, EventArgs e)
{
Clipboard.SetDataObject(logBox.Text);
......@@ -488,7 +499,15 @@ namespace OnlineStore.AssemblyLine
//if (lineBean.lineStatus.Equals(LineStatus.StoreOnline) && lineBean.runStatus.Equals(LineRunStatus.Runing))
//{
// //canScanCode = lineBean.CanScanCode() ? "（可扫码入库）" : "（出库未完成，不可扫码入库）";
//}
if (AgvClient.CurrCancelState)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
lblStatus.Text = lineBean.GetRunStr() + canScanCode;
string time = LineManager.Line.alarmType.Equals(LineAlarmType.None) ? "" : LineManager.Line.LastAlarmTime.ToLongTimeString();
string warnMsg = LineManager.Line.WarnMsg.Equals("") ? "" : time+ LineManager.Line.WarnMsg + "\r\n";
......@@ -1000,7 +1019,7 @@ namespace OnlineStore.AssemblyLine
MessageBox.Show(lineBean.Name + "流水线未启动，无法复位");
return;
}
LogUtil.info(Name + "点击 分流模块复位 按钮复位");
LogUtil.info(Name + "点击 分流模块1复位 按钮复位");
lineBean.ShuntStop();
}
......@@ -1015,7 +1034,106 @@ namespace OnlineStore.AssemblyLine
return;
}
lineBean.DisableShunt = (chbShunt.Checked);
LogUtil.info("勾选 禁用分流横移功能：lineBean.DisableShunt =" + lineBean.DisableShunt);
LogUtil.info("勾选 禁用分流横移1功能：lineBean.DisableShunt =" + lineBean.DisableShunt);
}
private string gouStr = "✔";
private void 开机自动启动ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (开机自动启动ToolStripMenuItem.Text.Contains(gouStr))
{
ConfigAppSettings.SaveValue(Setting_Init.App_AutoRun, 0);
ManagerUtil.AutoRun(Application.ExecutablePath, false);
开机自动启动ToolStripMenuItem.Text = "开机自动启动";
}
else
{
ConfigAppSettings.SaveValue(Setting_Init.App_AutoRun, 1);
ManagerUtil.AutoRun(Application.ExecutablePath, true);
开机自动启动ToolStripMenuItem.Text = gouStr + "开机自动启动";
}
LogUtil.info(Name + " 点击：" + 开机自动启动ToolStripMenuItem.Text);
}
private void 启用蜂鸣器ToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = !启用蜂鸣器ToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(LineManager.UseBuzzer))
{
return;
}
LineManager.UseBuzzer = result;
ConfigAppSettings.SaveValue(Setting_Init.UseBuzzer, (LineManager.UseBuzzer ? 1 : 0));
if (result)
{
启用蜂鸣器ToolStripMenuItem.Text = gouStr + " 启用蜂鸣器";
}
else
{
启用蜂鸣器ToolStripMenuItem.Text = "启用蜂鸣器";
}
LogUtil.info(Name + " 点击：" + 启用蜂鸣器ToolStripMenuItem.Text);
}
private void btnShunt2Reset_Click(object sender, EventArgs e)
{
if (lineBean.runStatus.Equals(LineRunStatus.Wait))
{
MessageBox.Show(lineBean.Name + "流水线未启动，无法复位");
return;
}
LogUtil.info(Name + "点击 分流模块2复位 按钮复位");
lineBean.Shunt2Stop();
}
private void chbShunt2_CheckedChanged(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
if (chbShunt2.Checked.Equals(lineBean.DisableShunt2))
{
return;
}
lineBean.DisableShunt2 = (chbShunt2.Checked);
LogUtil.info("勾选 禁用分流横移2功能：lineBean.DisableShunt2 =" + lineBean.DisableShunt2);
}
private void aGVCancelStateToolStripMenuItem_Click(object sender, EventArgs e)
{
if (!LoadOk)
{
return;
}
bool result = !aGVCancelStateToolStripMenuItem.Text.Contains(gouStr);
if (result.Equals(AgvClient.CurrCancelState))
{
return;
}
AgvClient.SetCancelState(result);
//robot.XrayBean.OpenXLine = result;
if (result)
{
aGVCancelStateToolStripMenuItem.Text = gouStr + " AGV cancelState";
}
else
{
aGVCancelStateToolStripMenuItem.Text = "AGV cancelState";
}
LogUtil.info(Name + " 点击：" + aGVCancelStateToolStripMenuItem.Text);
}
}
}
source/AssemblyLineClient/记录.txt
20200825
入料模块获取库位号时不等待料串上升到位。
当是首盘料时，如果到达出料口4且空闲中，抓料到皮带线。
20200902
增加分流横移2，位置在进仓4-5，进仓14-15中间。
横移条件：
1，进仓，15,16,17,18 ，料仓入库
2. 紧急料，需要到出料四
3. 入库NG料，需要到出料四
4. 必须走皮带线3,皮带线4的出料
20200825
入料模块获取库位号时不等待料串上升到位。
当是首盘料时，如果到达出料口4且空闲中，抓料到皮带线。
20200817
紧急出料从入料NG口出
分盘料从入料4出
20200812
分流bug修改。
httpPost方法修改。
......
source/DeviceLibrary/assemblyLine/LineBean.cs
......@@ -66,7 +66,8 @@ namespace OnlineStore.DeviceLibrary
this.DeviceID = lineConfig.Id;
SW41_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-41");
SW23_MoveInfo = new LineMoveInfo(DeviceID, "横移轨道-23");
Shunt_MoveInfo = new LineMoveInfo(DeviceID, "分流横移");
Shunt_MoveInfo = new LineMoveInfo(DeviceID, "分流横移1");
Shunt2_MoveInfo = new LineMoveInfo(DeviceID, "分流横移2");
MoveInfo = new LineMoveInfo(DeviceID, "[流水线-Move] ");
Name = (" 流水线_" + Config.CID + " ").ToUpper();
......@@ -363,8 +364,11 @@ namespace OnlineStore.DeviceLibrary
//分流模块复位
ShuntStop();
Shunt2Stop();
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up1, IO_Type.Shunt_TopCylinder_Down1);
CylinderMove(MoveInfo, IO_Type.Shunt_TopCylinder_Up2, IO_Type.Shunt_TopCylinder_Down2);
CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up1, IO_Type.Shunt2_TopCylinder_Down1);
CylinderMove(MoveInfo, IO_Type.Shunt2_TopCylinder_Up2, IO_Type.Shunt2_TopCylinder_Down2);
}
public override bool Reset()
......@@ -464,6 +468,7 @@ namespace OnlineStore.DeviceLibrary
SideWayStop();
ShuntStop();
Shunt2Stop();
runStatus = LineRunStatus.Wait;
ledProcessTimer.Enabled = false;
......@@ -509,6 +514,7 @@ namespace OnlineStore.DeviceLibrary
SideWayStop();
ShuntStop();
Shunt2Stop();
foreach (EquipBase equip in this.AllEquipMap.Values)
{
if (equip.runStatus>LineRunStatus.Wait)
......@@ -815,6 +821,8 @@ namespace OnlineStore.DeviceLibrary
SideWayTimerProcess();
ShuntTimerProcess();
Shunt2TimerProcess();
}
catch (Exception ex)
{
......@@ -911,6 +919,7 @@ namespace OnlineStore.DeviceLibrary
IOMove(IO_Type.SW4_TopCylinder_Up, IO_VALUE.LOW);
SideWayStop();
ShuntStop();
Shunt2Stop();
}
protected override void ResetProcess()
......@@ -1017,8 +1026,10 @@ namespace OnlineStore.DeviceLibrary
msg += "横移41托盘：" + Sw41TrayNum.ToString().PadLeft(2,'0') + "：" + SW41_MoveInfo.MoveType + " " + SW41_MoveInfo.MoveStep + "\n";
msg += "横移23托盘：" + Sw23TrayNum.ToString().PadLeft(2,'0') + "：" + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n";
msg += "分流托盘： " + ShuntTrayNum + " (" + ShuntWaitTrayNum + ")\n";
msg += "分流横移： " + Shunt_MoveInfo.MoveType + " " + Shunt_MoveInfo.MoveStep + "\n";
//msg += "分流1托盘： " + ShuntTrayNum + " (" + ShuntWaitTrayNum + ")\n";
msg += "分流1： " + Shunt_MoveInfo.MoveType + " " + Shunt_MoveInfo.MoveStep +" "+ ShuntTrayNum + " (" + ShuntWaitTrayNum + ") " + "\n";
//msg += "分流2托盘： " + Shunt2TrayNum + " (" + Shunt2WaitTrayNum + ")\n";
msg += "分流2： " + Shunt2_MoveInfo.MoveType + " " + Shunt2_MoveInfo.MoveStep + " " + Shunt2TrayNum + "\n";
return msg;
}
......
source/DeviceLibrary/assemblyLine/LineBean_Shunt.cs
......@@ -24,7 +24,7 @@ namespace OnlineStore.DeviceLibrary
/// 判断进仓9第二个阻挡是否可以下降
/// </summary>
/// <returns></returns>
public bool Move9CanStop2Down(int deviceId, int trayNum)
internal bool Move9CanStop2Down(int deviceId, int trayNum)
{
if (DisableShunt)
{
......@@ -60,7 +60,7 @@ namespace OnlineStore.DeviceLibrary
/// 判断分流阻挡2是否可以下降
/// </summary>
/// <returns></returns>
public bool ShuntStop2CanDown()
private bool ShuntStop2CanDown()
{
if (DisableShunt)
{
......@@ -358,7 +358,6 @@ namespace OnlineStore.DeviceLibrary
outMsg = "";
try
{
int lineNum = DeviceID % 100;
TrayInfo trayInfo = TrayManager.GetTrayInfo(trayNum);
if (!trayInfo.IsFull)
{
......
source/DeviceLibrary/assemblyLine/MoveEquip_Partial.cs
......@@ -583,13 +583,15 @@ namespace OnlineStore.DeviceLibrary
LogUtil.error(Name + " StartCheckFixture " + " 不在空闲中，直接返回 ");
return;
}
bool canpro = LineManager.Line.Move5CanProcessTray(DeviceID);
if (IOValue(IO_Type.StopCylinder_Check2).Equals(IO_VALUE.HIGH))
{
trayCheck2LowWait.Stop();
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, true))
if (canpro && TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, true))
{
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_03_Stop2Down);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升）");
IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.LOW));
......@@ -600,7 +602,7 @@ namespace OnlineStore.DeviceLibrary
bool check2IsOk = TrayManager.checkWatch(trayCheck2LowWait, TrayManager.SwTrayWaitTime, false);
if (IOValue(IO_Type.StopCylinder_Check1).Equals(IO_VALUE.HIGH))
{
if (TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk)
if (canpro && TrayManager.checkWatch(trayCheckWait, TrayManager.SwTrayWaitTime, false) && check2IsOk)
{
trayCheckWait.Stop();
trayCheck2LowWait.Stop();
......@@ -655,8 +657,11 @@ namespace OnlineStore.DeviceLibrary
{
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_01_FixtureCheck);
CheckLog("托盘阻挡" + SecondMoveInfo.SLog + " 阻挡气缸1-1上升，等待 阻挡2托盘检测=1）");
// IOMove(IO_Type.StopCylinder_Down1, IO_VALUE.LOW);
// SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Down1, IO_VALUE.LOW));
if (DeviceID.Equals(5))
{
SecondMoveInfo.TimeOutSeconds = 15;
}
SecondMoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.StopCylinder_Check2, IO_VALUE.HIGH));
}
else if (SecondMoveInfo.MoveStep.Equals(LineMoveStep.MIO_01_FixtureCheck))
......@@ -862,5 +867,22 @@ namespace OnlineStore.DeviceLibrary
}
#endregion
#region 如果是进仓5，托盘横移后直接结束处理
internal void EndProcessTray()
{
if (DeviceID.Equals(5))
{
if(SecondMoveInfo.MoveType.Equals(LineMoveType.CheckFixture)&&SecondMoveInfo.MoveStep<= LineMoveStep.MIO_04_Wait)
{
UpdateTrayNum();
LogUtil.info(Name + " EndProcessTray ,结束当前托盘["+currTrayNum+"]处理【" + SecondMoveInfo.MoveType + "】【" + SecondMoveInfo.MoveStep + "】 ");
SecondMoveInfo.EndMove();
}
}
}
#endregion
}
}
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!