fix

Projects/永冠OPP/WCS.Service/WebApi/WMS/WMS.cs

@@ -228,7 +228,7 @@ namespace WCS.Service
         /// <exception cref="Exception"></exception>
         public static I_WCS_GetTunnelListResponse GetTunnelList(List<string> WMSTaskId, string dev)
         {
-            var res = APICaller.CallApi2<I_WCS_GetTunnelListResponse>(Url + "/api/Task/I_WCS_GetTunnelList", new I_WCS_GetTunnelListRequest
+            var res = APICaller.CallApi<I_WCS_GetTunnelListResponse>(Url + "/api/Task/I_WCS_GetTunnelList", new I_WCS_GetTunnelListRequest
             {
                 WMSTaskNum = WMSTaskId
             });

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

@@ -335,7 +335,7 @@ namespace WCS.Service.Works.RGV
                         if (pickStation.Entity.CODE == "G19")
                         {
                             var pickStations = Device.Find("G23").Create<StationDeviceGroup>().RGVGetTaskedDevice();
-                            if (pickStations.Any())
+                            if (pickStations != null && pickStations.Any() && !obj.RGVList.Any(v => v.Data2.SystemStatus != RGVRunStatus.空闲 && v.Data2.DestPosition_1 == 23))
                             {
                                 obj.Move(Device.Find("G23").Create<StationDeviceGroup>());
                                 return;
@@ -373,7 +373,12 @@ namespace WCS.Service.Works.RGV
                             });
                             return;
                         }
-
+                        int needToMove = obj.RGVList.Count(v => v.Data2.TaskType_1 == RGVTaskType.放货 && v.Position > StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G19").Location && v.Position < StationLocation.ALLlocations.FirstOrDefault(v => v.Station == "G23").Location);
+                        if (pickStation.Entity.CODE == "G23" && needToMove >= 2)
+                        {
+                            obj.Move(Device.Find("G19").Create<StationDeviceGroup>());
+                            return;
+                        }
                         //计算当前RGV拦住小车的数量
                         var max = obj.RGVList.Count(v => v.Data2.WorkMode == RGVMode.自动 && v.Data2.SystemStatus != RGVRunStatus.空闲 && obj.StopedByMe(v));
                         if (pickStation.Entity.CODE == "G19" && max >= 2)

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

@@ -287,6 +287,6 @@ namespace WCS.Service.Works.Station
             return _devCodes.Contains(dev.CODE);
         }
 
-        private readonly List<string> _devCodes = new() { "G1190", "G1199", "G1208" };
+        private readonly List<string> _devCodes = new() { "G1190", "G1199", "G1208","G1225","G1217" };
     }
 }

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

@@ -288,6 +288,8 @@ namespace WCS.Service.Works.Station
                         station.AddRange(G1343);
                     }
 
+                    if (!station.Any()) return;
+
                     foreach (var dev in devise)
                     {
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.ID == dev.Station.Data2.Tasknum) ?? throw new WarnException($"WCS无[{dev.Station.Data2.Tasknum}]任务信息");