入库优化

source/DeviceLibrary/assemblyLine/FeedingEquip.cs

@@ -711,7 +711,7 @@ namespace OnlineStore.DeviceLibrary
                 if (IOValue(IO_Type.SL_Entry_Check).Equals(IO_VALUE.HIGH))
                 {
                     LogUtil.info(logN + " ，入口有料架，暂不处理，重置 [" + nodeId + "] 状态为None");
-                    AgvClient.SetToNone(nodeId);
+                    AgvClient.SetStatus(nodeId);
                     return;
                 }
                 ShelfEnterProcess();
@@ -722,7 +722,7 @@ namespace OnlineStore.DeviceLibrary
                 if (IOValue(IO_Type.SL_Out_Check).Equals(IO_VALUE.LOW))
                 {
                     LogUtil.info(logN + " ，未检测到出口有料架，暂不处理，重置 [" + nodeId + "] 状态为None");
-                    AgvClient.SetToNone(nodeId);
+                    AgvClient.SetStatus(nodeId);
                     return;
                 }
                 ShelfOutProcess();

source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs

@@ -1104,7 +1104,7 @@ namespace OnlineStore.DeviceLibrary
         {
             MoveInfo.NextMoveStep(LineMoveStep.FI_24_GetPosID);
             InLog("清空LastPosResult，从服务器获取入库库位");
-            MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(1500));
+            MoveInfo.WaitList.Add(WaitResultInfo.WaitTime(200));
             LastPosParam = null;
             string code = CodeManager.ProcessCode(LastCodeList);
             lastcode = code;
@@ -1116,22 +1116,31 @@ namespace OnlineStore.DeviceLibrary
                     int count = 1;
                     while (MoveInfo.MoveType.Equals(LineMoveType.InStore))
                     {
+                        int ms = 5000;
                         //从服务器获取库位号
                         GetPosResult result = SServerManager.GetPosId(Name, LastCodeList, LastHeight, LastWidth, CurrShelfId, DeviceID);
                         if (result.IsTimeOut)
-                        {
-                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 超时，等待1s后重新获取");
-                            Thread.Sleep(1000);
+                        { 
+                            if (count < 5)
+                            {
+                                ms = 2000;
+                            } 
+                            Thread.Sleep(ms); 
+                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 超时，等待" + ms + "后重新获取");
                         }
                         else if (result.Result.Equals(99) || result.Result.Equals(100))
-                        {
-                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 结果【" + result.Result + "】，等待3s后重新获取");
-                            Thread.Sleep(3000);
+                        {  
+                            if (count < 5)
+                            {
+                                ms = 3000;
+                            }
+                            Thread.Sleep(ms);
+                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 结果【" + result.Result + "】，等待" + ms + "后重新获取");
                         }
-                        else if (!result.Msg.Equals("") )
+                        else if (!result.Msg.Equals(""))
                         {
                             LastPosParam = result.Param;
-                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 入库NG："+result.Msg);
+                            LogUtil.error(Name + "【" + code + "】第[" + count + "]次 FI_23_GetPosID 入库NG：" + result.Msg);
                             break;
                         }
                         else
@@ -1147,13 +1156,7 @@ namespace OnlineStore.DeviceLibrary
                     LogUtil.error(Name + "【" + code + "】获取库位号报错：" + ex.ToString());
                 }
 
-            });
-            
-            //if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
-            //{
-            //    InLog("获取库位" + MoveInfo.SLog + "： 上料轴开始慢速上升到P3点"  );
-            //    BatchAxisToP3(false);
-            //}
+            }); 
         }
 
         private void FI_29_CylinderUp()
@@ -1167,16 +1170,8 @@ namespace OnlineStore.DeviceLibrary
             {
                 upLog = " ，7X8盘，升降轴到待机位P1  ";
                 UpdownAxis.AbsMove(MoveInfo, Config.UpDownAxisP1, Config.UpdownAxis_P1Speed);
-            }
-            //if (IOValue(IO_Type.SL_AxisLocationCheck).Equals(IO_VALUE.LOW) && MoveInfo.ShelfNoTray.Equals(false))
-            //{
-            //    InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升，上料轴开始慢速上升到P3点" + upLog);
-            //    BatchAxisToP3(false);
-            //}
-            //else
-            //{
-            InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升 " + upLog);
-            //}
+            } 
+            InLog("料盘移栽" + MoveInfo.SLog + "：上料横移机构上升 " + upLog); 
         }
         private void TrayPreMove()
         {