Skip to content

孙克 / RC1250-AssemblyLine

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

出料气缸加长，皮带线逻辑修改。

1 个父辈 b96e30eb
全部展开
内嵌 并排
正在显示 11 个修改的文件 包含 69 行增加 和 56 行删除
source/AssemblyLineClient/FrmDischargeLine.cs
...@@ -214,12 +214,12 @@ namespace OnlineStore.AssemblyLine ...@@ -214,12 +214,12 @@ namespace OnlineStore.AssemblyLine
btnLine1Test.Text = line1Name + "出库测试"; btnLine1Test.Text = line1Name + "出库测试";
btnLine2Test.Text = line2Name + "出库测试"; btnLine2Test.Text = line2Name + "出库测试";
this.cmbLineType.Items.AddRange(new object[] { this.cmbLineType.Items.AddRange(new object[] {
line1Name+"运转-入口定位", //line1Name+"运转-入口定位",
line2Name+"运转-入口定位", //line2Name+"运转-入口定位",
line3Name+"运转测试", line3Name+"运转测试",
line1Name+"运转-出口定位", line1Name+"运转测试",
line2Name+"运转-出口定位"}); line2Name+"运转测试"});
cmbLineType.SelectedIndex = 2; cmbLineType.SelectedIndex = 0;
IsLoad = true; IsLoad = true;
} }
...@@ -362,25 +362,15 @@ namespace OnlineStore.AssemblyLine ...@@ -362,25 +362,15 @@ namespace OnlineStore.AssemblyLine
return; return;
} }
int index = cmbLineType.SelectedIndex; int index = cmbLineType.SelectedIndex;
string moveIo = IO_Type.DLine_Run1; string moveIo = IO_Type.DLine_Run3;
string waitIo = IO_Type.EntryLocation_Check1; string waitIo = IO_Type.Location_Check3;
if (index.Equals(1)) if (index.Equals(1))
{ {
moveIo = IO_Type.DLine_Run2;
waitIo = IO_Type.EntryLocation_Check2;
}
else if (index.Equals(2))
{
moveIo = IO_Type.DLine_Run3;
waitIo = IO_Type.Location_Check3;
}
else if (index.Equals(3))
{
moveIo = IO_Type.DLine_Run1; moveIo = IO_Type.DLine_Run1;
waitIo = IO_Type.ExitLocation_Check1; waitIo = IO_Type.ExitLocation_Check1;
} }
else if (index.Equals(4)) else if (index.Equals(2))
{ {
moveIo = IO_Type.DLine_Run2; moveIo = IO_Type.DLine_Run2;
waitIo = IO_Type.ExitLocation_Check2; waitIo = IO_Type.ExitLocation_Check2;
......
source/AssemblyLineClient/记录.txt
...@@ -291,8 +291,11 @@ IO_Value增加None的定义，防止误操作 ...@@ -291,8 +291,11 @@ IO_Value增加None的定义，防止误操作
20200312 20200312
皮带线判断修改 皮带线判断修改
皮带线3扫码的时候不能开始送料。
短皮带线逻辑修改：对应气缸加长修改。
扫码修改：去掉不需要的缓存。
阻挡1下降条件修改：等待1离开或者2到达都可以继续。
上料1模块，等待500ms再下降顶升气缸
......
source/DeviceLibrary/assemblyLine/DischargeLine.cs
...@@ -46,14 +46,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -46,14 +46,14 @@ namespace OnlineStore.DeviceLibrary
SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + hengyiName + "-SMove]"); SecondMoveInfo = new LineMoveInfo(DeviceID, "[" + hengyiName + "-SMove]");
if (id.Equals(1)) if (id.Equals(1))
{ {
TrayLine1 = new OutTrayLineBean("皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.EntryLocation_Check1, IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.EntryTray_Check3, this.DeviceID); TrayLine1 = new OutTrayLineBean(330 + ((id - 1) * 3 + 1) , "皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.EntryTray_Check3, this.DeviceID);
TrayLine2 = new OutTrayLineBean("皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.EntryLocation_Check2, IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.MiddleTray_Check3, this.DeviceID); TrayLine2 = new OutTrayLineBean(330 + ((id - 1) * 3 + 2),"皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.MiddleTray_Check3, this.DeviceID);
} }
else else
{ {
IsNewType = true; IsNewType = true;
TrayLine1 = new OutTrayLineBean("皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.EntryLocation_Check1, IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.MiddleTray_Check3, this.DeviceID); TrayLine1 = new OutTrayLineBean(330+ ((id - 1) * 3 + 1),"皮带线" + "_" + ((id - 1) * 3 + 1) + " ", IO_Type.ExitLocation_Check1, IO_Type.ExitTray_Check1, IO_Type.DLine_Run1, IO_Type.MiddleTray_Check3, this.DeviceID);
TrayLine2 = new OutTrayLineBean("皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.EntryLocation_Check2, IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.EntryTray_Check3, this.DeviceID); TrayLine2 = new OutTrayLineBean(330+((id - 1) * 3 + 2),"皮带线" + "_" + ((id - 1) * 3 + 2) + " ", IO_Type.ExitLocation_Check2, IO_Type.ExitTray_Check2, IO_Type.DLine_Run2, IO_Type.EntryTray_Check3, this.DeviceID);
} }
Line3Turn = new LineTurnBean(DeviceID); Line3Turn = new LineTurnBean(DeviceID);
if ((DeviceID % 100).Equals(1)) if ((DeviceID % 100).Equals(1))
...@@ -276,7 +276,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -276,7 +276,7 @@ namespace OnlineStore.DeviceLibrary
else else
{ {
//皮带线3出口有料,分盘定位装置无料 //皮带线3出口有料,分盘定位装置无料
if (Line3TurnIsStop() && IOValue(IO_Type.SeparateDevice_Check).Equals(IO_VALUE.LOW) && StationInfo_NG.TrayValue.Equals(IO_VALUE.HIGH)) if (Line3TurnIsStop() && IOValue(IO_Type.SeparateDevice_Check).Equals(IO_VALUE.LOW) && StationInfo_NG.TrayValue.Equals(IO_VALUE.HIGH)&&IsInScanCode.Equals(false))
{ {
StartOutStoreMove(new InOutParam()); StartOutStoreMove(new InOutParam());
} }
......
source/DeviceLibrary/assemblyLine/DischargeLine_Partial.cs
...@@ -328,10 +328,12 @@ namespace OnlineStore.DeviceLibrary ...@@ -328,10 +328,12 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_07_SeparateCheck)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_07_SeparateCheck))
{ {
MoveInfo.NextMoveStep(LineMoveStep.DON_08_CRun); MoveInfo.NextMoveStep(LineMoveStep.DON_08_CRun);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
if (IOValue(IO_Type.SeparateDevice_Check).Equals(IO_VALUE.HIGH)) if (IOValue(IO_Type.SeparateDevice_Check).Equals(IO_VALUE.HIGH))
{ {
int robotIndex = GetRobotIndex(); int robotIndex = GetRobotIndex();
LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台有料盘，等待2000，调用arriveRobotLocation=" + robotIndex); LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台有料盘，等待2000，调用arriveRobotLocation=" + robotIndex+"["+StationInfo_Move.CodeStr+"]");
SServerManager.arriveRobotLocation(Name, robotIndex, StationInfo_Move.CodeStr); SServerManager.arriveRobotLocation(Name, robotIndex, StationInfo_Move.CodeStr);
} }
...@@ -339,8 +341,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -339,8 +341,6 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台无料盘，等待2000，"); LogUtil.info(hengyiName + MoveInfo.SLog + "送料，接驳台无料盘，等待2000，");
} }
IOMove(IO_Type.SeparateDevice_Run, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(2000));
} }
else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_08_CRun)) else if (MoveInfo.MoveStep.Equals(LineMoveStep.DON_08_CRun))
{ {
......
source/DeviceLibrary/assemblyLine/EquipBase.cs
...@@ -497,7 +497,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -497,7 +497,7 @@ namespace OnlineStore.DeviceLibrary
//} //}
if (wait.IsEnd) if (wait.IsEnd)
{ {
if (MoveInfo.OneWaitCanEndStep) if (moveInfo.OneWaitCanEndStep)
{ {
isOk = true; isOk = true;
break; break;
...@@ -505,7 +505,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -505,7 +505,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (!MoveInfo.OneWaitCanEndStep) if (!moveInfo.OneWaitCanEndStep)
{ {
isOk = false; isOk = false;
break; break;
...@@ -570,7 +570,20 @@ namespace OnlineStore.DeviceLibrary ...@@ -570,7 +570,20 @@ namespace OnlineStore.DeviceLibrary
protected void InLog(string msg) protected void InLog(string msg)
{ {
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
if (String.IsNullOrEmpty( posId)) if (baseConfig.DType.Equals(DeviceType.MoveEquip))
{
if (String.IsNullOrEmpty(posId))
{
LogUtil.debug(Name + " " + msg);
}
else
{
LogUtil.debug(Name + " " + "[" + posId + "]" + msg);
}
}
else
{
if (String.IsNullOrEmpty(posId))
{ {
LogUtil.info(Name + " " + msg); LogUtil.info(Name + " " + msg);
} }
...@@ -579,10 +592,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -579,10 +592,11 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info(Name + " " + "[" + posId + "]" + msg); LogUtil.info(Name + " " + "[" + posId + "]" + msg);
} }
} }
}
protected void OutLog(string msg) protected void OutLog(string msg)
{ {
string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : ""; string posId = MoveInfo.MoveParam != null ? MoveInfo.MoveParam.PosId : "";
if (baseConfig.DType.Equals(DeviceType.ProvidingEquip)) if (baseConfig.DType.Equals(DeviceType.ProvidingEquip) || baseConfig.DType.Equals(DeviceType.MoveEquip))
{ {
if (String.IsNullOrEmpty(posId)) if (String.IsNullOrEmpty(posId))
{ {
......
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
...@@ -884,7 +884,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -884,7 +884,13 @@ namespace OnlineStore.DeviceLibrary
CylinderMove(null, IO_Type.SW_LocationCylinder_Up, IO_Type.SW_LocationCylinder_Down); CylinderMove(null, IO_Type.SW_LocationCylinder_Up, IO_Type.SW_LocationCylinder_Down);
if (Config.SidesWayNum.Equals(1)) if (Config.SidesWayNum.Equals(1))
{ {
Task.Factory.StartNew(delegate
{
//需要等待500再下降
Thread.Sleep(500);
CylinderMove(null, IO_Type.SW_TopCylinder_Up, IO_Type.SW_TopCylinder_Down); CylinderMove(null, IO_Type.SW_TopCylinder_Up, IO_Type.SW_TopCylinder_Down);
});
} }
} }
else else
......
source/DeviceLibrary/assemblyLine/LineBean_Partial.cs
...@@ -154,7 +154,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -154,7 +154,7 @@ namespace OnlineStore.DeviceLibrary
} }
if (wait.IsEnd) if (wait.IsEnd)
{ {
if (MoveInfo.OneWaitCanEndStep) if (checkWaitInfo.OneWaitCanEndStep)
{ {
isOk = true; isOk = true;
break; break;
...@@ -162,7 +162,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -162,7 +162,7 @@ namespace OnlineStore.DeviceLibrary
} }
else else
{ {
if (!MoveInfo.OneWaitCanEndStep) if (!checkWaitInfo.OneWaitCanEndStep)
{ {
isOk = false; isOk = false;
break; break;
......
source/DeviceLibrary/model/StoreStep.cs
...@@ -1093,17 +1093,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -1093,17 +1093,17 @@ namespace OnlineStore.DeviceLibrary
#region 皮带线12接收料盘并转动处理 #region 皮带线12接收料盘并转动处理
/// <summary> /// <summary>
/// 皮带线12处理料盘：需要放入料盘，等待入口无料盘 /// 皮带线12处理料盘：NG气缸后退
/// </summary> /// </summary>
DLO_01_WaitEntryNoTray = 30301, DLO_01_NGBack = 30301,
/// <summary> /// <summary>
/// 皮带线12处理料盘：需要放入料盘，等待出口无料盘 /// 皮带线12处理料盘：等待入口无料盘， 等待最后一盘料位置>1
/// </summary> /// </summary>
DLO_02_WaitExitNoTray, DLO_02_WaitEnteryNoTray,
/// <summary> ///// <summary>
/// 皮带线12处理料盘：入口出口都没有料盘，转动皮带线到入口定位亮 ///// 皮带线12处理料盘：入口出口都没有料盘，转动皮带线到入口定位亮
/// </summary> ///// </summary>
DLO_03_LineRun, //DLO_03_LineRun,
/// <summary> /// <summary>
/// 皮带线12处理料盘：可以放入料盘，等待移栽放下料盘 /// 皮带线12处理料盘：可以放入料盘，等待移栽放下料盘
/// </summary> /// </summary>
...@@ -1114,9 +1114,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -1114,9 +1114,9 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
DLO_05_TrayIsOk, DLO_05_TrayIsOk,
/// <summary> /// <summary>
/// 皮带线12处理料盘：皮带线转动到出口定位信号亮 /// 皮带线12处理料盘：盘放下后等待2000ms
/// </summary> /// </summary>
DLO_06_OutCheck, DLO_06_WaitTime,
/// <summary> /// <summary>
/// 皮带线12处理料盘：出库有料盘，继续转动一个工位， /// 皮带线12处理料盘：出库有料盘，继续转动一个工位，
/// </summary> /// </summary>
...@@ -1129,10 +1129,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -1129,10 +1129,10 @@ namespace OnlineStore.DeviceLibrary
/// 皮带线12处理料盘：是NG料盘，NG气缸后退 /// 皮带线12处理料盘：是NG料盘，NG气缸后退
/// </summary> /// </summary>
DLO_09_NGAfter, DLO_09_NGAfter,
/// <summary> ///// <summary>
/// 皮带线12处理料盘：判断出口是否有料盘，有料盘需要转动，没有料盘结束 ///// 皮带线12处理料盘：判断出口是否有料盘，有料盘需要转动，没有料盘结束
/// </summary> ///// </summary>
DLO_10_LineRun, //DLO_10_LineRun,
/// <summary> /// <summary>
/// 皮带线12处理料盘：出口无料盘，结束， /// 皮带线12处理料盘：出口无料盘，结束，
......
source/LoadCVSLibrary/storeConfig/config/IO_Type.cs
...@@ -193,10 +193,10 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -193,10 +193,10 @@ namespace OnlineStore.LoadCSVLibrary
public static string DLine_Reset = "DLine_Reset"; public static string DLine_Reset = "DLine_Reset";
/// <summary> ///// <summary>
/// DI 0 皮带线1入口定位检测 EntryLocation_Check1 2 PRO_AOI_IP_2 0 皮带线1入口定位检测 X023 X023 ///// DI 0 皮带线1入口定位检测 EntryLocation_Check1 2 PRO_AOI_IP_2 0 皮带线1入口定位检测 X023 X023
/// </summary> ///// </summary>
public static string EntryLocation_Check1 = "EntryLocation_Check1"; //public static string EntryLocation_Check1 = "EntryLocation_Check1";
/// <summary> /// <summary>
/// DI 0 皮带线1出口定位检测 ExitLocation_Check1 3 PRO_AOI_IP_2 0 皮带线1出口定位检测 X024 X024 /// DI 0 皮带线1出口定位检测 ExitLocation_Check1 3 PRO_AOI_IP_2 0 皮带线1出口定位检测 X024 X024
/// </summary> /// </summary>
...@@ -206,10 +206,10 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -206,10 +206,10 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string ExitTray_Check1 = "ExitTray_Check1"; public static string ExitTray_Check1 = "ExitTray_Check1";
/// <summary> ///// <summary>
/// DI,0,皮带线2入口定位检测 EntryLocation_Check2 5 PRO_AOI_IP_2 0 皮带线2入口定位检测 X026 X026 ///// DI,0,皮带线2入口定位检测 EntryLocation_Check2 5 PRO_AOI_IP_2 0 皮带线2入口定位检测 X026 X026
/// </summary> ///// </summary>
public static string EntryLocation_Check2 = "EntryLocation_Check2"; //public static string EntryLocation_Check2 = "EntryLocation_Check2";
/// <summary> /// <summary>
/// DI 皮带线2出口定位检测 ExitLocation_Check2 6 PRO_AOI_IP_2 0 皮带线2出口定位检测 X027 X027 /// DI 皮带线2出口定位检测 ExitLocation_Check2 6 PRO_AOI_IP_2 0 皮带线2出口定位检测 X027 X027
/// </summary> /// </summary>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!