接驳台接口修改。

source/DeviceLibrary/assemblyLine/HY/HY_C1Line.cs

@@ -479,7 +479,7 @@ namespace OnlineStore.DeviceLibrary
                     {
                     {
                         lineName = "C2";
                         lineName = "C2";
                     }
                     }
-                    else if (DeviceID.Equals(205))
+                    else if (DeviceID.Equals(206))
                     {
                     {
                         lineName = "C3";
                         lineName = "C3";
                     }
                     }

source/DeviceLibrary/assemblyLine/HY/HY_Coveryor_Partial.cs

@@ -580,8 +580,8 @@ namespace OnlineStore.DeviceLibrary
                 else if (!MoveInfo.MoveParam.InStoreNg)
                 else if (!MoveInfo.MoveParam.InStoreNg)
                 { 
                 { 
                     int robotIndex = GetRobotIndex();
                     int robotIndex = GetRobotIndex();
-                    OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台，发送 arriveRobotLocation ");
-                    string msg = SServerManager.arriveRobotLocation(Name, robotIndex, code);
+                    OutLog(logName + MoveInfo.SLog + "，工单料到达接驳台，发送 arrive3fRobotLocation ");
+                    string msg = SServerManager.arrive3fRobotLocation(Name, robotIndex, code);
                     afterPutCutOK = true;
                     afterPutCutOK = true;
                 }
                 }
                 else
                 else
@@ -598,7 +598,7 @@ namespace OnlineStore.DeviceLibrary
             }
             }
             else if (MoveInfo.IsStep(LineMoveStep.JM_17_CylinderTake))
             else if (MoveInfo.IsStep(LineMoveStep.JM_17_CylinderTake))
             {
             {
-                string log = "arriveRobotLocation";
+                string log = "arrive3fRobotLocation";
                 if (IsNgPro())
                 if (IsNgPro())
                 {
                 {
                     log = "afterPutCutTask";
                     log = "afterPutCutTask";

source/DeviceLibrary/assemblymanager/SServerManager.cs

@@ -196,20 +196,20 @@ namespace OnlineStore.DeviceLibrary
         //皮带线获取尺寸后,料盘到达机器人取料位置进调用,如果未扫到码,或者没等到取料位置信号亮,可以不用调用
         //皮带线获取尺寸后,料盘到达机器人取料位置进调用,如果未扫到码,或者没等到取料位置信号亮,可以不用调用
 
 
         //> 地址:
         //> 地址:
-        //>>/rest/api/qisda/device/arriveRobotLocation
+        //>>/rest/api/qisda/device/arrive3fRobotLocation
         //>
         //>
         //> 参数: 
         //> 参数: 
         //>> - robotIndex=机器人编号,IP为51的机器人为1, 52的机器人为2, 53的机器人为3
         //>> - robotIndex=机器人编号,IP为51的机器人为1, 52的机器人为2, 53的机器人为3
         //>
         //>
         //> 返回: 
         //> 返回: 
         //>>``
         //>>``
-        private static string Addr_arriveRobotLocation = "/rest/api/qisda/device/arriveRobotLocation";
-        public static string arriveRobotLocation(string deviceName, int robotIndex, string barcode)
+        private static string Addr_arrive3fRobotLocation = "/rest/api/qisda/device/arrive3fRobotLocation";
+        public static string arrive3fRobotLocation(string deviceName, int robotIndex, string barcode)
         {
         {
             string msg = "";
             string msg = "";
             if (string.IsNullOrEmpty(serverAddr))
             if (string.IsNullOrEmpty(serverAddr))
             {
             {
-                LogUtil.error(deviceName + "arriveRobotLocation   [" + robotIndex + "][" + barcode + "]  :未找到服务器地址");
+                LogUtil.error(deviceName + "arrive3fRobotLocation   [" + robotIndex + "][" + barcode + "]  :未找到服务器地址");
                 return msg;
                 return msg;
             }
             }
             try
             try
@@ -222,9 +222,9 @@ namespace OnlineStore.DeviceLibrary
                 Dictionary<string, string> paramMap = new Dictionary<string, string>();
                 Dictionary<string, string> paramMap = new Dictionary<string, string>();
                 paramMap.Add("robotIndex", robotIndex.ToString());//rfid   
                 paramMap.Add("robotIndex", robotIndex.ToString());//rfid   
                 paramMap.Add("barcode", barcode);
                 paramMap.Add("barcode", barcode);
-                string server = GetAddr(Addr_arriveRobotLocation, paramMap);
+                string server = GetAddr(Addr_arrive3fRobotLocation, paramMap);
                 string resultStr = HttpHelper.Post(server, "");
                 string resultStr = HttpHelper.Post(server, "");
-                LogUtil.info(deviceName + "arriveRobotLocation      " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
+                LogUtil.info(deviceName + "arrive3fRobotLocation      " + FormUtil.GetSpanStr(DateTime.Now - startTime) + " 【" + server + "】【" + resultStr + "】");
             }
             }
             catch (Exception ex)
             catch (Exception ex)
             {
             {

source/DeviceLibrary/model/StoreStep.cs

@@ -578,19 +578,18 @@ namespace OnlineStore.DeviceLibrary
         /// 提升轴下降到料盘不溢出的位置
         /// 提升轴下降到料盘不溢出的位置
         /// </summary>
         /// </summary>
         FI_29_BatchAxisDown,
         FI_29_BatchAxisDown,
-
-        ///// <summary>
-        ///// 等待料盘检测信号
-        ///// </summary>
-        //FI_30_WaitReelCheck,
-
-
+         
         /// <summary>
         /// <summary>
         ///  料盘移栽：从服务器获取入库库位号
         ///  料盘移栽：从服务器获取入库库位号
         /// </summary>
         /// </summary>
         FI_31_GetPosID,
         FI_31_GetPosID,
 
 
         /// <summary>
         /// <summary>
+        /// 料盘移栽：此料盘是出库料盘，获取出库信息
+        /// </summary>
+        FI_32_GetReelInfo,
+
+        /// <summary>
         ///  料盘移栽：等待空托盘到达，移栽伺服下降到P2，并预扫码
         ///  料盘移栽：等待空托盘到达，移栽伺服下降到P2，并预扫码
         /// </summary>
         /// </summary>
         FI_32_WaitTray,
         FI_32_WaitTray,