fix

Projects/永冠OPP/WCS.Service/Extensions/DeviceExtension.cs

@@ -129,7 +129,7 @@ namespace WCS.Service.Extensions
         public List<Device<IStation520, IStation521, IStation523>> RGVGetTaskedDevice()
         {
             var a = Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000)
-                        .Where(v => v.Entity.CODE.ToShort() != v.Data2.Goodsend && v.Data2.Goodsend != 0)
+                         .Where(v => v.Entity.CODE.ToShort() != v.Data2.Goodsend && v.Data2.Goodsend != 0)
                         .ToList();
             return a.Count == 0 ? null : a;
         }
@@ -586,6 +586,7 @@ namespace WCS.Service.Extensions
             InfoLog.INFO_RGVINFO($"[{Entity.CODE}]--写入RGV移动任务-开始:{Data.TaskID_1},{Data.TaskType_1},{Data.DestPosition_1},{Data.Trigger_1}");
 
             Data.TaskID_1 = addr.Entity.CODE.GetShortCode();
+            Data.TaskID_2 = 0;
             Data.TaskType_1 = RGVTaskType.移动;
             Data.DestPosition_1 = addr.Entity.CODE.GetShortCode();
             Data.Trigger_1++;

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.CallApi<I_WCS_GetTunnelListResponse>(Url + "/api/Task/I_WCS_GetTunnelList", new I_WCS_GetTunnelListRequest
+            var res = APICaller.CallApi2<I_WCS_GetTunnelListResponse>(Url + "/api/Task/I_WCS_GetTunnelList", new I_WCS_GetTunnelListRequest
             {
                 WMSTaskNum = WMSTaskId
             });

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

@@ -4,7 +4,9 @@ using System.Collections.Generic;
 using System.Linq;
 using WCS.Core;
 using WCS.Entity;
+using WCS.Entity.Protocol;
 using WCS.Entity.Protocol.RGV;
+using WCS.Entity.Protocol.SRM;
 using WCS.Service.Extensions;
 using WCS.Service.Handlers;
 using WCS.Service.Helpers;
@@ -283,7 +285,7 @@ namespace WCS.Service.Works.RGV
     }
 
     [WorkTitle(typeof(RGVHandler), "BOPP环穿")]
-    public class BOPP环穿 : DeviceWork<RGVDevice> 
+    public class BOPP环穿 : DeviceWork<RGVDevice>
     {
         protected override void Do(RGVDevice obj)
         {
@@ -294,26 +296,31 @@ namespace WCS.Service.Works.RGV
                 if (obj.Data2.Trigger_1 != obj.Data.Trigger_1) throw new WarnException($"等待执行任务{obj.Data2.TaskID_1}--{obj.Data2.TaskID_2}");
                 if (obj.Data2.WorkMode != RGVMode.自动) throw new DoException(obj.Data2.WorkMode.ToString());
                 if (obj.Data2.SystemStatus != RGVRunStatus.空闲) throw new DoException(obj.Data2.SystemStatus.ToString());
+
                 #region 取货完成小车直接移动至12号站台
-                //RGV当前是否刚刚完成取货任务，等待放货
-                if (obj.IsPut())
+
+                if (obj.IsPut())//RGV当前是否刚刚完成取货任务，等待放货移动
                 {
-                    if (!obj.Data2.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.光电)) throw new WarnException("RGV无光电，无法放货，请检查实际情况");
-                    //取小车上的任务
-                    DB.Do(db =>
+                    if (obj.Data.TaskType_1 != RGVTaskType.取货) throw new WarnException($"当前任务类型必须为取货任务");
+                    if (obj.Data2.WorkMode != RGVMode.自动) throw new WarnException($"RGV状态{obj.Data2.WorkMode},无法执行放货移动任务");
+                    if (obj.Data2.SystemStatus != RGVRunStatus.空闲) throw new WarnException($"rgv状态为{obj.Data2.SystemStatus},无法执行放货移动任务");
+                    if (!obj.Data2.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.光电)) throw new WarnException("RGV无光电，无法执行放货移动任务");
+                    var addr = Device.Find("G12").Create<StationDeviceGroup>();
+                    if (obj.Data2.TaskID_1 == addr.Entity.CODE.GetShortCode() && obj.Data.TaskType_1 == RGVTaskType.移动)
                     {
-                        List<int> taskids = new List<int>() { obj.Data2.TaskID_1, obj.Data2.TaskID_2 };
-                        var tasks = db.Default.Set<WCS_TASK>().Where(p => taskids.Contains(p.ID));
-                        if (tasks.GroupBy(p => p.TaskGroupKey).Count() > 1)
-                            throw new WarnException("任务组ID不一致");
-                        if (!tasks.GroupBy(p => p.TaskGroupKey).Any())
-                            throw new WarnException("无任务组ID");
-                        var destStation = Device.Find(tasks.FirstOrDefault().ADDRNEXT).Create<StationDeviceGroup>();
-                        obj.Put(destStation, obj.Data2.TaskID_1, obj.Data2.TaskID_2);
-                    });
+                        InfoLog.INFO_RGVINFO($"{obj.Entity.CODE}]--已有目标地址相同的移动任务");
+                        return;
+                    }
+                    InfoLog.INFO_RGVINFO($"[{obj.Entity.CODE}]--写入RGV放货移动任务-开始:{obj.Data.TaskID_1},{obj.Data.TaskType_1},{obj.Data.DestPosition_1},{obj.Data.Trigger_1}");
+
+                    obj.Data.TaskType_1 = RGVTaskType.移动;
+                    obj.Data.DestPosition_1 = addr.Entity.CODE.GetShortCode();
+                    obj.Data.Trigger_1++;
+                    InfoLog.INFO_RGVINFO($"[{obj.Entity.CODE}]--写入RGV移动任务-结束:{obj.Data.TaskID_1},{obj.Data.TaskType_1},{obj.Data.DestPosition_1},{obj.Data.Trigger_1}");
                     return;
                 }
-                #endregion
+
+                #endregion 取货完成小车直接移动至12号站台
 
                 var pickStation = obj.CurrentStation();
                 //RGV是否在任何一个站台
@@ -322,8 +329,11 @@ namespace WCS.Service.Works.RGV
                     //是否是取货站台
                     if (pickStation.Entity.Is(DF.BOPPRGV取货设备组))
                     {
+                       // var a = Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000)
+                       // .Where(v => v.Entity.CODE.ToShort() != v.Data2.Goodsend && v.Data2.Goodsend != 0)
+                       //.ToList();
                         // 筛选出有任务号和起始及目标地址的设备
-                        var devs = pickStation.RGVGetTaskedDevice();
+                        var devs = pickStation.Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000);
                         //是否需要取货
                         if (devs != null && devs.Count() > 0)
                         {
@@ -355,24 +365,146 @@ namespace WCS.Service.Works.RGV
                             return;
                         }
 
-                        bool needToMove = obj.RGVList.Any(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)
-                        {
-                            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)
                         {
                             obj.Move(Device.Find("G23").Create<StationDeviceGroup>());
-                        }                       
+                        }
                     }
                     //是否在一个放货站台
                     if (pickStation.Entity.Is(DF.BOPPRGV放货设备组))
                     {
+                        #region 12站台
+
+                        if (pickStation.Entity.CODE == "G12")
+                        {
+                            #region 上一个任务为移动
+
+                            if (obj.Data.TaskType_1 == RGVTaskType.移动)
+                            {
+                                if (obj.Data2.WorkMode != RGVMode.自动) throw new WarnException($"RGV状态{obj.Data2.WorkMode},无法分配巷道");
+                                if (obj.Data2.SystemStatus != RGVRunStatus.空闲) throw new WarnException($"rgv状态为{obj.Data2.SystemStatus},无法分配巷道");
+                                if (!obj.Data2.Status_1.HasFlag(WCS.Entity.Protocol.RGVStatus.光电)) throw new WarnException("RGV无光电，无法分配巷道");
+                                #region 开始分配巷道
+                                var taskIds = new List<int>() { obj.Data2.TaskID_1, obj.Data2.TaskID_2 };
+                                taskIds = taskIds.Where(v => v > 10000).ToList(); //筛选出有效的任务
+                                //成功分配巷道的任务的任务
+                                var finishTaskList = new List<FinishTaskList<int>>();
+                                DB.Do(db =>
+                                {
+                                    var taskList = db.Default.Set<WCS_TASK>().Where(v => taskIds.Contains(v.ID)).ToList();
+                                    var task = taskList.FirstOrDefault() ?? throw new WarnException($"RGV无可分配巷道任务"); ;
+                                    var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == task.TaskGroupKey && v.TYPE == TaskType.入库);
+                                    //开始检查任务数是否匹配
+                                    if (taskList.Count != taskCount) throw new WarnException($"可执行数{taskList.Count},任务组任务数{taskCount},数量不匹配,{task.ID}-{task.TaskGroupKey}");
+                                    var res = WMS.GetTunnelList(taskList.Select(v => v.WMSTASK.ToString()).ToList(), obj.Entity.CODE);
+                                    if (string.IsNullOrEmpty(res.TunnelNum)) throw new WarnException($"WMS未返回巷道");
+                                    var tunnelNo = res.TunnelNum.Split(',').Select(v => "TY" + v).ToList();
+                                    var tunnels = Device.Where(v => tunnelNo.Contains(v.CODE)).ToList();
+                                    var tunnelInfos = new List<TunnelInfo>();
+
+                                    foreach (var item in tunnels)
+                                    {
+                                        //当前巷道的取货点
+                                        var allIn = Device.Where(v => v.Is(DF.SRMBOPP取货))
+                                                          .Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
+                                                          .Select(v => v.CODE)
+                                                          .ToList();
+                                        //下一个目标地址包含取货点的设备,此时获得的数据是旋转台
+                                        var turntable = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && allIn.Contains(p.NEXT.CODE))).Select(v => v.CODE);
+                                        //获得RGV的交货点
+                                        StationDevice rgvDeliveryPoint = null;
+                                        if (item.CODE == "TY1")
+                                        {
+                                            rgvDeliveryPoint = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && turntable.Contains(p.NEXT.CODE)))
+                                                      .Select(v => v.Create<StationDevice>()) //取所有可以到达取货点设备的信息
+                                                      .Where(v => v.Data3.Status.HasFlag(StationStatus.自动))//筛选出空闲的路径点，此处因输送机都是一个动力，因此可以先找路径点再找设备组
+                                                      .Distinct()
+                                                      .FirstOrDefault();//去一次重
+                                        }
+                                        else
+                                        {
+                                            rgvDeliveryPoint = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && turntable.Contains(p.NEXT.CODE)))
+                                                     .Select(v => v.Create<StationDevice>()) //取所有可以到达取货点设备的信息
+                                                     .Where(v => !v.Data3.Status.HasFlag(StationStatus.运行状态位)
+                                                              && !v.Data2.Status.HasFlag(IstationStatus.光电状态)
+                                                              && v.Data2.Tasknum < 10000
+                                                              && v.Data3.Status.HasFlag(StationStatus.自动))//筛选出空闲的路径点，此处因输送机都是一个动力，因此可以先找路径点再找设备组
+                                                     .Distinct()
+                                                     .FirstOrDefault();//去一次重
+                                        }
+                                        if (rgvDeliveryPoint == null) continue;
+                                        var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == rgvDeliveryPoint.Entity)).MinBy(p => p.CODE);
+                                        //只能有一组任务的下一个地址是交货点
+                                        if (db.Default.Set<WCS_TASK>().Any(v => v.ADDRNEXT == taskInStation.CODE && v.STATUS < TaskStatus.已完成)) continue;
+                                        //RGV是否有正在前往这个地址的任务
+                                        var rgvList = Device.Where(v => v.Is(DF.BOPPRGV)).Select(v => v.Create<RGVDevice>());
+
+                                        var rgvTaskCount = ProtocolProxy.YGWMS150Redis.Get("BoppRgvTaskCount").ToInt();
+                                        if (rgvList.Count(v => (!v.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲) || !v.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动))
+                                                            && v.Data2.TaskType_1 == WCS.Entity.Protocol.RGV.RGVTaskType.放货
+                                                            && v.Data2.DestPosition_1 == taskInStation?.CODE.Replace("G", "").ToShort()) > rgvTaskCount) continue;
+                                        tunnelInfos.Add(new TunnelInfo
+                                        {
+                                            Tunnel = item,
+                                            taskIN = taskInStation, //找到放货点设备所在组
+                                            SRM = Device.Where(p => p.IsSC()).FirstOrDefault(p => item.ROUTES.Any(d => d.NEXT.CODE == p.CODE)).Create<SRMDevice>()
+                                        });
+                                    }
+
+                                    //筛选出优先级最高的可用巷道
+                                    var tunnelInfo = tunnelInfos.Where(v => { try { return (v.SRM.Data3.SCAlarm == 0 && v.SRM.Data2.SRMMode == SCMode.远程) || v.SRM.Entity.CODE == "SRM1"; } catch { return false; } }).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
+
+                                    if (tunnelInfo == null) throw new WarnException("无可用巷道");
+
+                                    //开始变更任务信息
+                                    foreach (var item in taskIds)
+                                    {
+                                        var task1 = taskList.FirstOrDefault(p => p.ID == item);
+                                        if (task == null) throw new WarnException($"WCS无该任务{item}--{obj.Entity.CODE}");
+
+                                        task1.DEVICE = tunnelInfo.SRM.Entity.CODE;
+                                        task1.TUNNEL = tunnelInfo.Tunnel.CODE;
+                                        task1.ADDRNEXT = tunnelInfo.taskIN.CODE;
+                                        task1.TaskGroupKey = res.WMSTaskGroupKey;
+                                        task1.ADDRTO = task1.DEVICE;
+
+                                        var msg = $"下达从G12移动至{tunnelInfo.taskIN.CODE}的PLC指令。同时将任务分配至[{task1.TUNNEL}]-[{task1.DEVICE}]";
+                                        task1.CreateStatusLog(db, msg, this.GetType());
+                                        finishTaskList.Add(new FinishTaskList<int>(task1.ID, Device.Find(tunnelInfo.taskIN.CODE).Create<StationDevice>()));
+                                    }
+                                    db.Default.SaveChanges();
+                                    obj.Data.TaskType_1 = RGVTaskType.放货;
+                                    obj.Data.DestPosition_1 = tunnelInfo.taskIN.CODE.Replace("G", "").ToShort();
+                                    obj.Data.Trigger_1++;
+
+                                });
+
+                                #endregion
+                            }
+
+                            #endregion 上一个任务为移动
+
+                            #region 上一个任务为放货
+
+                            else if (obj.Data.TaskType_1 == RGVTaskType.放货)
+                            {
+                                obj.Move(Device.Find("G19").Create<StationDeviceGroup>());
+                            }
+
+                            #endregion 上一个任务为放货
+
+                            return;
+                        }
+
+                        #endregion 12站台
+
+                        #region 非12站台
+
                         obj.Move(Device.Find("G19").Create<StationDeviceGroup>());
+
+                        #endregion 非12站台
                     }
                     return;
                 }

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

@@ -112,7 +112,7 @@ namespace WCS.Service.Works.Station
     /// <summary>
     /// BOPP巷道分配
     /// </summary>
-    [WorkTitle(typeof(BOPPHandler), "BOPP巷道分配")]
+   // [WorkTitle(typeof(BOPPHandler), "BOPP巷道分配")]
     public class Bopp巷道分配 : Work<StationDeviceGroup>
     {
         protected override void Do(StationDeviceGroup obj)
@@ -146,7 +146,7 @@ namespace WCS.Service.Works.Station
                     foreach (var item in tunnels)
                     {
                         //当前巷道的取货点
-                        var allIn = Device.Where(v => v.Is(DF.SRMBOPP取货)) 
+                        var allIn = Device.Where(v => v.Is(DF.SRMBOPP取货))
                                           .Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
                                           .Select(v => v.CODE)
                                           .ToList();
@@ -210,7 +210,7 @@ namespace WCS.Service.Works.Station
                         task.ADDRTO = task.DEVICE;
 
                         string from = "G";
-                        from = obj.Entity.CODE == "G23" ? "G23" : "G19";                       
+                        from = obj.Entity.CODE == "G23" ? "G23" : "G19";
                         var msg = $"下达从{from}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
                         msg += $"[{dev.Data.Tasknum}][{from}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
                         task.CreateStatusLog(db, msg, this.GetType());
@@ -359,6 +359,6 @@ namespace WCS.Service.Works.Station
             return _devCodes.Contains(dev.CODE);
         }
 
-        private readonly List<string> _devCodes = new() { "G1190", "G1199", "G1208", "G1217", "G1225" };
+        private readonly List<string> _devCodes = new() { "G1190", "G1199", "G1208" };
     }
 }