fix

Projects/永冠OPP/WCS.Service/Works/RGV/RGVWorks.cs

@@ -114,9 +114,8 @@ namespace WCS.Service.Works.RGV
                             throw new WarnException("无任务组ID");
                         var destStation = Device.Find(tasks.FirstOrDefault().ADDRNEXT).Create<StationDeviceGroup>();
                         obj.Put(destStation, obj.Data2.TaskID_1, obj.Data2.TaskID_2);
+                        return;
                     });
-
-                    return;
                 }
 
                 var pickStation = obj.CurrentStation();
@@ -164,8 +163,8 @@ namespace WCS.Service.Works.RGV
 
                                     task.CreateStatusLog(db, msg, this.GetType());
                                 }
+                                return;
                             });
-                            return;
                         }
                         else if (pickStation.Entity.CODE == "G9")
                         {
@@ -196,7 +195,7 @@ namespace WCS.Service.Works.RGV
                             {
                                 //为了减少空跑，需要被阻拦的小车后面的小车任务类型为移动并且位置值要大于618500小于被阻拦小车的位置值
                                 var afterRgv1 = afterRgv.After();
-                                if (afterRgv1.Data2.WorkMode == RGVMode.自动 && afterRgv.Data2.TaskType_1 == RGVTaskType.放货 && !(afterRgv1.Position < afterRgv.Position && afterRgv1.Position > 618500)) return;
+                                if (afterRgv1.Data2.WorkMode == RGVMode.自动 && afterRgv.Data2.TaskType_1 != RGVTaskType.移动 && !(afterRgv1.Position < afterRgv.Position && afterRgv1.Position > 618500)) return;
                             }
                             //找到当前所在站台的下一个取货点
                             var beforeStation = Device.Where(v => v.Is(DF.涂布RGV取货设备组) && v.CODE != pickStation.Entity.CODE)
@@ -243,8 +242,8 @@ namespace WCS.Service.Works.RGV
                     {
                         pickStation = obj.BeforeStation();
                         obj.Move(pickStation);
+                        return;
                     }
-                    return;
                 }
 
                 //此时RGV即没有等待执行的放货任务，也不在任何一个取货点,因此需要调往最近的一个取货点

Projects/永冠OPP/WCS.Service/Works/Station/涂布入库.cs

@@ -494,10 +494,10 @@ namespace WCS.Service.Works.Station
 
                         task.DEVICE = tunnelInfo.SRM.Entity.CODE;
                         task.TUNNEL = tunnelInfo.Tunnel.CODE;
-                        task.ADDRNEXT = tunnelInfo.taskIN.CODE;
+                        task.ADDRNEXT = dev.Entity.GetPath(task.DEVICE).CODE;
                         task.TaskGroupKey = res.WMSTaskGroupKey;
                         task.ADDRTO = task.DEVICE;
-                        var msg = $"下达从{obj.Entity.CODE}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
+                        var msg = $"下达从{obj.Entity.CODE}移动至{task.ADDRNEXT}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
                         msg += $"[{dev.Data.Tasknum}][{obj.Entity.CODE}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
                         task.CreateStatusLog(db, msg, this.GetType());
                         finishTaskList.Add(new FinishTaskList<int>(task.ID, dev));