Skip to content

李娜 / SO664-AssemblyLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit f5560e6b 由 张东亮
选项

20221119

1 个父辈 70311462
内嵌 并排
正在显示 72 个修改的文件 包含 85 行增加 和 28 行删除
_system~.ini 0 → 100644
文件属性发生变化
dll/ABB/_system~.ini 0 → 100644
文件属性发生变化
dll/IO2310/_system~.ini 0 → 100644
文件属性发生变化
dll/IO2400/_system~.ini 0 → 100644
文件属性发生变化
dll/RFID/_system~.ini 0 → 100644
文件属性发生变化
dll/ScanCodeServer/_system~.ini 0 → 100644
文件属性发生变化
dll/_system~.ini 0 → 100644
文件属性发生变化
dll/model/_system~.ini 0 → 100644
文件属性发生变化
dll/old/_system~.ini 0 → 100644
文件属性发生变化
doc/_system~.ini 0 → 100644
文件属性发生变化
doc/old/_system~.ini 0 → 100644
文件属性发生变化
source/CodeLibrary/_system~.ini 0 → 100644
文件属性发生变化
source/Common/Common.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
source/Common/_system~.ini 0 → 100644
文件属性发生变化
source/Common/bean/_system~.ini 0 → 100644
文件属性发生变化
source/Common/util/_system~.ini 0 → 100644
文件属性发生变化
source/DemoTest/_system~.ini 0 → 100644
文件属性发生变化
source/DeviceLibrary/_system~.ini 0 → 100644
文件属性发生变化
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
......@@ -356,7 +356,7 @@ namespace OnlineStore.DeviceLibrary
addLastDI(IO_Type.SL_Reset_BTN, fuweiValue);
//收到复位信号后启动
if ( fuweiValue.Equals(IO_VALUE.HIGH) && lastFuwei.Equals(IO_VALUE.LOW))
if (fuweiValue.Equals(IO_VALUE.HIGH) && lastFuwei.Equals(IO_VALUE.LOW))
{
//没有启动时收到启动按钮
LogUtil.info(Name + "没有启动时收到复位按钮，开始调用启动方法！");
......@@ -426,6 +426,7 @@ namespace OnlineStore.DeviceLibrary
{
StartOutStoreP();
}
OutLineProcess();
}
AgvStatusPro();
......@@ -434,10 +435,9 @@ namespace OnlineStore.DeviceLibrary
if (UseAxis && runStatus >= LineRunStatus.Runing)
{
CheckAxisAlarm(UpdownAxis,BatchAxis);
CheckAxisAlarm(UpdownAxis, BatchAxis);
}
OutLineProcess();
}
}
......@@ -721,7 +721,7 @@ namespace OnlineStore.DeviceLibrary
#region 提升轴匀速上升处理
public bool LastMoveIsTest = true;
public void BatchAxisToP3(bool isFirstMove = true, bool isWait = true, bool IsTest = false )
public void BatchAxisToP3(bool isFirstMove = true, bool isWait = true, bool IsTest = false)
{
int targetP3 = Config.BatchAxisP3;
int targetSpeed = Config.BatchAxis_P3Speed;
......@@ -787,7 +787,7 @@ namespace OnlineStore.DeviceLibrary
}
public bool IsBatchMove()
{
if (axisCheckTimer!=null&& axisCheckTimer.Enabled)
if (axisCheckTimer != null && axisCheckTimer.Enabled)
{
return true;
}
......@@ -999,7 +999,7 @@ namespace OnlineStore.DeviceLibrary
string stopDo = IO_Type.SL_Out_StopDown;
if (HasOutLine)
{
StopDownMS = 1500;
StopDownMS = 3000;
checkIo = IO_Type.SL_OutLine_Check;
lineDo = IO_Type.SL_OutLine_Run;
}
......@@ -1012,13 +1012,14 @@ namespace OnlineStore.DeviceLibrary
{
ProcessShelfOut = true;
//出口阻挡下降，出口线体转动
IOMove(stopDo, IO_VALUE.HIGH, StopDownMS);
IOMove(lineDo, IO_VALUE.HIGH);
Thread.Sleep(2000);
IOMove(stopDo, IO_VALUE.HIGH, StopDownMS);
bool result = WaitIo(checkIo, IO_VALUE.LOW, 60000);
if (!result)
{
LogUtil.info(logName + " 等待 "+ checkIo + "=LOW超时，等待8000后停止" + lineDo+"转动，发送FinishLeave");
LogUtil.info(logName + " 等待 " + checkIo + "=LOW超时，等待8000后停止" + lineDo + "转动，发送FinishLeave");
}
else
{
......@@ -1244,7 +1245,7 @@ namespace OnlineStore.DeviceLibrary
{
leftTask = "剩余任务：" + taskData.ToStr();
}
msg += "料架：" + CurrShelfId + " "+leftTask + "\r\n";
msg += "料架：" + CurrShelfId + " " + leftTask + "\r\n";
if (LastOutParam.rfid != "")
{
msg += "出库信息：" + LastOutParam.ToShortStr() + "\r\n";
......@@ -1258,7 +1259,7 @@ namespace OnlineStore.DeviceLibrary
}
public string GetLastTrayInfo()
{
return "" + LastWidth + "X" + LastHeight + "=" + lastcode + "["+((LastPosParam!=null) ?LastPosParam.PosId:"")+"]";
return "" + LastWidth + "X" + LastHeight + "=" + lastcode + "[" + ((LastPosParam != null) ? LastPosParam.PosId : "") + "]";
}
}
}
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
......@@ -755,10 +755,10 @@ namespace OnlineStore.DeviceLibrary
if (HasOutLine)
{
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_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))
{
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_OutLine_Check, IO_VALUE.HIGH));
......
source/DeviceLibrary/assemblyLine/FeedingEquip_OutStore.cs
......@@ -543,10 +543,10 @@ namespace OnlineStore.DeviceLibrary
if (HasOutLine)
{
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_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))
{
MoveInfo.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.SL_OutLine_Check, IO_VALUE.HIGH));
......
source/DeviceLibrary/assemblyLine/HY/HY_OutLine.cs
......@@ -247,14 +247,18 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.OHY02_TopDown))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY03_LongLStopDown);
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 长线体阻挡下降1200");
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.HIGH, 1200);
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 长线体阻挡下降");
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))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY04_WaitTray);
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW);
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));
}
else if (MoveInfo.IsStep(LineMoveStep.OHY04_WaitTray))
......@@ -263,13 +267,29 @@ namespace OnlineStore.DeviceLibrary
CheckLog("出料线横移(长线)" + MoveInfo.SLog + " 再次等待托盘检测信号500ms");
IOMove(IO_Type.HY_LongL_StopDown, IO_VALUE.LOW);
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))
{
if(IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
{
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
......@@ -284,15 +304,19 @@ namespace OnlineStore.DeviceLibrary
else if (MoveInfo.IsStep(LineMoveStep.OHY12_TopUp))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY13_ShortLStopDown);
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 短线阻挡下降1200，线体转动");
IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.HIGH, 1200);
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 短线阻挡下降，线体转动");
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))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY14_WaitTray);
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));
}
else if (MoveInfo.IsStep(LineMoveStep.OHY14_WaitTray))
......@@ -301,15 +325,30 @@ namespace OnlineStore.DeviceLibrary
CheckLog("出料线横移(短线)" + MoveInfo.SLog + " 再次等待托盘检测信号500ms");
IOMove(IO_Type.HY_ShortL_StopDown, IO_VALUE.LOW);
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))
{
if (IOValue(IO_Type.HY_TrayCheck).Equals(IO_VALUE.HIGH))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY16_TopDown);
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))
{
MoveInfo.NextMoveStep(LineMoveStep.OHY21_WaitTrayLeave);
......
source/DeviceLibrary/deviceLibrary/IO/IOManager.cs
......@@ -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.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
if (configIo != null)
{
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
{
......
source/DeviceLibrary/model/KTK_Store.cs
......@@ -428,42 +428,55 @@ namespace OnlineStore.DeviceLibrary
//夹爪夹紧
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
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)))
{
//夹爪放松
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
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)))
{
//夹爪放松
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
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)))
{
//夹爪夹紧
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
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)))
{
//夹爪放松
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(500));
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)))
{
//夹爪夹紧
moveInfo.WaitList.Add(WaitResultInfo.WaitTime(1000));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
}
else
{
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoLowType, IO_VALUE.LOW));
moveInfo.WaitList.Add(WaitResultInfo.WaitIO(IoHighType, IO_VALUE.HIGH));
}
}
if (isCheckMove)
{
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
source/_system~.ini 0 → 100644
文件属性发生变化
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!