Skip to content

孙克 / RC1250-AssemblyLine

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

1

1 个父辈 dafb1ec5
内嵌 并排
正在显示 4 个修改的文件 包含 15 行增加 和 9 行删除
source/AssemblyLineClient/FrmFeedingEquip.cs
...@@ -284,6 +284,7 @@ namespace OnlineStore.AssemblyLine ...@@ -284,6 +284,7 @@ namespace OnlineStore.AssemblyLine
private void btnStart_Click(object sender, EventArgs e) private void btnStart_Click(object sender, EventArgs e)
{ {
StartDebug(); StartDebug();
} }
private void btnStop_Click(object sender, EventArgs e) private void btnStop_Click(object sender, EventArgs e)
......
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
...@@ -40,7 +40,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -40,7 +40,7 @@ namespace OnlineStore.DeviceLibrary
/// 开始运行 /// 开始运行
/// </summary> /// </summary>
public override bool StartRun(bool isDebug = false) public override bool StartRun(bool isDebug = false)
{ {
if (CanStartRun().Equals(false)) if (CanStartRun().Equals(false))
{ {
return false; return false;
......
source/DeviceLibrary/assemblyLine/FeedingEquip_Partial.cs
...@@ -14,19 +14,17 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,19 +14,17 @@ namespace OnlineStore.DeviceLibrary
{ {
if (wait.WaitType.Equals(WaitEnum.W101_BatchAxisMove)) if (wait.WaitType.Equals(WaitEnum.W101_BatchAxisMove))
{ {
string msg = "";
if (IOValue(TargetIoType).Equals(TargetIoValue)) if (IOValue(TargetIoType).Equals(TargetIoValue))
{ {
return true; return true;
} }
else else
{ {
bool result = AxisBean.ACAxisMoveIsEnd(moveInfo, wait.AxisInfo, wait.TargetPosition, wait.TargetSpeed, out msg); bool isOk = ACServerManager.GetBusyStatus(wait.AxisInfo.DeviceName, wait.AxisInfo.GetAxisValue()).Equals(0);
if (!result) if (isOk)
{ {
LogUtil.error(msg); return true;
} }
return result;
} }
} }
else if (wait.WaitType.Equals(WaitEnum.W102_FeedScanCode)) else if (wait.WaitType.Equals(WaitEnum.W102_FeedScanCode))
...@@ -38,6 +36,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -38,6 +36,7 @@ namespace OnlineStore.DeviceLibrary
} }
return false; return false;
} }
#region 托盘检测 #region 托盘检测
private void StartCheckFixture() private void StartCheckFixture()
{ {
...@@ -48,6 +47,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -48,6 +47,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (NeedCurrTray()) if (NeedCurrTray())
{ {
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
TrayManager.UpdateSWState(Config.SidesWayNum, 2); TrayManager.UpdateSWState(Config.SidesWayNum, 2);
CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 横移顶升气缸上 升 ）"); CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 横移顶升气缸上 升 ）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp);
...@@ -63,7 +63,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -63,7 +63,8 @@ namespace OnlineStore.DeviceLibrary
{ {
//判断是否是需要的托盘 //判断是否是需要的托盘
if (NeedCurrTray()) if (NeedCurrTray())
{ {
SecondMoveInfo.NewMove(LineMoveType.CheckFixture);
TrayManager.UpdateSWState(Config.SidesWayNum, 2); TrayManager.UpdateSWState(Config.SidesWayNum, 2);
CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 横移顶升气缸上 升 ）"); CheckLog("托盘检测（流水线阻挡）SecondStoreMove：(MIO_06_TopCylinderUp 横移顶升气缸上 升 ）");
SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp); SecondMoveInfo.NextMoveStep(LineMoveStep.MIO_06_TopCylinderUp);
...@@ -783,7 +784,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -783,7 +784,7 @@ namespace OnlineStore.DeviceLibrary
private void BatchAxisToP3() private void BatchAxisToP3()
{ {
MoveInfo.TimeOutSeconds = 200; MoveInfo.TimeOutSeconds = 200;
MoveInfo.CanWhileCount = 3; MoveInfo.CanWhileCount = 0;
// 需要增加定时器，获取验证信号并停止伺服 // 需要增加定时器，获取验证信号并停止伺服
StartMovePosition = BatchAxis.GetAclPosition(); StartMovePosition = BatchAxis.GetAclPosition();
MoveInfo.WaitList.Add(WaitResultInfo.WaitBatchAxis(Config.Batch_Axis, Config.BatchAxisP3, Config.BatchAxis_P3Speed)); MoveInfo.WaitList.Add(WaitResultInfo.WaitBatchAxis(Config.Batch_Axis, Config.BatchAxisP3, Config.BatchAxis_P3Speed));
...@@ -858,6 +859,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -858,6 +859,7 @@ namespace OnlineStore.DeviceLibrary
bool isFull = TrayManager.TrayIsFull(trayNum); bool isFull = TrayManager.TrayIsFull(trayNum);
TrayInfo info = TrayManager.GetTrayInfo(trayNum); TrayInfo info = TrayManager.GetTrayInfo(trayNum);
InOutParam param = new InOutParam(trayNum, info.WareCode, info.PosId, info.PlateH, info.PlateW); InOutParam param = new InOutParam(trayNum, info.WareCode, info.PosId, info.PlateH, info.PlateW);
//是出料的模块 //是出料的模块
if (Config.IsCanOut.Equals(1)) if (Config.IsCanOut.Equals(1))
{ {
...@@ -866,6 +868,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -866,6 +868,7 @@ namespace OnlineStore.DeviceLibrary
{ {
if (isFull && runStatus.Equals(LineRunStatus.Runing) && MoveInfo.MoveType.Equals(LineMoveType.OutStore)) if (isFull && runStatus.Equals(LineRunStatus.Runing) && MoveInfo.MoveType.Equals(LineMoveType.OutStore))
{ {
lastOutParam = param; lastOutParam = param;
if (checkAndMove) if (checkAndMove)
{ {
......
source/DeviceLibrary/assemblymanager/TrayManager.cs
...@@ -71,7 +71,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -71,7 +71,9 @@ namespace OnlineStore.DeviceLibrary
{ {
return fixtureCodeFullMap[trayNum]; return fixtureCodeFullMap[trayNum];
} }
return null; TrayInfo tray = new TrayInfo(trayNum,false,0);
return tray;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!