fix

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

@@ -329,9 +329,18 @@ 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 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();
+                        if (pickStation.Entity.CODE == "G19")
+                        {
+                            var pickStations = Device.Find("G23").Create<StationDeviceGroup>().Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000);
+                            if (pickStations.Any())
+                            {
+                                obj.Move(Device.Find("G23").Create<StationDeviceGroup>());
+                                return;
+                            }
+                        }
                         // 筛选出有任务号和起始及目标地址的设备
                         var devs = pickStation.Items.Where(v => v.Data2.Status.HasFlag(IstationStatus.光电状态) && v.Data2.Tasknum > 10000);
                         //是否需要取货
@@ -351,10 +360,10 @@ namespace WCS.Service.Works.RGV
                                     throw new WarnException("无任务组ID");
                                 var gw1 = pickStation.Items.ToArray()[0];
                                 var gw2 = pickStation.Items.ToArray()[1];
-                                if (gw1.Data2.Tasknum != 0 && gw2.Data2.Tasknum != 0)
-                                {
-                                    if (gw1.Data2.Goodsend != gw2.Data2.Goodsend) throw new WarnException($"{obj.Entity.CODE}目标地址不一致");
-                                }
+                                //if (gw1.Data2.Tasknum != 0 && gw2.Data2.Tasknum != 0)
+                                //{
+                                //    if (gw1.Data2.Goodsend != gw2.Data2.Goodsend) throw new WarnException($"{obj.Entity.CODE}目标地址不一致");
+                                //}
                                 obj.Pick(pickStation, gw1.Data2.Tasknum, gw2.Data2.Tasknum);
 
                                 foreach (var task in tasks)
@@ -389,8 +398,7 @@ namespace WCS.Service.Works.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();
@@ -472,7 +480,6 @@ namespace WCS.Service.Works.RGV
 
                                         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.放货;

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)
@@ -134,68 +134,6 @@ namespace WCS.Service.Works.Station
                     if (!devise.Any()) return; //无可执行任务
                     var taskList = devise.ValidTaskCheck(db);
 
-                    var res = WMS.GetTunnelList(taskList.Select(v => v.WMSTASK.ToString()).ToList(), 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 devise)
                     {
@@ -203,20 +141,10 @@ namespace WCS.Service.Works.Station
                         var task = taskList.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
                         if (task == null) throw new WarnException($"WCS无该任务{dev.Data2.Tasknum}--{dev.Entity.CODE}");
 
-                        task.DEVICE = tunnelInfo.SRM.Entity.CODE;
-                        task.TUNNEL = tunnelInfo.Tunnel.CODE;
-                        task.ADDRNEXT = tunnelInfo.taskIN.CODE;
-                        task.TaskGroupKey = res.WMSTaskGroupKey;
-                        task.ADDRTO = task.DEVICE;
-
                         string from = "G";
                         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());
                         finishTaskList.Add(new FinishTaskList<int>(task.ID, item.Station));
                     }
-                    db.Default.SaveChanges();
                 });
 
                 // 开始将任务信息写入到设备
@@ -232,7 +160,7 @@ namespace WCS.Service.Works.Station
                         }
                         finishTask.Station.Data.Tasknum = task.ID;
                         finishTask.Station.Data.Goodsstart = stationDeviceGroup.Entity.CODE.Replace("G", "").ToShort();
-                        finishTask.Station.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();
+                        finishTask.Station.Data.Goodsend = 12;
                         finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finishTask.Station.Data.CmdType = IstationCmdType.分配目标地址;
                         finishTask.Station.Data.VoucherNo++;