Skip to content

张东亮 / RC1250-BackFeedLine

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

1

1 个父辈 c742e9ee
全部展开
内嵌 并排
正在显示 12 个修改的文件 包含 91 行增加 和 96 行删除
dll/Asa.IOModule.AIOBOX-old.dll 0 → 100644
此文件类型无法预览
dll/Asa.IOModule.AIOBOX.xml
......@@ -55,7 +55,7 @@
自动读取AO事件触发
</summary>
</member>
<member name="M:Asa.IOModule.AIOBOX.#ctor">
<member name="M:Asa.IOModule.AIOBOX.#ctor(System.String)">
<summary>
AIOBOX
</summary>
......@@ -70,18 +70,6 @@
是否连接
</summary>
</member>
<member name="P:Asa.IOModule.AIOBOX.ErrInfo">
<summary>
错误信息
</summary>
</member>
<member name="M:Asa.IOModule.AIOBOX.LogPath(System.String,Asa.IOModule.LogType)">
<summary>
日志路径，连接前设置路径会自动保存日志
</summary>
<param name="path">文件夹路径</param>
<param name="type">输出类型</param>
</member>
<member name="M:Asa.IOModule.AIOBOX.SetInput(Asa.IOModule.Box_Type,System.Int32)">
<summary>
设置输入端
......@@ -286,6 +274,11 @@
监听结果线程
</summary>
</member>
<member name="M:Asa.IOModule.AIOBOX.TestMethod">
<summary>
测试方法锁
</summary>
</member>
<member name="T:Asa.IOModule.Box_Type">
<summary>
IO模块类型
......@@ -326,62 +319,5 @@
闭合，打开，高电平
</summary>
</member>
<member name="T:Asa.IOModule.LogType">
<summary>
日志类型
</summary>
</member>
<member name="F:Asa.IOModule.LogType.OnlyError">
<summary>
仅错误信息
</summary>
</member>
<member name="F:Asa.IOModule.LogType.All">
<summary>
所有
</summary>
</member>
<member name="T:Asa.IOModule.LogFile">
<summary>
日志操作类
</summary>
</member>
<member name="M:Asa.IOModule.LogFile.#ctor(System.String,System.String)">
<summary>
日志
</summary>
<param name="path">文件夹路径</param>
<param name="ip"></param>
</member>
<member name="M:Asa.IOModule.LogFile.Close">
<summary>
关闭文件
</summary>
</member>
<member name="M:Asa.IOModule.LogFile.OutError(System.String)">
<summary>
输出错误
</summary>
<param name="s"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutInfo(System.String)">
<summary>
输出信息
</summary>
<param name="s"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutData(System.String,System.Byte[])">
<summary>
输出数据
</summary>
<param name="tr"></param>
<param name="buff"></param>
</member>
<member name="M:Asa.IOModule.LogFile.OutData(System.String)">
<summary>
输出数据
</summary>
<param name="s"></param>
</member>
</members>
</doc>
source/BackFeedLine/App.config
......@@ -6,7 +6,7 @@
<appSettings>
<!--是否开机自动启动Feeder流水线-->
<add key="App_AutoRun" value="1" />
<add key="App_Title" value="Feeder线" />
<add key="App_Title" value="退料线" />
<!--Server address-->
<add key="http.server" value="http://10.85.160.25/myproject/" />
<!--storeType-->
......@@ -18,6 +18,7 @@
<add key="UseAIOBOX" value="1" />
<add key="DIMS" value="60" />
<add key="DOMS" value="300" />
<add key="RfidServer_Port" value="9999" />
<!--AGV调度服务器地址-->
<add key="AgvServerIp" value="10.85.199.20" />
<!--是否调试状态-->
......@@ -46,6 +47,21 @@
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<appender name="AIOBOX" type="log4net.Appender.RollingFileAppender">
<file value="logs/aio/AIOBOX.log"/>
<param name="Encoding" value="UTF-8" />
<param name="MaxSizeRollBackups" value="15"/>
<appendToFile value="true"/>
<rollingStyle value="Date"/>
<datePattern value="yyyy-MM-dd"/>
<layout type="log4net.Layout.PatternLayout">
<conversionPattern value="[%date][%t]%-5p %m%n" />
</layout>
</appender>
<logger name="AIOBOX">
<level value="Info" />
<appender-ref ref="AIOBOX" />
</logger>
<logger name="RollingLogFileAppender">
<level value="Info" />
<appender-ref ref="RollingLogFileAppender" />
......
source/Common/Common.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.Common</RootNamespace>
<AssemblyName>Common</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
source/DeviceLibrary/IO/AIOBOX/AIOBOXManager.cs
......@@ -86,20 +86,20 @@ namespace OnlineStore.DeviceLibrary
{
aioBox = new AIOBOX();
aioBox.LogPath(Application.StartupPath + @"\logs\aio\", LogType.OnlyError);
//aioBox.LogPath(Application.StartupPath + @"\logs\aio\", LogType.OnlyError);
aioBox.IP = ioIp;
aioBox.SetInput(Asa.IOModule.Box_Type.DI, DILength);
aioBox.SetOutput(Asa.IOModule.Box_Type.DO, DOLength);
//DI主动上传
aioBox.AutoReadInput(true);
aioBox.AutoReadInput(true, DIMS);
aioBox.AutoReadOutput(false, DOMS);
aioBox.DI_Changed_Event += AioBox_DI_Changed_Event; ;
aioBox.DO_Changed_Event += AioBox_DO_Changed_Event;
LogUtil.info("开始连接：" + logName + "：" + aioBox.ErrInfo);
LogUtil.info("开始连接：" + logName);
aioBox.Connect();
AIOMap.Add(ioIp, aioBox);
......@@ -268,7 +268,7 @@ namespace OnlineStore.DeviceLibrary
bool result = aioBox.WriteDO(StartAddress, GetBox_Sta(onOff));
if (!result)
{
LogUtil.error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 失败：" + aioBox.ErrInfo);
LogUtil.error("AIO WriteSingleDO [" + ioIp + "] [" + StartAddress + "] 失败");
}
}
else
......
source/DeviceLibrary/LineConfig/LineConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,192.168.103.28#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,192.168.103.28#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,192.168.103.28,,,,,,,
PRO,IO模块对应的DI数量,IO_DILength,10.85.197.1#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,10.85.197.1#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,10.85.197.1,,,,,,,
,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
DI,进料线体入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,进料线体入口检测,X02,DI-02,0,
DI,进料线体阻挡检测,L1_StopCheck,2,PRO_AOI_IP_1,0,进料线体阻挡检测,X03,DI-03,0,
DI,进料线体出口检测,L1_OutCheck,3,PRO_AOI_IP_1,0,进料线体出口检测,X04,DI-04,0,
DI,出料线体入口检测,L2_InCheck,4,PRO_AOI_IP_1,0,出料线体入口检测,X05,DI-05,0,
DI,出料线体阻挡检测,L2_StopCheck,5,PRO_AOI_IP_1,0,出料线体阻挡检测,X06,DI-06,0,
DI,出料线体出口检测,L2_OutCheck,6,PRO_AOI_IP_1,0,出料线体出口检测,X07,DI-07,0,
DI,进料线体人工取料信号,L1_ManualRecSig,7,PRO_AOI_IP_1,0,进料线体人工取料信号,X08,DI-08,0,
DI,入料线体顶升上升端,L1_Updown_Up_Sig,8,PRO_AOI_IP_1,0,入料线体顶升上升端,X09,DI-09,0,
DI,入料线体顶升下降端,L1_Updown_Down_Sig,9,PRO_AOI_IP_1,0,入料线体顶升下降端,X10,DI-10,0,类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
PRO,IO模块对应的DI数量,IO_DILength,10.85.197.1#16,,,,,,,
PRO,模块对应的DO数量,IO_DOLength,10.85.197.1#16,,,,,,,
PRO,IO模块IP,PRO_AOI_IP_1,10.85.197.1,,,,,,,
,,,,,,,,,,
DI,急停,SuddenStop_BTN,0,PRO_AOI_IP_1,0,急停,X01,DI-01,0,
DI,进料线体入口检测,L1_InCheck,1,PRO_AOI_IP_1,0,进料线体入口检测,X02,DI-02,0,
......@@ -15,7 +29,7 @@ DI,入料线体顶升上升端,L1_Updown_Up_Sig,8,PRO_AOI_IP_1,0,入料线体顶升上升端,X09,D
DI,入料线体顶升下降端,L1_Updown_Down_Sig,9,PRO_AOI_IP_1,0,入料线体顶升下降端,X10,DI-10,0,
DI,出料线体顶升上升端,L2_Updown_Up_Sig,10,PRO_AOI_IP_1,0,出料线体顶升上升端,X11,DI-11,0,
DI,出料线体顶升下降端,L2_Updown_Down_Sig,11,PRO_AOI_IP_1,0,出料线体顶升下降端,X12,DI-12,0,
,,,12,PRO_AOI_IP_1,0,,X13,DI-13,0,
DI,复位,Reset_BTN,12,PRO_AOI_IP_1,0,复位,X13,DI-13,0,
,,,13,PRO_AOI_IP_1,0,,X774,DI-14,0,
,,,14,PRO_AOI_IP_1,0,,X775,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X776,DI-16,0,
......@@ -25,9 +39,37 @@ DO,进料线体阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,进料线体阻挡1下降,Y03,DO-03,0,
DO,进料线体出口缓冲器,L1_OutStopDown,3,PRO_AOI_IP_1,0,进料线体出口缓冲器,Y04,DO-04,0,
DO,出料线体出口阻挡下降,L2_OutStopDown,4,PRO_AOI_IP_1,0,出料线体出口阻挡下降,Y05,DO-05,0,
DO,出料线体阻挡1下降,L2_StopDown,5,PRO_AOI_IP_1,0,出料线体阻挡1下降,Y06,DO-06,0,
DO,横移机构上升SOL,Tranverse_Up_SOL,6,PRO_AOI_IP_1,0,横移机构上升SOL,Y07,DO-07,0,
DO,横移机构下降SOL,Tranverse_Down_SOL,7,PRO_AOI_IP_1,0,横移机构下降SOL,Y08,DO-08,0,
DO,横移电机运转,Tranverse_Run,8,PRO_AOI_IP_1,0,横移电机运转,Y09,DO-09,0,
DO,横移电机运转,Tranverse_Run,6,PRO_AOI_IP_1,0,横移电机运转,Y07,DO-07,0,
DO,横移机构上升SOL,Tranverse_Up_SOL,7,PRO_AOI_IP_1,0,横移机构上升SOL,Y08,DO-08,0,
DO,横移机构下降SOL,Tranverse_Down_SOL,8,PRO_AOI_IP_1,0,横移机构下降SOL,Y09,DO-09,0,
,,,9,PRO_AOI_IP_1,0,,Y770,DO-10,0,
,,,10,PRO_AOI_IP_1,0,,Y771,DO-11,0,
,,,11,PRO_AOI_IP_1,0,,Y772,DO-12,0,
,,,12,PRO_AOI_IP_1,0,,Y773,DO-13,0,
,,,13,PRO_AOI_IP_1,0,,Y774,DO-14,0,
,,,14,PRO_AOI_IP_1,0,,Y775,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y776,DO-16,0,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,入料线体AGV节点名称,L1_AgvName,G23,,,,,,,
PRO,出料线体AGV节点名称,L2_AgvName,G24,,,,,,,
PRO,退料线出口RFIDIP,L2Out_RFIDIP,192.168.103.108,,,,,, ,
PRO,休眠秒数（秒）,SleepSeconds,40,,,,,,,
DI,出料线体顶升上升端,L2_Updown_Up_Sig,10,PRO_AOI_IP_1,0,出料线体顶升上升端,X11,DI-11,0,
DI,出料线体顶升下降端,L2_Updown_Down_Sig,11,PRO_AOI_IP_1,0,出料线体顶升下降端,X12,DI-12,0,
DI,复位,Reset_BTN,12,PRO_AOI_IP_1,0,复位,X13,DI-13,0,
,,,13,PRO_AOI_IP_1,0,,X774,DI-14,0,
,,,14,PRO_AOI_IP_1,0,,X775,DI-15,0,
,,,15,PRO_AOI_IP_1,0,,X776,DI-16,0,
DO,进料线体驱动电机运转,L1_Run,0,PRO_AOI_IP_1,0,进料线体驱动电机运转,Y01,DO-01,0,
DO,出料线体驱动电机运转,L2_Run,1,PRO_AOI_IP_1,0,出料线体驱动电机运转,Y02,DO-02,0,
DO,进料线体阻挡1下降,L1_StopDown,2,PRO_AOI_IP_1,0,进料线体阻挡1下降,Y03,DO-03,0,
DO,进料线体出口缓冲器,L1_OutStopDown,3,PRO_AOI_IP_1,0,进料线体出口缓冲器,Y04,DO-04,0,
DO,出料线体阻挡1下降,L2_StopDown,4,PRO_AOI_IP_1,0,出料线体阻挡1下降,Y05,DO-05,0,
DO,出料线体出口阻挡下降,L2_OutStopDown,5,PRO_AOI_IP_1,0,出料线体出口阻挡下降,Y06,DO-06,0,
DO,横移电机运转,Tranverse_Run,6,PRO_AOI_IP_1,0,横移电机运转,Y07,DO-07,0,
DO,横移机构上升SOL,Tranverse_Up_SOL,7,PRO_AOI_IP_1,0,横移机构上升SOL,Y08,DO-08,0,
DO,横移机构下降SOL,Tranverse_Down_SOL,8,PRO_AOI_IP_1,0,横移机构下降SOL,Y09,DO-09,0,
,,,9,PRO_AOI_IP_1,0,,Y770,DO-10,0,
,,,10,PRO_AOI_IP_1,0,,Y771,DO-11,0,
,,,11,PRO_AOI_IP_1,0,,Y772,DO-12,0,
......@@ -36,7 +78,7 @@ DO,横移电机运转,Tranverse_Run,8,PRO_AOI_IP_1,0,横移电机运转,Y09,DO-09,0,
,,,14,PRO_AOI_IP_1,0,,Y775,DO-15,0,
,,,15,PRO_AOI_IP_1,0,,Y776,DO-16,0,
PRO,IO信号超时时间（毫秒）,IOSingle_TimerOut,10000,,,,,,,
PRO,入料线体AGV节点名称,L1_AgvName,D3,,,,,,,
PRO,出料线体AGV节点名称,L2_AgvName,D4,,,,,,,
PRO,入料线体AGV节点名称,L1_AgvName,G23,,,,,,,
PRO,出料线体AGV节点名称,L2_AgvName,G24,,,,,,,
PRO,退料线出口RFIDIP,L2Out_RFIDIP,192.168.103.108,,,,,, ,
PRO,休眠秒数（秒）,SleepSeconds,60,,,,,,,
source/DeviceLibrary/acFeederLine/FeederLineBean.cs
......@@ -101,7 +101,8 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.L1_OutStopDown, 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.Tranverse_Up_SOL, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Tranverse_Down_SOL, IO_VALUE.HIGH);
mainTimer.Enabled = true;
serverConnectTimer.Enabled = true;
}
......@@ -283,7 +284,7 @@ namespace OnlineStore.DeviceLibrary
il_lastCallAgvTime = DateTime.Now;
//StopIOMove(IO_Type.InL_OutStopDown, StopDownMS);
LogUtil.info(" 退料2线体出口有料架" + LastOutShelfId + "，呼叫agv小车[" + Config.L2_AgvName + "] [NeedLeave] ");
LogUtil.info(" 出料线体出口有料架" + LastOutShelfId + "，呼叫agv小车[" + Config.L2_AgvName + "] [NeedLeave] ");
AgvClient.NeedLeave(Config.L2_AgvName, LastOutShelfId);
}
}
......@@ -304,7 +305,7 @@ namespace OnlineStore.DeviceLibrary
if (IOManager.IOValue(IO_Type.L2_OutCheck).Equals(IO_VALUE.LOW) && AgvClient.GetAction(Config.L2_AgvName).Equals(ClientAction.NeedLeave))
{
il_outstopCheckWarch.Stop();
LogUtil.info(" 分盘2线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] ");
LogUtil.info(" 出料线体出口无料架 ，更改[" + Config.L2_AgvName + "] 状态[None] ");
AgvClient.SetToNone(Config.L2_AgvName, "");
}
......@@ -329,7 +330,7 @@ namespace OnlineStore.DeviceLibrary
if (LineManager.checkWatch(ol_noshelfWatch, 1000))
{
IOManager.CIOMove(IO_Type.L2_OutStopDown, IO_VALUE.LOW);
LogUtil.info(" 退料2线体出口无料架，下降 [" + IO_Type.L2_StopDown + "] [" + StopDownMS + "] 毫秒");
LogUtil.info(" 出料线体出口无料架，下降 [" + IO_Type.L2_StopDown + "] [" + StopDownMS + "] 毫秒");
ol_lastSendShelfTime = DateTime.Now;
StopIOMove(IO_Type.L2_StopDown, StopDownMS);
}
......@@ -338,11 +339,11 @@ namespace OnlineStore.DeviceLibrary
&& l1_down_sig && span.TotalSeconds > 3)
{
//如果退料1出口无料架，放一个料架到出口
if (LineManager.checkWatch(ol_noshelfWatch1, 5000))
if (LineManager.checkWatch(ol_noshelfWatch1, 10000))
{
StopIOMove(IO_Type.L1_OutStopDown, StopDownMS);
//Thread.Sleep(1000);
LogUtil.info(" 退料1线体出口无料架，下降 [" + IO_Type.L1_StopDown + "] [" + StopDownMS*2 + "] 毫秒");
LogUtil.info(" 入料线体出口无料架，下降 [" + IO_Type.L1_StopDown + "] [" + StopDownMS*2 + "] 毫秒");
ol_lastSendShelfTime = DateTime.Now;
StopIOMove(IO_Type.L1_StopDown, StopDownMS*2);
}
......
source/LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.LoadCSVLibrary</RootNamespace>
<AssemblyName>LoadCSVLibrary</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
source/UserFromControl/Properties/Resources.Designer.cs
......@@ -19,7 +19,7 @@ namespace UserFromControl.Properties {
// 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
// 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
// (以 /str 作为命令选项)，或重新生成 VS 项目。
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
[global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
[global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
[global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
internal class Resources {
......@@ -47,8 +47,8 @@ namespace UserFromControl.Properties {
}
/// <summary>
/// 使用此强类型资源类，为所有资源查找
/// 重写当前线程的 CurrentUICulture 属性。
/// 重写当前线程的 CurrentUICulture 属性，对
/// 使用此强类型资源类的所有资源查找执行重写。
/// </summary>
[global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
internal static global::System.Globalization.CultureInfo Culture {
......
source/UserFromControl/UserFromControl.csproj
......@@ -9,7 +9,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>UserFromControl</RootNamespace>
<AssemblyName>UserFromControl</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!