配置修改

source/DeviceLibrary/LineConfig/Config_Line.csv

@@ -18,8 +18,8 @@ PRO,0,D5-1移栽9-托盘-RFID-IP,PRO_RFIP_009,192.168.210.113,,
 PRO,0,D5-2移栽10-托盘-RFID-IP,PRO_RFIP_010,192.168.210.114,,
 PRO,0,D6-1移栽11-托盘-RFID-IP,PRO_RFIP_011,192.168.210.108,,
 PRO,0,D6-2移栽12-托盘-RFID-IP,PRO_RFIP_012,192.168.210.109,,
-PRO,0,D7-1移栽13-托盘-RFID-IP,PRO_RFIP_013,192.168.210.140,,
-PRO,0,D7-2移栽14-托盘-RFID-IP,PRO_RFIP_014,192.168.210.141,,
+PRO,0,D7-2移栽13-托盘-RFID-IP,PRO_RFIP_013,192.168.210.141,,
+PRO,0,D7-1移栽14-托盘-RFID-IP,PRO_RFIP_014,192.168.210.140,,
 PRO,0,D8-2移栽15-托盘-RFID-IP,PRO_RFIP_015,192.168.210.134,,
 PRO,0,D8-1移栽16-托盘-RFID-IP,PRO_RFIP_016,192.168.210.133,,
 PRO,0,D9-2移栽17-托盘-RFID-IP,PRO_RFIP_017,192.168.210.125,,
@@ -40,7 +40,7 @@ PRO,0,横移-HY6-托盘-RFID-IP,PRO_RFIP_206,192.168.210.137,,
 PRO,0,横移-HY8-托盘-RFID-IP,PRO_RFIP_208,192.168.210.123,,
 PRO,0,横移-HY9-托盘-RFID-IP,PRO_RFIP_209,192.168.210.135,,
 PRO,0,横移-HY10-托盘-RFID-IP,PRO_RFIP_210,192.168.210.136,,
-PRO,0,横移-HY11-托盘-RFID-IP,PRO_RFIP_211,192.168.210.127,,
+,0,横移-HY11-托盘-RFID-IP,PRO_RFIP_211,192.168.210.127,,
 PRO,0,横移-HY12-托盘-RFID-IP,PRO_RFIP_212,192.168.210.128,,
 PRO,0,横移-HY13-托盘-RFID-IP,PRO_RFIP_213,192.168.210.115,,
 ,0,横移-HY14-托盘-RFID-IP,PRO_RFIP_214,,,

source/DeviceLibrary/assemblyLine/EquipBase.cs

@@ -315,7 +315,7 @@ namespace OnlineStore.DeviceLibrary
             trayCount++;
             //此处先对托盘号进行验证
             preTrayNum = currTrayNum;
-            currTrayNum = RFIDManager.GetTrayNum(DeviceID, true);
+            currTrayNum = RFIDManager.GetTrayNum(Name, DeviceID, true);
             LogUtil.LOGGER.Info(Name+ "  [" + trayCount + "] IP [" + RFIDManager.GetRFIP(DeviceID) + "] [" + preTrayNum + "] 当前托盘 [" + currTrayNum + "]");
             if (preTrayNum.Equals(currTrayNum) && currTrayNum > 0)
             {

source/DeviceLibrary/assemblyLine/LineBean_T3-C1.cs

@@ -21,7 +21,7 @@ namespace OnlineStore.DeviceLibrary
         
         private void Update_T3C1_TrayNum()
         {
-            T3C1_TrayNum = RFIDManager.GetTrayNum(300); 
+            T3C1_TrayNum = RFIDManager.GetTrayNum(T3C1_MoveInfo.Name, 300); 
         }
         public void T3C1_Stop(LineMoveInfo moveInfo = null)
         { 

source/DeviceLibrary/assemblymanager/RFIDManagercs.cs

@@ -41,7 +41,7 @@ namespace OnlineStore.DeviceLibrary
                 LogUtil.error("Open 出错：" + ex.ToString());
             }
         }   
-        public static int GetTrayNum(int subType, bool isClear = false)
+        public static int GetTrayNum(string deviceName, int subType, bool isClear = false)
         {
             if (DefaultTrayNum > 0)
             {
@@ -63,11 +63,11 @@ namespace OnlineStore.DeviceLibrary
                 }
                 else if (data.RFType > 0)
                 {
-                    LogUtil.error("RFID [ " + ip + " ] 读到数据 " + data.NumStr() + " 返回盘号  0");
+                    LogUtil.error(deviceName+ "RFID [ " + ip + " ] 读到数据 " + data.NumStr() + " 返回盘号  0");
                 }
                 else
                 {
-                    LogUtil.debug("RFID [ " + ip + " ] 读到数据 " + data.NumStr() + " 返回盘号  0");
+                    LogUtil.debug(deviceName + "RFID [ " + ip + " ] 读到数据 " + data.NumStr() + " 返回盘号  0");
                 }
                 return 0;
             }

source/DeviceLibrary/server/LineServer.cs

@@ -11,8 +11,6 @@ namespace OnlineStore.DeviceLibrary
 {
     public class LineServer
     {
-        //private static readonly ILog LOGGER = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
         private static TcpServer tcpserver = null;
         public static bool IsStart = false;
         public  static int ClientKeepSecond = 10;
@@ -144,9 +142,13 @@ namespace OnlineStore.DeviceLibrary
             int num = equipId % 100;
             string result = "";
             List<int> IdList = new List<int>();
-            if (num.Equals(2))
+            if (num.Equals(3))
             {
-                for (int i = 7; i <= 18; i++)
+                for (int i = 7; i <= 12; i++)
+                {
+                    IdList.Add(i);
+                }
+                for (int i = 24; i <= 13; i--)
                 {
                     IdList.Add(i);
                 }
@@ -155,26 +157,30 @@ namespace OnlineStore.DeviceLibrary
                     IdList.Add(i);
                 }
             }
-            else if (num.Equals(3))
+            else if (num.Equals(5))
             {
-                for (int i = 11; i <= 18; i++)
+                for (int i = 24; i <= 13; i--)
                 {
                     IdList.Add(i);
                 }
-                for (int i = 1; i <= 10; i++)
+                for (int i = 1; i <= 12; i++)
                 {
                     IdList.Add(i);
                 }
             }
             else
             {
-                for (int i = 1; i <= 18; i++)
+                for (int i = 1; i <= 12; i++)
+                {
+                    IdList.Add(i);
+                }
+                for (int i = 24; i <= 13; i--)
                 {
                     IdList.Add(i);
                 }
             }
             foreach (int id in IdList)
-            {  
+            {
                 BoxInfo box = GetBoxInfo(id);
                 if (box != null)
                 {
@@ -187,7 +193,7 @@ namespace OnlineStore.DeviceLibrary
                         }
                     }
                 }
-            } 
+            }
             if (result.EndsWith(","))
             {
                 result = result.Substring(0, result.Length - 1);