rfid修改

dll/Client.xml

@@ -230,11 +230,6 @@
             </summary>
             <param name="s"></param>
         </member>
-        <member name="E:Asa.Client2.GetRFID">
-            <summary>
-            服务端发送的RFID
-            </summary>
-        </member>
         <member name="E:Asa.Client2.Arrive">
             <summary>
             小车到达，仅包装料仓
@@ -281,13 +276,6 @@
             <param name="action"></param>
             <param name="level"></param>
         </member>
-        <member name="M:Asa.Client2.Reconnect">
-            <summary>
-            发送RFID
-            </summary>
-            <param name="name"></param>
-            <param name="content"></param>
-        </member>
         <member name="M:Asa.Client2.Splice(Asa.ClientNode)">
             <summary>
             拼接命令
@@ -385,12 +373,12 @@
         </member>
         <member name="F:Asa.ClientAction.MayEnter">
             <summary>
-            可以进入料架（包装料仓）
+            可以进入料架，Arrive事件使用，让小车开始对接
             </summary>
         </member>
         <member name="F:Asa.ClientAction.MayLeave">
             <summary>
-            可以出去料架（包装料仓）
+            可以出去料架，Arrive事件使用，让小车开始对接
             </summary>
         </member>
         <member name="F:Asa.ClientAction.NeedEnter">
@@ -415,12 +403,12 @@
         </member>
         <member name="F:Asa.ClientAction.Arrive">
             <summary>
-            小车到达
+            小车到达，到达包装料仓门口，等待开门
             </summary>
         </member>
         <member name="F:Asa.ClientAction.Ready">
             <summary>
-            小车已准备好
+            小车已准备，已对接上流水线
             </summary>
         </member>
         <member name="T:Asa.ClientLevel">

dll/RFID/ReadMe.txt

+1.0.0.0  2019-11-19
+1、钉盘上传
\ No newline at end of file

source/ACPackingStore/FrmRFIPEdit.Designer.cs

@@ -205,6 +205,7 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Name = "FrmRFIPEdit";
             this.Text = "托盘编码";
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FrmRFIPEdit_FormClosed);
             this.Load += new System.EventHandler(this.FrmPwd_Load);
             ((System.ComponentModel.ISupportInitialize)(this.numNum)).EndInit();
             this.groupBox2.ResumeLayout(false);

source/ACPackingStore/FrmRFIPEdit.cs

@@ -36,9 +36,17 @@ namespace OnlineStore.ACPackingStore
             comboxType.SelectedIndex = 0;
             comType.SelectedIndex = 0;
 
-            string hostN = Dns.GetHostName();
-            IPAddress[] addresss = Dns.GetHostAddresses(hostN);
+            List<string> List = new List<string>();
+            List = new List<string>(rfMap.Values);
 
+            if (StoreManager.Store.storeRunStatus <= StoreRunStatus.Wait)
+            {
+                Task.Factory.StartNew(delegate
+                {
+                    LogUtil.info(Name + "RFIDManager.Open");
+                    RFIDManager.Open(List.ToArray());
+                });
+            }
         } 
 
         private void btnBack_Click(object sender, EventArgs e)
@@ -79,5 +87,16 @@ namespace OnlineStore.ACPackingStore
                 }
             }
         }
+        private void FrmRFIPEdit_FormClosed(object sender, FormClosedEventArgs e)
+        {
+            if (StoreManager.Store.storeRunStatus <= StoreRunStatus.Wait)
+            {
+                Task.Factory.StartNew(delegate
+                {
+                    LogUtil.info(Name + "RFIDManager.Close");
+                    RFIDManager.Close();
+                });
+            }
+        }
     }
 }

source/DeviceLibrary/DeviceLibrary.csproj

@@ -83,9 +83,8 @@
     <Compile Include="device\PanasonicServo\ACCMDManager.cs" />
     <Compile Include="device\PanasonicServo\ACServerManager.cs" />
     <Compile Include="device\PanasonicServo\ACServerManager_Partial.cs" />
-    <Compile Include="device\RFID\RFIDAuto.cs" />
     <Compile Include="device\RFID\RFIDManager.cs" />
-    <Compile Include="device\RFID\RFIDAutoReader.cs" />
+    <Compile Include="device\RFID\RFIDReader.cs" />
     <Compile Include="store\AutoInoutInfo.cs" />
     <Compile Include="store\LineMoveP.cs" />
     <Compile Include="store\LineAlarm.cs">

source/DeviceLibrary/device/RFID/RFIDManager.cs

@@ -17,8 +17,9 @@ namespace OnlineStore.DeviceLibrary
         {
             try
             {
-                RFIDAutoReader.Open(null, iparray);
-            }catch(Exception ex)
+                RFIDReader.Open(iparray);
+            }
+            catch (Exception ex)
             {
                 LogUtil.error("Open 出错：" + ex.ToString());
             }
@@ -31,14 +32,9 @@ namespace OnlineStore.DeviceLibrary
                 if (String.IsNullOrEmpty(ip).Equals(false))
                 {
                     byte[] bdata = null;
-                    if (isClear)
-                    {
-                        bdata = RFIDAutoReader.ReadAndClear(ip);
-                    }
-                    else
-                    {
-                        bdata = RFIDAutoReader.Read(ip);
-                    }
+
+                    bdata = RFIDReader.Read(ip, isClear);
+
                     if (bdata == null)
                     {
                         LogUtil.error("RFID [ " + ip + " ] 读到数据=null");
@@ -59,7 +55,7 @@ namespace OnlineStore.DeviceLibrary
         {
             try
             {
-                RFIDAutoReader.CloseAll();
+                RFIDReader.CloseAll();
             }
             catch (Exception ex)
             {
@@ -77,7 +73,7 @@ namespace OnlineStore.DeviceLibrary
         public int Num = 0;
 
 
-        public RFIDData(int num=0, int t=0)
+        public RFIDData(int num = 0, int t = 0)
         {
             if (t < 65)
             {