agvclien增加cancelState的参数设置

dll/Client.xml

@@ -240,6 +240,11 @@
             小车已准备，对接完成
             </summary>
         </member>
+        <member name="E:Asa.Client2.CloseDoor">
+            <summary>
+            关门
+            </summary>
+        </member>
         <member name="E:Asa.Client2.Log">
             <summary>
             日志
@@ -256,6 +261,16 @@
             是否连接服务器
             </summary>
         </member>
+        <member name="P:Asa.Client2.CancelState">
+            <summary>
+            取消状态，true发送none，false发送实际状态
+            </summary>
+        </member>
+        <member name="P:Asa.Client2.SendLog">
+            <summary>
+            仅发送命令的代码日志
+            </summary>
+        </member>
         <member name="M:Asa.Client2.Connect">
             <summary>
             连接
@@ -371,6 +386,11 @@
             没有动作
             </summary>
         </member>
+        <member name="F:Asa.ClientAction.CloseDoor">
+            <summary>
+            包装料仓关门
+            </summary>
+        </member>
         <member name="F:Asa.ClientAction.MayEnter">
             <summary>
             可以进入料架，Arrive事件使用，让小车开始对接

source/DeviceLibrary/acVmiLine/VMILineBean.cs

@@ -55,6 +55,7 @@ namespace OnlineStore.DeviceLibrary
                 mainTimer.Enabled = true;
             }
 
+            AgvClient.Init();
             Thread.Sleep(300); 
             IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
             IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
@@ -73,8 +74,9 @@ namespace OnlineStore.DeviceLibrary
                 //急停按钮和气压检测需要一起判断 
                 //    if (!AgvClient.ISConnected())
                 //  {
-                AgvClient.Init();
+
                 //}
+                AgvClient.SetCancelState(false);
                 RFIDManager.Open(new string[] { Config.InL_In_RFIDIP, Config.InL_Out_RFIDIP });
                 runStatus = RunStatus.HomeMoving;
                 MoveInfo.NewMove(LineMoveType.ReturnHome);
@@ -166,8 +168,9 @@ namespace OnlineStore.DeviceLibrary
         public void StopRun()
         {
             WarnMsg = "";
+           
             RFIDManager.Close();
-            AgvClient.Dispose();
+            AgvClient.SetCancelState(true);
             mainTimer.Enabled = false;
             serverConnectTimer.Enabled = false;
             StopMove(); 

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -27,11 +27,11 @@ namespace OnlineStore.DeviceLibrary
                 {
                     isInit = true;
                     agvClient = new Asa.Client2(ServerIp);
+                    agvClient.CancelState = true;
                     agvClient.Log += AgvClient_Log;
                     agvClient.Arrive += AgvClient_Arrive; 
-                    // agvClient.CanEnter += AgvClient_CanEnter;
                     agvClient.Ready += AgvClient_Ready;
-                    //agvClient.GetRFID += AgvClient_GetRFID;
+                    agvClient.CloseDoor += AgvClient_CloseDoor;
                 }
                 actionMap = new Dictionary<string, Asa.ClientAction>();
                 foreach (string key in NodeList)
@@ -52,6 +52,16 @@ namespace OnlineStore.DeviceLibrary
             }
         }
 
+        public static void SetCancelState(bool isCancel)
+        {
+            agvClient.CancelState = isCancel;
+        }
+        private static void AgvClient_CloseDoor(string id, byte[] content)
+        {
+            RFIDData data = new RFIDData(content);
+            LogUtil.info("收到 AgvClient_CloseDoor [" + id + "] [" + data.NumStr() + "]  ");
+        }
+
         public static void SetStatus(string id, string shelfId = "", ClientAction action = ClientAction.None, ClientLevel level = ClientLevel.Low)
         {
             ClientAction currA = GetAction(id);

source/VMILineClient/FrmVMIClient.cs

@@ -224,7 +224,7 @@ namespace OnlineStore.VMILineClient
 
                 IOManager.instance.CloseAllDO();
                 IOManager.instance.CloseAllConnection();
-
+                AgvClient.Dispose();
                 System.Environment.Exit(System.Environment.ExitCode);
             }
             catch (Exception ex)

source/VMILineClient/记录.txt

@@ -2,3 +2,8 @@
 
 20200217
 Mayleave、MayEnter是包装料仓的，开了门后发，环形线和VMI是不用的。状态不需要重复设置。
+
+
+20200220
+agvclien增加cancelState的参数设置
+