1

source/AssemblyLineClient/FrmRFIPEdit.Designer.cs

@@ -204,15 +204,13 @@
             // 
             // 
             // lblResult
             // lblResult
             // 
             // 
-            this.lblResult.AutoSize = true;
             this.lblResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblResult.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.lblResult.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
-            this.lblResult.Location = new System.Drawing.Point(147, 113);
+            this.lblResult.Location = new System.Drawing.Point(23, 113);
             this.lblResult.Name = "lblResult";
             this.lblResult.Name = "lblResult";
-            this.lblResult.Size = new System.Drawing.Size(79, 20);
+            this.lblResult.Size = new System.Drawing.Size(328, 25);
             this.lblResult.TabIndex = 284;
             this.lblResult.TabIndex = 284;
             this.lblResult.Text = "读取到数据";
             this.lblResult.Text = "读取到数据";
-            this.lblResult.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            this.lblResult.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
             // FrmRFIPEdit
             // FrmRFIPEdit
             // 
             // 

source/AssemblyLineClient/FrmRFIPEdit.cs

@@ -2,6 +2,7 @@
  
  
 using OnlineStore.Common;
 using OnlineStore.Common;
 using OnlineStore.DeviceLibrary;
 using OnlineStore.DeviceLibrary;
+using OnlineStore.LoadCSVLibrary;
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.ComponentModel;
@@ -28,6 +29,7 @@ namespace OnlineStore.AssemblyLine
             comboxType.Items.Clear();
             comboxType.Items.Clear();
             foreach (EquipBase b in LineManager.Line.AllEquipMap.Values)
             foreach (EquipBase b in LineManager.Line.AllEquipMap.Values)
             {
             {
+                if (b.baseConfig.DType.Equals(DeviceType.DischargeLine)) { continue; }
                 string key = b.Name + "-托盘RF";
                 string key = b.Name + "-托盘RF";
                 string value = RFIDManager.GetRFIP(b.DeviceID);
                 string value = RFIDManager.GetRFIP(b.DeviceID);
                 rfMap.Add(key, value);
                 rfMap.Add(key, value);
@@ -44,19 +46,7 @@ namespace OnlineStore.AssemblyLine
             comType.SelectedIndex = 0;
             comType.SelectedIndex = 0;
 
 
             string hostN = Dns.GetHostName();
             string hostN = Dns.GetHostName();
-            //IPAddress[] addresss = Dns.GetHostAddresses(hostN);
-            //cmbLocalIp.Items.Clear();
-            //if (addresss != null && addresss.Length > 0)
-            //{ 
-            //    foreach (IPAddress ip in addresss)
-            //    {
-            //        if (ip.AddressFamily.Equals(AddressFamily.InterNetwork))
-            //        {
-            //            cmbLocalIp.Items.Add(ip.ToString());
-            //        }
-            //    }
-            //    cmbLocalIp.SelectedIndex = 0; 
-            //}
+
         }
         }
          
          
 
 
@@ -82,8 +72,9 @@ namespace OnlineStore.AssemblyLine
                 }
                 }
 
 
             }
             }
-            lblResult.Text=("读取到数据：" + resul);
-            LogUtil.info("点击RFID读取数据测试，结果：" + resul);
+             
+            lblResult.Text=("["+ip+"]读取到数据：" + resul);
+            LogUtil.info("点击RFID[" + ip + "]读取数据测试，结果：" + resul);
         }
         }
 
 
         private void comboxType_SelectedIndexChanged(object sender, EventArgs e)
         private void comboxType_SelectedIndexChanged(object sender, EventArgs e)
@@ -114,8 +105,8 @@ namespace OnlineStore.AssemblyLine
                 }
                 }
 
 
             }
             }
-            lblResult.Text = ("读取到数据：" + resul);
-            LogUtil.info("点击RFID读取数据并清理测试，结果：" + resul);
+            lblResult.Text = ("[" + ip + "]读取到数据：" + resul);
+            LogUtil.info("点击RFID[" + ip + "]读取数据并清理测试，结果：" + resul);
         }
         }
     }
     }
 }
 }