RGV将调离安全区的判断调整到最后

业务工程/分拣库/WCS.WorkEngineering/Systems/RGVSystems.cs

@@ -312,25 +312,7 @@ namespace WCS.WorkEngineering.Systems
                     return;
                 }
 
-                if (obj.Data2.Status.HasFlag(RGVStatus.RES1)) //离开非安全区域
-                {
-                    World.Log($"任务处理:开始-下发移动任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
-                    obj.Data.TaskNumber = obj.Data.TaskNumber;
-                    obj.Data.CmdType = RGVCmdType.Move;
-                    obj.Data.DestPosition = obj.Entity.Code switch
-                    {
-                        "RGV1" => 1668,
-                        "RGV2" => 1683,
-                        "RGV3" => 1698,
-                        "RGV4" => 1713,
-                        "RGV5" => 1728,
-                        "RGV6" => 1743,
-                        _ => throw new ArgumentOutOfRangeException()
-                    };
-                    obj.Data.VoucherNo++;
-                    World.Log($"任务处理:结束-下发移动任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
-                    return;
-                }
+              
 
                 if (obj.Data2.CmdType == RGVCmdType.PickGoods && !obj.Data2.Status.HasFlag(RGVStatus.Taskfinishi))
                 {
@@ -427,6 +409,26 @@ namespace WCS.WorkEngineering.Systems
                     World.Log($"任务处理:结束-下发满托入库任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]起始地址[{obj.Data.StartPosition}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
                     return;
                 }
+
+                if (obj.Data2.Status.HasFlag(RGVStatus.RES1)) //离开非安全区域
+                {
+                    World.Log($"任务处理:开始-下发移动任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
+                    obj.Data.TaskNumber = obj.Data.TaskNumber;
+                    obj.Data.CmdType = RGVCmdType.Move;
+                    obj.Data.DestPosition = obj.Entity.Code switch
+                    {
+                        "RGV1" => 1668,
+                        "RGV2" => 1683,
+                        "RGV3" => 1698,
+                        "RGV4" => 1713,
+                        "RGV5" => 1728,
+                        "RGV6" => 1743,
+                        _ => throw new ArgumentOutOfRangeException()
+                    };
+                    obj.Data.VoucherNo++;
+                    World.Log($"任务处理:结束-下发移动任务-任务号[{obj.Data.TaskNumber}]任务类型[{obj.Data.CmdType}]目标地址[{obj.Data.DestPosition}]凭证号[{obj.Data.VoucherNo}]");
+                    return;
+                }
             }
             catch (Exception ex)
             {