1

dll/Client.xml

@@ -60,11 +60,6 @@
             日志
             </summary>
         </member>
-        <member name="P:Asa.Client.ErrInfo">
-            <summary>
-            错误信息
-            </summary>
-        </member>
         <member name="P:Asa.Client.IsConn">
             <summary>
             是否连接服务器
@@ -81,24 +76,17 @@
             </summary>
             <param name="serverIP">服务器IP地址</param>
         </member>
-        <member name="M:Asa.Client.Connect">
+        <member name="M:Asa.Client.Connect(System.String[])">
             <summary>
             连接
             </summary>
-            <returns></returns>
+            <param name="id"></param>
         </member>
         <member name="M:Asa.Client.Close">
             <summary>
             关闭
             </summary>
         </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)">
             <summary>
             发送RFID信息
@@ -107,11 +95,12 @@
             <param name="s"></param>
             <returns></returns>
         </member>
-        <member name="M:Asa.Client.NeedEnter(System.String)">
+        <member name="M:Asa.Client.NeedEnter(System.String,System.String)">
             <summary>
-            需要进入料架
+            需要进入料架（包装料仓）
             </summary>
             <param name="id"></param>
+            <param name="mark"></param>
             <returns></returns>
         </member>
         <member name="M:Asa.Client.NeedLeave(System.String)">
@@ -149,12 +138,11 @@
             <param name="id"></param>
             <returns></returns>
         </member>
-        <member name="M:Asa.Client.IsEnter(System.String,System.Boolean)">
+        <member name="M:Asa.Client.IsEnter(System.String)">
             <summary>
             是否可以进入，仅用于CanEnter事件
             </summary>
-            <param name="id"></param>
-            <param name="val"></param>
+            <param name="id">节点，可以多个</param>
             <returns></returns>
         </member>
         <member name="M:Asa.Client.Send(System.Byte[])">

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -37,8 +37,8 @@ namespace OnlineStore.DeviceLibrary
                     actionMap.Add(key, AGVAction.None);
                 }
 
-                agvClient.Connect();
-                agvClient.SetNodeID(NodeList.ToArray());
+                agvClient.Connect(NodeList.ToArray());
+
             }
             catch (Exception ex)
             {
@@ -69,7 +69,7 @@ namespace OnlineStore.DeviceLibrary
                 {
                     LineManager.VMILine.StopIOMove(IO_Type.InL_OutStopDown);
                     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 @@
     <!--是否开机自动启动VMI流水线-->
     <add key="App_AutoRun" value="1" />
     <add key="App_Title" value="VMI总仓进出料架缓存线" />
-    
     <!--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-->
     <add key="store_count" value="1" />
     <!--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" />
     <!--IO配置-->
     <add key="UseAIOBOX" value="1" />
-    <add key ="DIMS" value ="60"/>
-    <add key ="DOMS" value ="300"/>
+    <add key="DIMS" value="60" />
+    <add key="DOMS" value="300" />
     <!--AGV调度服务器地址-->
     <add key="AgvServerIp" value="192.168.103.12" />
     <!--是否调试状态-->
     <add key="IsInDebug" value="1" />
-
     <add key ="Agv_Log_Open" value ="1"/>
   </appSettings>
   <log4net>
@@ -53,13 +51,13 @@
       <appender-ref ref="RollingLogFileAppender" />
     </logger>
     <logger name="TheRFID">
-      <level value="Debug" />
+      <level value="Error" />
       <appender-ref ref="TheRFID" />
     </logger>
-    <root>
-      <level value="Info" />
-      <appender-ref ref="RollingLogFileAppender" />
-    </root>
+    <!-- <root> -->
+    <!-- <level value="Info" /> -->
+    <!-- <appender-ref ref="RollingLogFileAppender" /> -->
+    <!-- </root> -->
   </log4net>
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />

source/VMILineClient/FrmVMIClient.cs

@@ -146,6 +146,9 @@ namespace OnlineStore.VMILineClient
             else if (vmiLine.StartRun())
             {
                 btnVmiStart.Text = "复位";
+            }else
+            { 
+                btnVmiStart.Text = "启动";
             }
         }
 
@@ -156,6 +159,7 @@ namespace OnlineStore.VMILineClient
                 if (vmiLine.runStatus >= RunStatus.HomeMoving)
                 {
                     vmiLine.StopRun();
+                    btnVmiStart.Text = "启动";
                 }
                 else
                 {
@@ -390,14 +394,14 @@ namespace OnlineStore.VMILineClient
         private void btnStopTDown_Click(object sender, EventArgs e)
         {
             int value = (int)numericUpDown1.Value;
-            string iotype = IO_Type.OutL_InStopDown;
+            string iotype = IO_Type.InL_InStopDown;
             if (cmbStopList.SelectedIndex.Equals(1))
             {
-                iotype = IO_Type.OutL_OutStopDown;
+                iotype = IO_Type.InL_OutStopDown;
             }
             else if (cmbStopList.SelectedIndex.Equals(2))
             {
-                iotype = IO_Type.InL_InStopDown;
+                iotype = IO_Type.OutL_InStopDown;
             }
             vmiLine.StopIOMove(iotype, value);
         }