Skip to content

张东亮 / RC1250-DISTLineClient

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

功能实现，未测试

1 个父辈 4d517bad
全部展开
内嵌 并排
正在显示 39 个修改的文件 包含 193 行增加 和 67 行删除
_system~.ini 0 → 100644
文件属性发生变化
dll/RFID/_system~.ini 0 → 100644
文件属性发生变化
dll/_system~.ini 0 → 100644
文件属性发生变化
dll/server模式/_system~.ini 0 → 100644
文件属性发生变化
source/Common/_system~.ini 0 → 100644
文件属性发生变化
source/Common/bean/_system~.ini 0 → 100644
文件属性发生变化
source/Common/util/_system~.ini 0 → 100644
文件属性发生变化
source/DISTLineClient/DISTLineClient.csproj
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid> <ProjectGuid>{0D2542F5-DD62-4352-82D0-383D9A045E74}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.ACSingleStore</RootNamespace> <RootNamespace>DISTLineClient</RootNamespace>
<AssemblyName>DISTLineClient</AssemblyName> <AssemblyName>DISTLineClient</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<Prefer32Bit>false</Prefer32Bit> <Prefer32Bit>false</Prefer32Bit>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationIcon>box.ico</ApplicationIcon> <ApplicationIcon>dist.ico</ApplicationIcon>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="log4net"> <Reference Include="log4net">
...@@ -140,6 +140,7 @@ ...@@ -140,6 +140,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content> </Content>
<Content Include="box.ico" /> <Content Include="box.ico" />
<Content Include="dist.ico" />
<Content Include="记录.txt" /> <Content Include="记录.txt" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
......
source/DISTLineClient/FrmDISTClient.cs
...@@ -121,7 +121,7 @@ namespace OnlineStore.DISTLineClient ...@@ -121,7 +121,7 @@ namespace OnlineStore.DISTLineClient
return; return;
} }
ReadIOList(); ReadIOList();
lblThisSta.Text = LineManager.GetRunStr(distLine.runStatus)+" "+(distLine.IsSleep ? "休眠中" :""); lblThisSta.Text = LineManager.GetRunStr(distLine.runStatus) + " " + (distLine.IsSleep ? "休眠中" : "");
lblWarnMsg.Text = distLine.WarnMsg; lblWarnMsg.Text = distLine.WarnMsg;
lblInfo.Text = distLine.GetRunInfo(); lblInfo.Text = distLine.GetRunInfo();
} }
...@@ -145,7 +145,8 @@ namespace OnlineStore.DISTLineClient ...@@ -145,7 +145,8 @@ namespace OnlineStore.DISTLineClient
else if (distLine.StartRun()) else if (distLine.StartRun())
{ {
btnDISTStart.Text = "复位"; btnDISTStart.Text = "复位";
}else }
else
{ {
btnDISTStart.Text = "启动"; btnDISTStart.Text = "启动";
} }
...@@ -422,5 +423,30 @@ namespace OnlineStore.DISTLineClient ...@@ -422,5 +423,30 @@ namespace OnlineStore.DISTLineClient
{ {
AgvClient.SetCancelState(chkBoxAGVCancel.Checked); AgvClient.SetCancelState(chkBoxAGVCancel.Checked);
} }
private void btnTranverse_Click(object sender, EventArgs e)
{
if (btnTranverse.Text.Equals("横移机构下降"))
{
BtnMove(btnTranverse, "横移机构下降", "横移机构上升", IO_Type.Traverse_Up_SOL);
IOManager.IOMove(IO_Type.Traverse_Down_SOL,IO_VALUE.LOW);
}
else
{
BtnMove(btnTranverse, "横移机构上升", "横移机构下降", IO_Type.Traverse_Down_SOL);
IOManager.IOMove(IO_Type.Traverse_Up_SOL,IO_VALUE.LOW);
}
}
private void btnTranverseRun_Click(object sender, EventArgs e)
{
BtnMove(btnTranverseRun, "横移电机运转", "横移电机停止", IO_Type.Traverse_Run);
}
private void btnRollerRun_Click(object sender, EventArgs e)
{
BtnMove(btnRollerRun, "滚筒电机运转", "滚筒电机停止", IO_Type.Roller_Run);
}
} }
} }
source/DISTLineClient/FrmDISTClient.resx
此文件的差异太大，无法显示。
source/DISTLineClient/Properties/Resources.Designer.cs
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace OnlineStore.DISTLineClient.Properties { namespace DISTLineClient.Properties {
using System; using System;
...@@ -19,7 +19,7 @@ namespace OnlineStore.DISTLineClient.Properties { ...@@ -19,7 +19,7 @@ namespace OnlineStore.DISTLineClient.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。 // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。 // (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources { internal class Resources {
...@@ -39,7 +39,7 @@ namespace OnlineStore.DISTLineClient.Properties { ...@@ -39,7 +39,7 @@ namespace OnlineStore.DISTLineClient.Properties {
internal static global::System.Resources.ResourceManager ResourceManager { internal static global::System.Resources.ResourceManager ResourceManager {
get { get {
if (object.ReferenceEquals(resourceMan, null)) { if (object.ReferenceEquals(resourceMan, null)) {
global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("OnlineStore.DISTLineClient.Properties.Resources", typeof(Resources).Assembly); global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("DISTLineClient.Properties.Resources", typeof(Resources).Assembly);
resourceMan = temp; resourceMan = temp;
} }
return resourceMan; return resourceMan;
......
source/DISTLineClient/Properties/Settings.Designer.cs
...@@ -8,11 +8,11 @@ ...@@ -8,11 +8,11 @@
// </auto-generated> // </auto-generated>
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
namespace OnlineStore.DISTLineClient.Properties { namespace DISTLineClient.Properties {
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")] [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.6.0.0")]
internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
......
source/DISTLineClient/dist.ico 0 → 100644
此文件类型无法预览
source/DeviceLibrary/LineConfig/DISTLineConfig.csv
...@@ -3,38 +3,38 @@ PRO,IO模块对应的DI数量,IO_DILength,10.85.199.21#16,,,,,,, ...@@ -3,38 +3,38 @@ PRO,IO模块对应的DI数量,IO_DILength,10.85.199.21#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,10.85.199.21#16,,,,,,, PRO,模块对应的DO数量,IO_DOLength,10.85.199.21#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,10.85.199.21,,,,,,, PRO,IO模块IP,PRO_AOI_IP_1,10.85.199.21,,,,,,,
,,,,,,,,,, ,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X761,DI-01,0, DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X741,DI-01,0,
DI,分盘1线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘1线入口检测,X762,DI-02,0, DI,分盘1线入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,分盘1线入口检测,X742,DI-02,0,
DI,分盘1线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘1线阻挡检测,X763,DI-03,0, DI,分盘1线阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,分盘1线阻挡检测,X743,DI-03,0,
DI,分盘1线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘1线出口检测,X764,DI-04,0, DI,分盘1线出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,分盘1线出口检测,X744,DI-04,0,
DI,分盘2线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘2线入口检测,X765,DI-05,0, DI,分盘2线入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,分盘2线入口检测,X745,DI-05,0,
DI,分盘2线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘2线阻挡检测,X766,DI-06,0, DI,分盘2线阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,分盘2线阻挡检测,X746,DI-06,0,
DI,分盘2线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘2线出口检测,X767,DI-07,0, DI,分盘2线出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,分盘2线出口检测,X747,DI-07,0,
DI,分盘1线人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,分盘1线人工取料信号,X768,DI-08,0, DI,分盘1线人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,分盘1线人工取料信号,X748,DI-08,0,
,,,8,PRO_AOI_IP_1,0,,X769,DO-01,0, DI,分盘1线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘1线顶升上升端,X749,DI-09,0,
,,,9,PRO_AOI_IP_1,0,,X770,DO-02,0, DI,分盘1线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘1线顶升下降端,X750,DI-10,0,
,,,10,PRO_AOI_IP_1,0,,X771,DO-03,0, DI,分盘2线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘2线顶升上升端,X751,DI-11,0,
,,,11,PRO_AOI_IP_1,0,,X772,DO-04,0, DI,分盘2线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘2线顶升下降端,X752,DI-12,0,
,,,12,PRO_AOI_IP_1,0,,X773,DO-05,0, ,,,12,PRO_AOI_IP_1,0,,X753,DI-13,0,
,,,13,PRO_AOI_IP_1,0,,X774,DO-06,0, ,,,13,PRO_AOI_IP_1,0,,X754,DI-14,0,
,,,14,PRO_AOI_IP_1,0,,X775,DO-07,0, ,,,14,PRO_AOI_IP_1,0,,X755,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X776,DO-08,0, ,,,15,PRO_AOI_IP_1,0,,X756,DI-16,0,
DO,分盘1线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y762,DI-02,0, DO,分盘2线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘2线驱动电机运转,Y741,D0-01,0,
DO,分盘2线驱动电机运转,L2_Run,0,PRO_AOI_IP_1,0,分盘2线驱动电机运转,Y761,DI-01,0, DO,分盘1线驱动电机运转,L1_Run,1,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y742,DO-02,0,
DO,分盘1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘1线阻挡1下降,Y763,DI-03,0, DO,分盘1线阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,分盘1线阻挡1下降,Y743,DO-03,0,
DO,分盘1线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘1线出口阻挡下降,Y764,DI-04,0, DO,分盘1线出口阻挡下降,L1_OutStopDown,3,PRO_AOI_IP_1,0,分盘1线出口阻挡下降,Y744,DO-04,0,
DO,分盘2线阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘2线阻挡1下降,Y765,DI-05,0, DO,分盘2线阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,分盘2线阻挡1下降,Y745,DO-05,0,
DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y766,DI-06,0, DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DO-06,0,
,,,6,PRO_AOI_IP_1,0,,Y767,DI-07,0, DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,,Y747,DO-07,0,
,,,7,PRO_AOI_IP_1,0,,Y768,DI-08,0, DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,,Y748,DO-08,0,
,,,8,PRO_AOI_IP_1,0,,Y769,DO-01,0, DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,,Y749,DO-09,0,
,,,9,PRO_AOI_IP_1,0,,Y770,DO-02,0, DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,,Y750,DO-10,0,
,,,10,PRO_AOI_IP_1,0,,Y771,DO-03,0, ,,,10,PRO_AOI_IP_1,0,,Y751,DO-11,0,
,,,11,PRO_AOI_IP_1,0,,Y772,DO-04,0, ,,,11,PRO_AOI_IP_1,0,,Y752,DO-12,0,
,,,12,PRO_AOI_IP_1,0,,Y773,DO-05,0, ,,,12,PRO_AOI_IP_1,0,,Y753,DO-13,0,
,,,13,PRO_AOI_IP_1,0,,Y774,DO-06,0, ,,,13,PRO_AOI_IP_1,0,,Y754,DO-14,0,
,,,14,PRO_AOI_IP_1,0,,Y775,DO-07,0, ,,,14,PRO_AOI_IP_1,0,,Y755,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y776,DO-08,0, ,,,15,PRO_AOI_IP_1,0,,Y756,DO-16,0,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,, PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,分盘1线AGV节点名称,L1_AgvName,A8,,,,,,, PRO,分盘1线AGV节点名称,L1_AgvName,A8,,,,,,,
PRO,分盘2线AGV节点名称,L2_AgvName,A7,,,,,,, PRO,分盘2线AGV节点名称,L2_AgvName,A7,,,,,,,
......
source/DeviceLibrary/_system~.ini 0 → 100644
文件属性发生变化
source/DeviceLibrary/acDISTLine/DISTLineBean.cs
...@@ -36,7 +36,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -36,7 +36,7 @@ namespace OnlineStore.DeviceLibrary
mainTimer.Interval = 300; mainTimer.Interval = 300;
mainTimer.AutoReset = true; mainTimer.AutoReset = true;
mainTimer.Enabled = false; mainTimer.Enabled = false;
mainTimer.Elapsed +=timersTimer_Elapsed; mainTimer.Elapsed += timersTimer_Elapsed;
//添加调试 //添加调试
IsDebug = ConfigAppSettings.GetIntValue(Setting_Init.IsInDebug).Equals(1); IsDebug = ConfigAppSettings.GetIntValue(Setting_Init.IsInDebug).Equals(1);
...@@ -103,7 +103,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,7 +103,8 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
AgvClient.SetStatus(Config.L2_AgvName); AgvClient.SetStatus(Config.L2_AgvName);
AgvClient.SetStatus(Config.L1_AgvName); AgvClient.SetStatus(Config.L1_AgvName);
mainTimer.Enabled = true; mainTimer.Enabled = true;
...@@ -178,7 +179,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -178,7 +179,7 @@ namespace OnlineStore.DeviceLibrary
public void Alarm(AlarmType alarmType) public void Alarm(AlarmType alarmType)
{ {
if (this.alarmType.Equals(alarmType) && alarmType != AlarmType.SuddenStop ) if (this.alarmType.Equals(alarmType) && alarmType != AlarmType.SuddenStop)
{ {
return; return;
} }
...@@ -202,6 +203,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -202,6 +203,10 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_StopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW); IOManager.IOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
} }
private bool InProcess = false; private bool InProcess = false;
...@@ -270,9 +275,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -270,9 +275,13 @@ namespace OnlineStore.DeviceLibrary
{ {
TimeSpan span = DateTime.Now - ol_lastSendShelfTime; TimeSpan span = DateTime.Now - ol_lastSendShelfTime;
bool manualSig = IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH);
bool l1_up_sig = IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.HIGH);
bool l2_up_sig = IOManager.IOValue(IO_Type.L2_UpDown_Up_Sig).Equals(IO_VALUE.HIGH);
//如果出口无料架，持续1000以上，放开阻挡放出一个料架 //如果出口无料架，持续1000以上，放开阻挡放出一个料架
//每次放料架时间间隔3秒 //每次放料架时间间隔3秒
if (IOManager.IOValue(IO_Type.L2_StopCheck).Equals(IO_VALUE.HIGH)&&IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3) if (IOManager.IOValue(IO_Type.L2_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3)
{ {
//如果出料线体出口无料架，放一个料架到出口 //如果出料线体出口无料架，放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch, 1000)) if (LineManager.checkWatch(ol_noshelfWatch, 1000))
...@@ -283,7 +292,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -283,7 +292,8 @@ namespace OnlineStore.DeviceLibrary
StopIOMove(IO_Type.L2_StopDown, StopDownMS); StopIOMove(IO_Type.L2_StopDown, StopDownMS);
} }
} }
else if (IOManager.IOValue(IO_Type.L1_StopCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.LOW) && span.TotalSeconds > 3) else if (IOManager.IOValue(IO_Type.L1_StopCheck).Equals(IO_VALUE.HIGH) &&
IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.LOW) && !manualSig && !l1_up_sig && span.TotalSeconds > 3)
{ {
//如果出料线体出口无料架，放一个料架到出口 //如果出料线体出口无料架，放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch1, 1000)) if (LineManager.checkWatch(ol_noshelfWatch1, 1000))
...@@ -306,7 +316,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -306,7 +316,7 @@ namespace OnlineStore.DeviceLibrary
if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW)) if (IOManager.IOValue(IO_Type.L1_InCheck).Equals(IO_VALUE.LOW))
{ {
AgvClient.NeedEnter(Config.L1_AgvName, ""); AgvClient.NeedEnter(Config.L1_AgvName, "");
}else } else
{ {
AgvClient.SetToNone(Config.L1_AgvName, ""); AgvClient.SetToNone(Config.L1_AgvName, "");
} }
...@@ -354,29 +364,56 @@ namespace OnlineStore.DeviceLibrary ...@@ -354,29 +364,56 @@ namespace OnlineStore.DeviceLibrary
{ {
il_outstopCheckWarch.Stop(); il_outstopCheckWarch.Stop();
LogUtil.info(" 分盘2线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] "); LogUtil.info(" 分盘2线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] ");
AgvClient.SetToNone(Config.L2_AgvName, "" ); AgvClient.SetToNone(Config.L2_AgvName, "");
} }
//人工取料
//if(IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH))
//{
// if(IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH))
// {
// if(LineManager.checkWatch(il_manualCheckWatch,2000))
// {
// IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.HIGH);
// }
// }
//}
//else
//{
// il_manualCheckWatch.Stop();
// IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
//}
} }
private static void TranverseProcess()
{
LogUtil.info(" TranverseProcess");
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.LOW);
Thread.Sleep(1000);
IOManager.IOMove(IO_Type.Traverse_Up_SOL,IO_VALUE.HIGH);
Thread.Sleep(1000);
LogUtil.info(" 横移机构上升");
if (IOManager.IOValue(IO_Type.L1_UpDown_Up_Sig).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_UpDown_Up_Sig).Equals(IO_VALUE.HIGH))
{
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.HIGH);
LogUtil.info(" 滚筒电机、横移机构电机运行");
}
}
Stopwatch stopwatch = new Stopwatch();
stopwatch.Start();
while(IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
if(stopwatch.Elapsed.TotalMinutes >=1)
{
stopwatch.Stop();
IOManager.CIOMove(IO_Type.Traverse_Run, IO_VALUE.LOW);
IOManager.CIOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
//IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH);
//Thread.Sleep(1000);
//IOManager.IOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
//Thread.Sleep(1000);
LogUtil.info(" 横移机构转移料架超时 [" + IO_Type.L1_StopDown + "] [" + stopwatch.Elapsed.TotalMinutes + "] 秒");
break;
}
}
IOManager.IOMove(IO_Type.Traverse_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Roller_Run, IO_VALUE.LOW);
LogUtil.info(" 滚筒、横移电机停止");
IOManager.CIOMove(IO_Type.Traverse_Down_SOL, IO_VALUE.HIGH);
Thread.Sleep(1000);
IOManager.CIOMove(IO_Type.Traverse_Up_SOL, IO_VALUE.LOW);
Thread.Sleep(1000);
LogUtil.info(" 横移机构下降");
}
private Task TranverseTask = new Task(new Action(TranverseProcess));
//private void LedProcess() //private void LedProcess()
//{ //{
// try // try
...@@ -415,6 +452,31 @@ namespace OnlineStore.DeviceLibrary ...@@ -415,6 +452,31 @@ namespace OnlineStore.DeviceLibrary
public void IoCheckProcess() public void IoCheckProcess()
{ {
DateTime time = DateTime.Now; DateTime time = DateTime.Now;
//人工取料
if (IOManager.IOValue(IO_Type.L1_ManualRecSig).Equals(IO_VALUE.HIGH))
{
if (IOManager.IOValue(IO_Type.L1_OutCheck).Equals(IO_VALUE.HIGH) && IOManager.IOValue(IO_Type.L2_InCheck).Equals(IO_VALUE.LOW))
{
//if (LineManager.checkWatch(il_manualCheckWatch, 2000))
//{
// IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
// IOManager.IOMove(IO_Type.L1_OutStopDown, IO_VALUE.HIGH);
//}
if(TranverseTask.Status.Equals(TaskStatus.Created))
{
TranverseTask.Start();
}
else if(TranverseTask.IsCompleted)
{
TranverseTask.Start();
}
}
}
else
{
//IOManager.CIOMove(IO_Type.L1_OutStopDown, IO_VALUE.LOW);
//IOManager.IOMove(IO_Type.L1_StopDown, IO_VALUE.LOW);
}
//if (runStatus.Equals(RunStatus.Wait)) //if (runStatus.Equals(RunStatus.Wait))
//{ //{
// //获取新的Io状态 // //获取新的Io状态
......
source/DeviceLibrary/acDISTLine/DISTLineBean_Partial.cs
...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -155,7 +155,7 @@ namespace OnlineStore.DeviceLibrary
if (needCheckList.Count <= 0) if (needCheckList.Count <= 0)
{ {
needCheckList.Add(IO_Type.L1_InCheck); needCheckList.Add(IO_Type.L1_InCheck);
needCheckList.Add(IO_Type.L1_ManualRecSig); //needCheckList.Add(IO_Type.L1_ManualRecSig);
needCheckList.Add(IO_Type.L1_OutCheck); needCheckList.Add(IO_Type.L1_OutCheck);
needCheckList.Add(IO_Type.L1_OutStopDown); needCheckList.Add(IO_Type.L1_OutStopDown);
needCheckList.Add(IO_Type.L1_StopCheck); needCheckList.Add(IO_Type.L1_StopCheck);
......
source/LoadCVSLibrary/Config/bean/IO_Type.cs
...@@ -57,6 +57,26 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -57,6 +57,26 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
public static string L1_ManualRecSig = "L1_ManualRecSig"; public static string L1_ManualRecSig = "L1_ManualRecSig";
/// <summary>
/// DI,分盘1线顶升上升端,L1_UpDown_Up_Sig,8,PRO_AOI_IP_1,0,分盘1线顶升上升端,X749,DI-09,0,
/// </summary>
public static string L1_UpDown_Up_Sig = "L1_UpDown_Up_Sig";
/// <summary>
/// DI,分盘1线顶升下降端,L1_UpDown_Down_Sig,9,PRO_AOI_IP_1,0,分盘1线顶升下降端,X750,DI-10,0,
/// </summary>
public static string L1_UpDown_Down_Sig = "L1_UpDown_Down_Sig";
/// <summary>
/// DI,分盘2线顶升上升端,L2_UpDown_Up_Sig,10,PRO_AOI_IP_1,0,分盘2线顶升上升端,X751,DI-11,0,
/// </summary>
public static string L2_UpDown_Up_Sig = "L2_UpDown_Up_Sig";
/// <summary>
/// DI,分盘2线顶升下降端,L2_UpDown_Down_Sig,11,PRO_AOI_IP_1,0,分盘2线顶升下降端,X752,DI-12,0,
/// </summary>
public static string L2_UpDown_Down_Sig = "L2_UpDown_Down_Sig";
/// <summary> /// <summary>
/// DO,分盘1线驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y741,DI-01,0, /// DO,分盘1线驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,分盘1线驱动电机运转,Y741,DI-01,0,
...@@ -82,6 +102,23 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -82,6 +102,23 @@ namespace OnlineStore.LoadCSVLibrary
/// DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DI-06,0, /// DO,分盘2线出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,分盘2线出口阻挡下降,Y746,DI-06,0,
/// </summary> /// </summary>
public static string L2_OutStopDown = "L2_OutStopDown"; public static string L2_OutStopDown = "L2_OutStopDown";
/// <summary>
/// DO,分盘线横移机构上升SOL,Traverse_Up_SOL,6,PRO_AOI_IP_1,0,,Y747,DO-07,0,
/// </summary>
public static string Traverse_Up_SOL = "Traverse_Up_SOL";
/// <summary>
/// DO,分盘线横移机构下降SOL,Traverse_Down_SOL,7,PRO_AOI_IP_1,0,,Y748,DO-08,0,
/// </summary>
public static string Traverse_Down_SOL = "Traverse_Down_SOL";
/// <summary>
/// DO,分盘线横移电机运转,Traverse_Run,8,PRO_AOI_IP_1,0,,Y749,DO-09,0,
/// </summary>
public static string Traverse_Run = "Traverse_Run";
/// <summary>
/// DO,分盘线滚筒电机运转,Roller_Run,9,PRO_AOI_IP_1,0,,Y750,DO-10,0,
/// </summary>
public static string Roller_Run = "Roller_Run";
} }
public enum IO_VALUE public enum IO_VALUE
{ {
......
source/_system~.ini 0 → 100644
文件属性发生变化
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!