提前获取库位号。抓料时托盘提前等待放料。发送是否紧急料给出料机构

source/AssemblyLineClient/记录.txt

@@ -2,6 +2,7 @@
 1.脆盘料号配置增加界面，修改后实时生效。
 1.脆盘料号配置增加界面，修改后实时生效。
 2.预扫码扫码失败照片保存到文件夹。
 2.预扫码扫码失败照片保存到文件夹。
 3.紧急料直接放入NG箱
 3.紧急料直接放入NG箱
+4.入料优化：提前获取库位号。抓料时托盘提前等待放料。
 
 
 
 
 20200426
 20200426

source/DeviceLibrary/model/StoreStep.cs

@@ -584,16 +584,16 @@ namespace OnlineStore.DeviceLibrary
         /// 料盘移栽：批量轴到P3点
         /// 料盘移栽：批量轴到P3点
         /// </summary>
         /// </summary>
         FI_26_BatchAxisToP3,
         FI_26_BatchAxisToP3,
-      
-        /// <summary>
-        /// 料盘移栽： 上料横移气缸放料SOL
-        /// </summary>
-        FI_27_CylinderGive,
 
 
         /// <summary>
         /// <summary>
         ///  料盘移栽：记录高度尺寸
         ///  料盘移栽：记录高度尺寸
         /// </summary>
         /// </summary>
-        FI_28_SaveSize,
+        FI_27_SaveSize,
+        /// <summary>
+        /// 料盘移栽： 上料横移气缸放料SOL
+        /// </summary>
+        FI_28_CylinderGive,
+
         /// <summary>
         /// <summary>
         /// 提升轴下降到料盘不溢出的位置
         /// 提升轴下降到料盘不溢出的位置
         /// </summary>
         /// </summary>

source/DeviceLibrary/server/LineServer.cs

@@ -321,6 +321,7 @@ namespace OnlineStore.DeviceLibrary
                 paramList.Add(S_WareCode, param.WareCode);
                 paramList.Add(S_WareCode, param.WareCode);
                 paramList.Add(S_RFID, param.rfid);
                 paramList.Add(S_RFID, param.rfid);
                 paramList.Add(S_NG, param.IsNG);
                 paramList.Add(S_NG, param.IsNG);
+                paramList.Add(S_urgentReel, param.urgentReel);
 
 
                 string msg = ToParamStr(paramList);
                 string msg = ToParamStr(paramList);
                 TcpClientBean client = ClientMap[id];
                 TcpClientBean client = ClientMap[id];
@@ -512,6 +513,7 @@ namespace OnlineStore.DeviceLibrary
         public static string S_IsDebug = "IsDebug";
         public static string S_IsDebug = "IsDebug";
         public static string S_RFID = "rfid";
         public static string S_RFID = "rfid";
         public static string S_NG = "IsNg";
         public static string S_NG = "IsNg";
+        public static string S_urgentReel = "urgentReel";
 
 
     }
     }
     //public class StoreReviceBean
     //public class StoreReviceBean