Commit f5560e6b 张东亮

20221119

1 个父辈 70311462
正在显示 72 个修改的文件 包含 82 行增加26 行删除
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace> <RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName> <AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
文件属性发生变化
...@@ -173,7 +173,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -173,7 +173,7 @@ namespace OnlineStore.DeviceLibrary
{ {
ClientAction currA = GetAction(id); ClientAction currA = GetAction(id);
if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter)) if (currA.Equals(ClientAction.None) || currA.Equals(ClientAction.NeedLeave) || currA.Equals(ClientAction.NeedEnter))
{ {
SetStatus(id, shelfId, ClientAction.NeedLeave, level); SetStatus(id, shelfId, ClientAction.NeedLeave, level);
return true; return true;
} }
......
...@@ -755,10 +755,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -755,10 +755,10 @@ namespace OnlineStore.DeviceLibrary
if (HasOutLine) if (HasOutLine)
{ {
MoveInfo.NextMoveStep(LineMoveStep.FI_62_OutLineRun); MoveInfo.NextMoveStep(LineMoveStep.FI_62_OutLineRun);
InLog("送出料串: " + MoveInfo.SLog + ", 出料线阻挡上升,出料线体转动5秒钟 或等待出料口信号亮"); InLog("送出料串: " + MoveInfo.SLog + ", 出料线阻挡上升,出料线体转动15秒钟 或等待出料口信号亮");
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW); IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(15000));
if (IOValue(IO_Type.SL_OutLine_Check).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.SL_OutLine_Check).Equals(IO_VALUE.LOW))
{ {
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_OutLine_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_OutLine_Check, IO_VALUE.HIGH));
......
...@@ -543,10 +543,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -543,10 +543,10 @@ namespace OnlineStore.DeviceLibrary
if (HasOutLine) if (HasOutLine)
{ {
MoveInfo.NextMoveStep(LineMoveStep.FO_62_OutLineRun); MoveInfo.NextMoveStep(LineMoveStep.FO_62_OutLineRun);
OutLog("送出料串: " + MoveInfo.SLog + ", 出料线阻挡上升,出料线体转动5秒钟 或等待出料口信号亮"); OutLog("送出料串: " + MoveInfo.SLog + ", 出料线阻挡上升,出料线体转动30秒钟 或等待出料口信号亮");
IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW); IOMove(IO_Type.SL_Out_StopDown, IO_VALUE.LOW);
IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH); IOMove(IO_Type.SL_OutLine_Run, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(5000)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(30000));
if (IOValue(IO_Type.SL_OutLine_Check).Equals(IO_VALUE.LOW)) if (IOValue(IO_Type.SL_OutLine_Check).Equals(IO_VALUE.LOW))
{ {
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_OutLine_Check, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_OutLine_Check, IO_VALUE.HIGH));
......
...@@ -247,14 +247,18 @@ namespace OnlineStore.DeviceLibrary ...@@ -247,14 +247,18 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.OHY02_TopDown)) else if (MoveInfo.IsStep(LineMoveStep.OHY02_TopDown))
{ {
MoveInfo.NextMoveStep(LineMoveStep.OHY03_LongLStopDown); MoveInfo.NextMoveStep(LineMoveStep.OHY03_LongLStopDown);
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 长线体阻挡下降1200"); CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 长线体阻挡下降");
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.HIGH, 1200); IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_LongL_StopDown, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_LongL_StopCheck, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY03_LongLStopDown)) else if (MoveInfo.IsStep(LineMoveStep.OHY03_LongLStopDown))
{ {
MoveInfo.NextMoveStep(LineMoveStep.OHY04_WaitTray); MoveInfo.NextMoveStep(LineMoveStep.OHY04_WaitTray);
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW);
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 等待托盘检测信号"); CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 等待托盘检测信号");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_LongL_StopCheck, IO_VALUE.LOW)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY04_WaitTray)) else if (MoveInfo.IsStep(LineMoveStep.OHY04_WaitTray))
...@@ -263,13 +267,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -263,13 +267,29 @@ namespace OnlineStore.DeviceLibrary
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 再次等待托盘检测信号500ms"); CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 再次等待托盘检测信号500ms");
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY05_TrayCheck)) else if (MoveInfo.IsStep(LineMoveStep.OHY05_TrayCheck))
{ {
MoveInfo.NextMoveStep(LineMoveStep.OHY21_WaitTrayLeave); if(IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 等待托盘离开"); {
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW)); MoveInfo.NextMoveStep(LineMoveStep.OHY21_WaitTrayLeave);
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 等待托盘离开");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.LOW));
}
else if (MoveInfo.IsTimeOut())
{
LogInfo("出料线横移(长线)" + MoveInfo.SLog + " 60秒超时,自动复位");
MoveInfo.EndMove();
Reset();
}
else if(MoveInfo.IsTimeOut(15))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY05_TrayCheck);
LogInfo("出料线横移(长线)" + MoveInfo.SLog + " 15秒超时,长线体阻挡下降1200");
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.HIGH,1200);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
}
} }
#endregion #endregion
...@@ -284,15 +304,19 @@ namespace OnlineStore.DeviceLibrary ...@@ -284,15 +304,19 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.OHY12_TopUp)) else if (MoveInfo.IsStep(LineMoveStep.OHY12_TopUp))
{ {
MoveInfo.NextMoveStep(LineMoveStep.OHY13_ShortLStopDown); MoveInfo.NextMoveStep(LineMoveStep.OHY13_ShortLStopDown);
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 短线阻挡下降1200,线体转动"); CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 短线阻挡下降,线体转动");
IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.HIGH, 1200);
LineRun(MoveInfo); LineRun(MoveInfo);
IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.HIGH);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_ShortL_StopDown, IO_VALUE.HIGH));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_ShortL_StopCheck, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(300));
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY13_ShortLStopDown)) else if (MoveInfo.IsStep(LineMoveStep.OHY13_ShortLStopDown))
{ {
MoveInfo.NextMoveStep(LineMoveStep.OHY14_WaitTray); MoveInfo.NextMoveStep(LineMoveStep.OHY14_WaitTray);
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 等待托盘检测信号"); CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 等待托盘检测信号");
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_ShortL_StopCheck, IO_VALUE.LOW)); IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.LOW);
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_ShortL_StopDown, IO_VALUE.LOW));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH)); MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY14_WaitTray)) else if (MoveInfo.IsStep(LineMoveStep.OHY14_WaitTray))
...@@ -301,14 +325,29 @@ namespace OnlineStore.DeviceLibrary ...@@ -301,14 +325,29 @@ namespace OnlineStore.DeviceLibrary
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 再次等待托盘检测信号500ms"); CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 再次等待托盘检测信号500ms");
IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.LOW); IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.LOW);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.HY_TrayCheck, IO_VALUE.HIGH));
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY15_TrayCheck)) else if (MoveInfo.IsStep(LineMoveStep.OHY15_TrayCheck))
{ {
MoveInfo.NextMoveStep(LineMoveStep.OHY16_TopDown); if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 顶升气缸下降,线体停止"); {
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down); MoveInfo.NextMoveStep(LineMoveStep.OHY16_TopDown);
LineStop(MoveInfo); CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 顶升气缸下降,线体停止");
CylinderMove(MoveInfo, IO_Type.HY_TopCylinder_Up, IO_Type.HY_TopCylinder_Down);
LineStop(MoveInfo);
}
else if (MoveInfo.IsTimeOut())
{
LogInfo("出料线横移(短线)" + MoveInfo.SLog + " 60秒超时,自动复位");
MoveInfo.EndMove();
Reset();
}
else if(MoveInfo.IsTimeOut(15))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY15_TrayCheck);
LogInfo("出料线横移(短线)" + MoveInfo.SLog + " 15秒超时,短线阻挡下降1200");
IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.HIGH,1200);
MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
}
} }
else if (MoveInfo.IsStep(LineMoveStep.OHY16_TopDown)) else if (MoveInfo.IsStep(LineMoveStep.OHY16_TopDown))
{ {
......
...@@ -37,12 +37,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -37,12 +37,14 @@ namespace OnlineStore.DeviceLibrary
else if (ioType.Equals(IO_Type.HY_FrontStopCheck) || ioType.Equals(IO_Type.HY_OL_Tray_Check)) else if (ioType.Equals(IO_Type.HY_FrontStopCheck) || ioType.Equals(IO_Type.HY_OL_Tray_Check))
{ {
} }
else if ( ioType.Equals(IO_Type.SL_RollerLine_Run)|| ioType.Equals(IO_Type.SL_OutLine_Run) || ioType.Equals(IO_Type.SL_OutLine_Check)) else if (ioType.Equals(IO_Type.SL_RollerLine_Run) || ioType.Equals(IO_Type.SL_OutLine_Run) || ioType.Equals(IO_Type.SL_OutLine_Check))
{ {
}else if (ioType.Equals(IO_Type.HY_LongL_StopDown)) }
else if (ioType.Equals(IO_Type.HY_LongL_StopDown))
{ {
}else if (IOType.Equals(IO_Type.SL_Buffer_StopDown)) }
else if (IOType.Equals(IO_Type.SL_Buffer_StopDown))
{ {
} }
...@@ -58,7 +60,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -58,7 +60,9 @@ namespace OnlineStore.DeviceLibrary
if (configIo != null) if (configIo != null)
{ {
instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue); instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
Thread.Sleep(10); Thread.Sleep(100);
if (!IOValue(ioType, subType).Equals(ioValue))
instance.WriteSingleDO(configIo.IO_IP, configIo.SlaveID, configIo.GetIOAddr(), ioValue);
} }
else else
{ {
......
...@@ -428,42 +428,55 @@ namespace OnlineStore.DeviceLibrary ...@@ -428,42 +428,55 @@ namespace OnlineStore.DeviceLibrary
//夹爪夹紧 //夹爪夹紧
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
} }
else if (baseConfig.DType.Equals(DeviceType.FeedingEquip) && (IoHighType.Equals(IO_Type.SL_ClampCylinder_Relax))) else if (baseConfig.DType.Equals(DeviceType.FeedingEquip) && (IoHighType.Equals(IO_Type.SL_ClampCylinder_Relax)))
{ {
//夹爪放松 //夹爪放松
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
} }
else if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Relax))) else if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Relax)))
{ {
//夹爪放松 //夹爪放松
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
} }
else if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Work))) else if (baseConfig.DType.Equals(DeviceType.MoveEquip) && (IoHighType.Equals(IO_Type.ClampCylinder_Work)))
{ {
//夹爪夹紧 //夹爪夹紧
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
} }
else if (baseConfig.DType.Equals(DeviceType.HYEquip) && (IoHighType.Equals(IO_Type.HY_ClampCylinder_Relax))) else if (baseConfig.DType.Equals(DeviceType.HYEquip) && (IoHighType.Equals(IO_Type.HY_ClampCylinder_Relax)))
{ {
//夹爪放松 //夹爪放松
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500)); moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
} }
else if (baseConfig.DType.Equals(DeviceType.HYEquip) && (IoHighType.Equals(IO_Type.HY_ClampCylinder_Work))) else if (baseConfig.DType.Equals(DeviceType.HYEquip) && (IoHighType.Equals(IO_Type.HY_ClampCylinder_Work)))
{ {
//夹爪夹紧 //夹爪夹紧
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000)); moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
} }
else else
{ {
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH)); moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
} }
} }
if (isCheckMove) if (isCheckMove)
{ {
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace> <RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName> <AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
</PropertyGroup> </PropertyGroup>
......
文件属性发生变化
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!