Skip to content

孙克 / RC1250-VMILineClient

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

1

1 个父辈 d4684acd
内嵌 并排
正在显示 5 个修改的文件 包含 26 行增加 和 36 行删除
dll/Client.dll
此文件类型无法预览
dll/Client.xml
...@@ -60,11 +60,6 @@ ...@@ -60,11 +60,6 @@
日志 日志
</summary> </summary>
</member> </member>
<member name="P:Asa.Client.ErrInfo">
<summary>
错误信息
</summary>
</member>
<member name="P:Asa.Client.IsConn"> <member name="P:Asa.Client.IsConn">
<summary> <summary>
是否连接服务器 是否连接服务器
...@@ -81,24 +76,17 @@ ...@@ -81,24 +76,17 @@
</summary> </summary>
<param name="serverIP">服务器IP地址</param> <param name="serverIP">服务器IP地址</param>
</member> </member>
<member name="M:Asa.Client.Connect"> <member name="M:Asa.Client.Connect(System.String[])">
<summary> <summary>
连接 连接
</summary> </summary>
<returns></returns> <param name="id"></param>
</member> </member>
<member name="M:Asa.Client.Close"> <member name="M:Asa.Client.Close">
<summary> <summary>
关闭 关闭
</summary> </summary>
</member> </member>
<member name="M:Asa.Client.SetNodeID(System.String[])">
<summary>
连接后设置节点ID
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:Asa.Client.SendRFID(System.String,System.String)"> <member name="M:Asa.Client.SendRFID(System.String,System.String)">
<summary> <summary>
发送RFID信息 发送RFID信息
...@@ -107,11 +95,12 @@ ...@@ -107,11 +95,12 @@
<param name="s"></param> <param name="s"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.NeedEnter(System.String)"> <member name="M:Asa.Client.NeedEnter(System.String,System.String)">
<summary> <summary>
需要进入料架 需要进入料架（包装料仓）
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<param name="mark"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.NeedLeave(System.String)"> <member name="M:Asa.Client.NeedLeave(System.String)">
...@@ -149,12 +138,11 @@ ...@@ -149,12 +138,11 @@
<param name="id"></param> <param name="id"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.IsEnter(System.String,System.Boolean)"> <member name="M:Asa.Client.IsEnter(System.String)">
<summary> <summary>
是否可以进入，仅用于CanEnter事件 是否可以进入，仅用于CanEnter事件
</summary> </summary>
<param name="id"></param> <param name="id">节点，可以多个</param>
<param name="val"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.Send(System.Byte[])"> <member name="M:Asa.Client.Send(System.Byte[])">
......
source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -37,8 +37,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -37,8 +37,8 @@ namespace OnlineStore.DeviceLibrary
actionMap.Add(key, AGVAction.None); actionMap.Add(key, AGVAction.None);
} }
agvClient.Connect(); agvClient.Connect(NodeList.ToArray());
agvClient.SetNodeID(NodeList.ToArray());
} }
catch (Exception ex) catch (Exception ex)
{ {
...@@ -69,7 +69,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -69,7 +69,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LineManager.VMILine.StopIOMove(IO_Type.InL_OutStopDown); LineManager.VMILine.StopIOMove(IO_Type.InL_OutStopDown);
agvClient.MayLeave(id); agvClient.MayLeave(id);
LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] 调用 MayLeave "); LogUtil.info("收到 AgvClient_Ready [" + id + "] [" + data.ToData() + "] ，下降 InL_OutStopDown 600ms，调用 MayLeave ");
} }
} }
} }
......
source/VMILineClient/App.config
...@@ -7,23 +7,21 @@ ...@@ -7,23 +7,21 @@
<!--是否开机自动启动VMI流水线--> <!--是否开机自动启动VMI流水线-->
<add key="App_AutoRun" value="1" /> <add key="App_AutoRun" value="1" />
<add key="App_Title" value="VMI总仓进出料架缓存线" /> <add key="App_Title" value="VMI总仓进出料架缓存线" />
<!--Server address--> <!--Server address-->
<add key="http.server" value="http://192.168.101.11/myproject/" /> <add key="http.server" value="http://10.85.160.25/myproject/" />
<!--storeType--> <!--storeType-->
<add key="store_count" value="1" /> <add key="store_count" value="1" />
<!--start one store config--> <!--start one store config-->
<add key="Line_Config" value="\LineConfig\VMILineConfig.csv" /> <add key="Line_Config" value="\LineConfig\VMILineConfig.csv" />
<add key="Config_Pwd" value="123456" /> <add key="Config_Pwd" value="123456" />
<!--IO配置--> <!--IO配置-->
<add key="UseAIOBOX" value="1" /> <add key="UseAIOBOX" value="1" />
<add key ="DIMS" value ="60"/> <add key="DIMS" value="60" />
<add key ="DOMS" value ="300"/> <add key="DOMS" value="300" />
<!--AGV调度服务器地址--> <!--AGV调度服务器地址-->
<add key="AgvServerIp" value="192.168.103.12" /> <add key="AgvServerIp" value="192.168.103.12" />
<!--是否调试状态--> <!--是否调试状态-->
<add key="IsInDebug" value="1" /> <add key="IsInDebug" value="1" />
<add key ="Agv_Log_Open" value ="1"/> <add key ="Agv_Log_Open" value ="1"/>
</appSettings> </appSettings>
<log4net> <log4net>
...@@ -53,13 +51,13 @@ ...@@ -53,13 +51,13 @@
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender" />
</logger> </logger>
<logger name="TheRFID"> <logger name="TheRFID">
<level value="Debug" /> <level value="Error" />
<appender-ref ref="TheRFID" /> <appender-ref ref="TheRFID" />
</logger> </logger>
<root> <!-- <root> -->
<level value="Info" /> <!-- <level value="Info" /> -->
<appender-ref ref="RollingLogFileAppender" /> <!-- <appender-ref ref="RollingLogFileAppender" /> -->
</root> <!-- </root> -->
</log4net> </log4net>
<startup> <startup>
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /> <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
......
source/VMILineClient/FrmVMIClient.cs
...@@ -146,6 +146,9 @@ namespace OnlineStore.VMILineClient ...@@ -146,6 +146,9 @@ namespace OnlineStore.VMILineClient
else if (vmiLine.StartRun()) else if (vmiLine.StartRun())
{ {
btnVmiStart.Text = "复位"; btnVmiStart.Text = "复位";
}else
{
btnVmiStart.Text = "启动";
} }
} }
...@@ -156,6 +159,7 @@ namespace OnlineStore.VMILineClient ...@@ -156,6 +159,7 @@ namespace OnlineStore.VMILineClient
if (vmiLine.runStatus >= RunStatus.HomeMoving) if (vmiLine.runStatus >= RunStatus.HomeMoving)
{ {
vmiLine.StopRun(); vmiLine.StopRun();
btnVmiStart.Text = "启动";
} }
else else
{ {
...@@ -390,14 +394,14 @@ namespace OnlineStore.VMILineClient ...@@ -390,14 +394,14 @@ namespace OnlineStore.VMILineClient
private void btnStopTDown_Click(object sender, EventArgs e) private void btnStopTDown_Click(object sender, EventArgs e)
{ {
int value = (int)numericUpDown1.Value; int value = (int)numericUpDown1.Value;
string iotype = IO_Type.OutL_InStopDown; string iotype = IO_Type.InL_InStopDown;
if (cmbStopList.SelectedIndex.Equals(1)) if (cmbStopList.SelectedIndex.Equals(1))
{ {
iotype = IO_Type.OutL_OutStopDown; iotype = IO_Type.InL_OutStopDown;
} }
else if (cmbStopList.SelectedIndex.Equals(2)) else if (cmbStopList.SelectedIndex.Equals(2))
{ {
iotype = IO_Type.InL_InStopDown; iotype = IO_Type.OutL_InStopDown;
} }
vmiLine.StopIOMove(iotype, value); vmiLine.StopIOMove(iotype, value);
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!