1

source/DeviceLibrary/ACPackingStore/AC_BOX_Bean.cs

@@ -141,7 +141,7 @@ namespace OnlineStore.DeviceLibrary
                 return false;
                 return false;
             }
             }
             LogInfo("开始启动，启动时间：" + StartTime.ToString());
             LogInfo("开始启动，启动时间：" + StartTime.ToString());
-            if (IsDebug)
+         //   if (IsDebug)
             {
             {
                 //连接AGV调度
                 //连接AGV调度
                 if (!AgvClient.ISConnected())
                 if (!AgvClient.ISConnected())

source/DeviceLibrary/DeviceLibrary.csproj

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

source/DeviceLibrary/device/RFID/RFIDManager.cs

@@ -17,7 +17,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
-                RFIDReader.Open(iparray);
+                RFIDAutoReader.Open(null,iparray);
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {
@@ -32,8 +32,15 @@ namespace OnlineStore.DeviceLibrary
                 if (String.IsNullOrEmpty(ip).Equals(false))
                 if (String.IsNullOrEmpty(ip).Equals(false))
                 {
                 {
                     byte[] bdata = null;
                     byte[] bdata = null;
+                    if (isClear)
+                    {
+                        bdata = RFIDAutoReader.ReadAndClear(ip);
+                    }
+                    else
+                    {
 
 
-                    bdata = RFIDReader.Read(ip, isClear);
+                        bdata = RFIDAutoReader.Read(ip);
+                    }
 
 
                     if (bdata == null)
                     if (bdata == null)
                     {
                     {
@@ -55,7 +62,7 @@ namespace OnlineStore.DeviceLibrary
         {
         {
             try
             try
             {
             {
-                RFIDReader.CloseAll();
+                RFIDAutoReader.CloseAll();
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {