agv更新

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/AssemblyLineClient/App.config

@@ -69,7 +69,7 @@
       </layout>
     </appender>
     <appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
-      <file value="logs/TheRFID.log"/>
+      <file value="logs/TheRFID-line.log"/>
       <param name="Encoding" value="UTF-8" />
       <appendToFile value="true"/>
       <rollingStyle value="Date"/>
@@ -87,6 +87,8 @@
       <level value="Debug" />
       <appender-ref ref="TheRFID" />
     </logger>
+   
+     
     <!--<root>
       <level value="Info" />
       <appender-ref ref="RollingLogFileAppender" />

source/DeviceLibrary/agvClient/AgvClient.cs

@@ -33,8 +33,7 @@ namespace OnlineStore.DeviceLibrary
                 agvClient.CanEnter += AgvClient_CanEnter;
                 agvClient.Ready += AgvClient_Ready;
 
-                agvClient.Connect();
-                agvClient.SetNodeID(NodeList.ToArray());
+                agvClient.Connect(NodeList.ToArray()); 
             }
             catch (Exception ex)
             {

source/DeviceLibrary/assemblyLine/LineBean.cs

@@ -886,8 +886,7 @@ namespace OnlineStore.DeviceLibrary
             msg += "runS： "+ runStatus + "\n";
             msg += "lineS： "+ lineStatus + "\n";
             msg += "alarm：  " + alarmType + "\n";
-            msg += "MoveT：" + MoveInfo.MoveType + "\n";
-            msg += "MoveS： " + MoveInfo.SLog + "\n";
+            msg += "Move：" + MoveInfo.MoveType + "  " + MoveInfo.SLog + "\n"; 
             msg += "SW41： "+ SW41_MoveInfo.MoveType + "  "+ SW41_MoveInfo.MoveStep + "\n"; 
             msg += "SW23： " + SW23_MoveInfo.MoveType + "  " + SW23_MoveInfo.MoveStep + "\n"; 
             return msg;

source/DeviceLibrary/assemblymanager/RFIDManagercs.cs

@@ -112,7 +112,7 @@ namespace OnlineStore.DeviceLibrary
             {
                 //LogUtil.error("ReadRFID["+ip+"]出错：",ex);
             }
-            return new RFIDData(-1, -1);
+            return new RFIDData( );
         }
 
         public static string GetRFIP(int subType, int rtType = 0)
@@ -147,14 +147,14 @@ namespace OnlineStore.DeviceLibrary
         /// <summary>
         /// RFID类型，区分是料架还是托盘，托盘E=69,包装料料架A=65，料串=B
         /// </summary>
-        public char RFType = 'E';
+        public char RFType = '0';
         /// <summary>
         /// 托盘编号，从1-32
         /// </summary>
         public int Num = 0;
 
 
-        public RFIDData(int num, int t)
+        public RFIDData(int num=0, int t=0)
         {
             if (t < 65)
             {

source/DeviceLibrary/deviceLibrary/RFID/RFID.cs

@@ -268,7 +268,7 @@ namespace Asa.RFID
         {
             byte[] data = lastData;
             lastData = new byte[8];
-            LOGGER.Info("Read and clear RFID[" + IP + "] data:" + byteToStr(data, data.Length));
+            LOGGER.Debug("Read and clear RFID[" + IP + "] data:" + byteToStr(data, data.Length));
             return data;
         }