1

dll/RFID/Asa.RFID.xml

@@ -44,11 +44,6 @@
             是否存在ID卡
             </summary>
         </member>
-        <member name="P:Asa.RFID.Reader.ID">
-            <summary>
-            ID号码
-            </summary>
-        </member>
         <member name="M:Asa.RFID.Reader.Connect">
             <summary>
             连接
@@ -68,16 +63,16 @@
         </member>
         <member name="M:Asa.RFID.Reader.AutoScan(System.Boolean,System.Int32)">
             <summary>
-            自动读取扫描
+            自动读取扫描，使用查找模式
             </summary>
-            <param name="mode">扫描模式，true扫描</param>
+            <param name="open">扫描模式开启，true扫描</param>
             <param name="time">间隔时间</param>
         </member>
-        <member name="M:Asa.RFID.Reader.AutoScan2(System.Boolean)">
+        <member name="M:Asa.RFID.Reader.AutoScan(System.Boolean)">
             <summary>
-            自动扫描，正在测试，不要使用
+            自动读取扫描，使用扫描模式，扫描模式只读
             </summary>
-            <param name="mode"></param>
+            <param name="open">扫描模式开启，true扫描</param>
             <returns></returns>
         </member>
         <member name="M:Asa.RFID.Reader.Read">

source/DeviceLibrary/deviceLibrary/RFID/RFIDManager.cs

@@ -96,6 +96,7 @@ namespace OnlineStore.DeviceLibrary
                     bool result = rfidReader.Connect();
                     if (result)
                     {
+                        rfidReader.AutoScan(true);
                         LogUtil.info("第【" + i + "】次连接 " + logName + " 成功：");
                         Thread.Sleep(10);
 

source/LoadCVSLibrary/storeConfig/ConfigItemBase.cs

@@ -32,7 +32,7 @@ namespace OnlineStore.LoadCSVLibrary
         /// 属性值
         /// </summary>
         [CSVAttribute("属性值")]
-        public string ProVale { get; set; }
+        public string ProValue { get; set; }
         /// <summary>
         /// 分类编号
         /// </summary>
@@ -49,7 +49,7 @@ namespace OnlineStore.LoadCSVLibrary
             }
             try
             {
-                value = (ushort)Convert.ToInt32(ProVale);
+                value = (ushort)Convert.ToInt32(ProValue);
             }
             catch (Exception ex)
             {
@@ -59,11 +59,11 @@ namespace OnlineStore.LoadCSVLibrary
         }
         public virtual int GetValue()
         {
-            if (ProVale.Equals(""))
+            if (ProValue.Equals(""))
             {
                 return -1;
             }
-            return Convert.ToInt32(ProVale);
+            return Convert.ToInt32(ProValue);
         }
         public override string ToString()
         {
@@ -73,9 +73,9 @@ namespace OnlineStore.LoadCSVLibrary
 
         public virtual void CheckField()
         {
-            if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) ||   String.IsNullOrEmpty(ProVale))
+            if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) ||   String.IsNullOrEmpty(ProValue))
             {
-                throw new CVSFieldNotMatchingExection(ToString() + "，【类型："+ProType+"】【名称："+ProName+"】【属性值："+ProVale+"】必须配置值！");
+                throw new CVSFieldNotMatchingExection(ToString() + "，【类型："+ProType+"】【名称："+ProName+"】【属性值："+ProValue+"】必须配置值！");
             }
         }
     }
@@ -187,11 +187,11 @@ namespace OnlineStore.LoadCSVLibrary
         /// <returns></returns>
         public short GetAxisValue()
         { 
-            if (ProVale.Equals("") || ProVale.Equals("-1"))
+            if (ProValue.Equals("") || ProValue.Equals("-1"))
             { 
                 return -1;
             }
-            return (short)Convert.ToInt32(ProVale);
+            return (short)Convert.ToInt32(ProValue);
         }
 
         //public override string ToString()
@@ -200,7 +200,7 @@ namespace OnlineStore.LoadCSVLibrary
         //}
         public override void CheckField()
         {
-            if (String.IsNullOrEmpty( ProType) || String.IsNullOrEmpty( ProName ) || String.IsNullOrEmpty( DeviceName ) || String.IsNullOrEmpty( ProVale ))
+            if (String.IsNullOrEmpty( ProType) || String.IsNullOrEmpty( ProName ) || String.IsNullOrEmpty( DeviceName ) || String.IsNullOrEmpty( ProValue ))
             {
                 throw new CVSFieldNotMatchingExection(ToString() + "，【类型：ProType】【名称：ProName】【属性值：ProVale】【设备名称：DeviceName】必须配置值！");
             }
@@ -227,6 +227,7 @@ namespace OnlineStore.LoadCSVLibrary
         {
             SlaveID = 0;
         }
+        private string IP = "";
         /// <summary>
         /// 设备IP
         /// </summary> 
@@ -234,11 +235,18 @@ namespace OnlineStore.LoadCSVLibrary
         {
             get
             {
+                if (String.IsNullOrEmpty(IP))
+                {
                     if (DeviceConfig.ProIOIpMap != null && DeviceConfig.ProIOIpMap.ContainsKey(DeviceName))
                     {
-                    return DeviceConfig.ProIOIpMap[DeviceName];
+                        IP = DeviceConfig.ProIOIpMap[DeviceName];
+                    }
+                    else
+                    {
+                        IP = DeviceName;
+                    }
                 }
-                return DeviceName;
+                return IP;
             }
         }
         /// <summary>
@@ -288,7 +296,7 @@ namespace OnlineStore.LoadCSVLibrary
         //}
         public override void CheckField()
         {
-            if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(DeviceName) || String.IsNullOrEmpty(ProVale))
+            if (String.IsNullOrEmpty(ProType) || String.IsNullOrEmpty(ProName) || String.IsNullOrEmpty(DeviceName) || String.IsNullOrEmpty(ProValue))
             {
                 throw new CVSFieldNotMatchingExection(ToString() + "，【类型：ProType】【名称：ProName】【属性值：ProVale】【设备名称：DeviceName】必须配置值！");
             }

source/LoadCVSLibrary/storeConfig/config/DeviceConfig.cs

@@ -115,7 +115,7 @@ namespace OnlineStore.LoadCSVLibrary
                             }
                             else if (con.ProType == ConfigItemType.PRO)
                             {
-                                prop.SetValue(this, Convert.ChangeType(con.ProVale, prop.PropertyType), null);//赋值 
+                                prop.SetValue(this, Convert.ChangeType(con.ProValue, prop.PropertyType), null);//赋值 
                             }
                         }
                         else
@@ -125,10 +125,14 @@ namespace OnlineStore.LoadCSVLibrary
                     }
                     else if (!ProIOIpMap.ContainsKey(con.ProName) && con.ProName.ToUpper().Contains(IOIP_Str))
                     {
-                        ProIOIpMap.Add(con.ProName, con.ProVale);
+                        ProIOIpMap.Add(con.ProName, con.ProValue);
                     }else if(!ProRFIpMap.ContainsKey(con.ProName) && con.ProName.ToUpper().Contains(RFIP_Str))
                     {
-                        ProRFIpMap.Add(con.ProName, con.ProVale);
+                        ProRFIpMap.Add(con.ProName, con.ProValue);
+                    }
+                    else
+                    {
+                        LOGGER.Error("配置文件：" + this.ConfigFilePath + "，属性名=" + con.ProName + "的属性未找到匹配字段！");
                     }
                 }