fix

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

@@ -604,6 +604,14 @@ namespace WCS.Service.Extensions
                         throw new DoException("二次处理堆垛机完成任务");
                     }
 
+                    if (task.STATUS == TaskStatus.已完成)
+                    {
+                        if (i == 0) Data.FinishedACK_1 = 1;
+                        else Data.FinishedACK_2 = 1;
+                        throw new DoException("二次处理堆垛机完成任务");
+                    }
+
+
                     if (task.TYPE == TaskType.入库)
                     {
                         task.ENDTIME = DateTime.Now;

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

@@ -92,11 +92,10 @@ namespace WCS.Service.Works.Station
             {
                 //设备组无论单卷还是双卷都必须满足的条件
                 if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException($"等待任务执行--凭证号不一致");
-                if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new DoException($"无光电"); //两个设备共用一个光电
                 if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
 
                 //成功创建的任务
-                var createTaskList = new List<Tuple<int, StationDevice>>();
+                var finishTaskList = new List<Tuple<int, StationDevice>>();
 
                 //创建对应的任务
                 DB.Do(db =>
@@ -105,6 +104,7 @@ namespace WCS.Service.Works.Station
                     {
                         if (dev.Data2.Request != IstationRequest.扫码入库) continue; //没有请求
                         if (dev.Data2.Tasknum > 10000) continue; //没有任务号
+                        if (!dev.Data2.Status.HasFlag(IstationStatus.光电状态)) continue;
 
                         var bcr = dev.Entity.BCR();
                         var barcode = bcr.Content.Trim('\r');
@@ -129,7 +129,7 @@ namespace WCS.Service.Works.Station
                         task.HEIGHT = dev.Data2.GoodsSize;
 
                         db.Default.Set<WCS_TASK>().Add(task);
-                        createTaskList.Add(new Tuple<int, StationDevice>(task.WMSTASK, dev.Entity.Create<StationDevice>()));
+                        finishTaskList.Add(new Tuple<int, StationDevice>(task.WMSTASK, dev.Entity.Create<StationDevice>()));
 
                         var msg = $"下达从{dev.Entity.CODE}移动至{next}的PLC指令。";
                         msg += $"[{dev.Data.Tasknum}][{dev.Data.Goodsstart}][{dev.Data.Goodsend}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
@@ -142,7 +142,7 @@ namespace WCS.Service.Works.Station
                 //检查对应的任务是否已创建成功
                 DB.Do(db =>
                 {
-                    foreach (var finishTask in createTaskList)
+                    foreach (var finishTask in finishTaskList)
                     {
                         var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.WMSTASK == finishTask.Item1);
                         if (task == null) continue;
@@ -161,9 +161,13 @@ namespace WCS.Service.Works.Station
     [WorkTitle(typeof(ProductHandler), "一楼分配巷道")]
     internal class 巷道分配 : Work<StationDeviceGroup>
     {
+        private readonly string ConvGroup_1030 = "G1030";
+        private readonly string Conv_1030 = "1030";
+        private readonly string RGV8 = "RGV8";
+
         protected override bool SelectDevice(WCS_DEVICE dev)
         {
-            return dev.CODE == "G1030";
+            return dev.CODE == ConvGroup_1030;
         }
 
         protected override void Do(StationDeviceGroup obj)
@@ -212,7 +216,7 @@ namespace WCS.Service.Works.Station
                         if (putStation == null) continue;
                         var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == putStation.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
                         //RGV是否有正在前往这个地址的任务
-                        var rgv8 = Device.Find("RGV8").Create<RGVDevice>();
+                        var rgv8 = Device.Find(RGV8).Create<RGVDevice>();
                         if (!rgv8.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲)
                           && !rgv8.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动)
                           && rgv8.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort()) continue;
@@ -243,13 +247,13 @@ namespace WCS.Service.Works.Station
                         task.ADDRTO = task.DEVICE;
                         db.Default.SaveChanges();
 
-                        var msg = $"下达从1030移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{ task.TUNNEL }]-[{task.DEVICE}]";
-                        msg += $"[{dev.Data.Tasknum}][1030][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
+                        var msg = $"下达从{Conv_1030}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{ task.TUNNEL }]-[{task.DEVICE}]";
+                        msg += $"[{dev.Data.Tasknum}][{Conv_1030}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
 
                         task.CreateStatusLog(db, msg, this.GetType());
 
                         dev.Data.Tasknum = task.ID;
-                        dev.Data.Goodsstart = 1030;
+                        dev.Data.Goodsstart = Conv_1030.ToShort();
                         dev.Data.Goodsend = tunnelInfo.taskIN.CODE.Replace("G", "").ToShort();
                         dev.Data.CmdType = IstationCmdType.分配目标地址;
                         dev.Data.VoucherNo++;
@@ -259,101 +263,6 @@ namespace WCS.Service.Works.Station
         }
     }
 
-    //[WorkTitle(typeof(ProductHandler), "一楼分配巷道")]
-    //internal class 巷道分配 : Work<StationDeviceGroup>
-    //{
-    //    protected override bool SelectDevice(WCS_DEVICE dev)
-    //    {
-    //        return dev.CODE == "G1030";
-    //    }
-
-    //    protected override void Do(StationDeviceGroup obj)
-    //    {
-    //        obj.EX(obj =>
-    //        {
-    //            var code = obj.Entity.CODE;
-    //            //两个设备都必须满足的条件
-    //            if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) return;
-    //            if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) return;
-    //            if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) return;
-
-    //            //成功分配巷道的任务的任务
-    //            var finishTaskList = new List<Tuple<int, StationDevice>>();
-
-    //            DB.Do(db =>
-    //            {
-    //                var taskIds = obj.Items.Select(v => v.Data2.Tasknum > 10000 && 5);
-    //                var tasks = db.Default.Set<WCS_TASK>().Where(p => taskIds.Any(v => v == p.ID)).ToList();
-
-    //                var res = WMS.GetTunnelList(tasks.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();
-
-    //                List<TunnelInfo> tunnelInfos = new List<TunnelInfo>();
-    //                foreach (var item in tunnels)
-    //                {
-    //                    //当前巷道的取货点
-    //                    var allIn = Device.Where(v => v.Is(DF.SRM二级品取货)) //一楼所有取货点
-    //                                      .Where(v => v.ROUTES.Any(p => p.NEXT == item)) //下一个点为当前巷道的取货点
-    //                                      .Select(v => v.CODE)
-    //                                      .ToList();
-    //                    var putStation = Device.Where(v => v.IsConv() && v.ROUTES.Any(p => p.NEXT != null && allIn.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)//筛选出空闲的路径点，此处因输送机都是一个动力，因此可以先找路径点再找设备组
-    //                                  .Distinct()
-    //                                  .FirstOrDefault();//去一次重
-    //                    if (putStation == null) continue;
-    //                    var taskInStation = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == putStation.Entity)).OrderBy(p => p.CODE).FirstOrDefault();
-    //                    //RGV是否有正在前往这个地址的任务
-    //                    var rgv8 = Device.Find("RGV8").Create<RGVDevice>();
-    //                    if (!rgv8.Data2.SystemStatus.HasFlag(WCS.Entity.Protocol.RGV.RGVRunStatus.空闲)
-    //                      && !rgv8.Data2.WorkMode.HasFlag(WCS.Entity.Protocol.RGV.RGVMode.自动)
-    //                      && rgv8.Data2.DestPosition_1 == taskInStation.CODE.Replace("G", "").ToShort()) 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.Data2.SRMStatus == SCRunStatus.空闲; } catch { return false; } })
-    //                                            .Where(v => !db.Default.Set<WCS_TASK>().Any(p => p.Priority > 0 && p.DEVICE == v.SRM.Entity.CODE && p.STATUS < TaskStatus.堆垛机完成))
-    //                                            .OrderBy(v => tunnelNo.IndexOf(v.Tunnel.CODE)).FirstOrDefault();
-    //                if (tunnelInfo == null) throw new WarnException("无可用巷道");
-
-    //                //开始向设备中写入任务信息
-    //                foreach (var item in devs)
-    //                {
-    //                    var dev = Device.Find(item.Entity.CODE).Create<StationDevice>();
-    //                    var task = tasks.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;
-    //                    db.Default.SaveChanges();
-
-    //                    var msg = $"下达从{Conv_1030}移动至{dev.Data.Goodsend}的PLC指令。同时将任务分配至[{ task.TUNNEL }]-[{task.DEVICE}]";
-    //                    msg += $"[{dev.Data.Tasknum}][{Conv_1030}][{dev.Data.Goodsend}][{tunnelInfo.SRM.Entity.CODE}][{dev.Data.VoucherNo}[{dev.Data2.VoucherNo}]";
-
-    //                    task.CreateStatusLog(db, msg, this.GetType());
-
-    //                    dev.Data.Tasknum = task.ID;
-    //                    dev.Data.Goodsstart = Conv_1030.ToShort();
-    //                    dev.Data.Goodsend = tunnelInfo.taskIN.CODE.Replace("G", "").ToShort();
-    //                    dev.Data.CmdType = IstationCmdType.分配目标地址;
-    //                    dev.Data.VoucherNo++;
-    //                }
-    //            });
-    //        });
-    //    }
-    //}
-
     [WorkTitle(typeof(ProductHandler), "一楼RGV放货结束分配目标地址")]
     internal class 一楼RGV放货结束分配目标地址 : DeviceWork<StationDevice>
     {

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

@@ -29,7 +29,7 @@ namespace WCS.Service.Works.Station
                 {
                     //找到所有的AGV任务
                     var agvTasks = db.Default.Set<WCS_AGVTask>().Where(v => v.TaskType == AGVTaskType.入库)
-                    .Where(v => v.Status < AGVTaskStatus.完成).ToArray();
+                    .Where(v => v.Status < AGVTaskStatus.完成).Where(v => v.Station == obj.Entity.CODE).ToArray();
 
                     foreach (var agvtask in agvTasks)
                     {
@@ -90,14 +90,17 @@ namespace WCS.Service.Works.Station
                             else if (agvtask.AGVStatus == AGVTaskStatus.取放完成)
                             {
                                 if (obj.Items.Any(v => v.Data2.Status.HasFlag(IstationStatus.AGV放货完成信号))) throw new WarnException("顶升下降信号未清除");
-                                if (obj.Items.Any(v => !v.Data2.Status.HasFlag(IstationStatus.光电状态))) throw new WarnException("AGV放货完成后输送线无光电信号");
 
                                 agvtask.Status = agvtask.AGVStatus;
                                 agvtask.UpdateTime = DateTime.Now;
                                 db.Default.SaveChanges();
                                 foreach (var dev in obj.Items)
                                 {
-                                    dev.Data.Istation521Status = IstationStatus.AGV放货完成信号;
+                                    if (dev.Data2.Status.HasFlag(IstationStatus.光电状态))
+                                    {
+                                        dev.Data.Goodsnum = (short)agvtask.Goodsnum;
+                                        dev.Data.Istation521Status = IstationStatus.AGV放货完成信号;
+                                    }
                                 }
                             }
                             else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.完成))
@@ -109,7 +112,6 @@ namespace WCS.Service.Works.Station
                                 foreach (var dev in devs.Items)
                                 {
                                     dev.Data.Goodscode = agvtask.ID;
-                                    dev.Data.GoodsSize = (short)agvtask.Goodsnum;
                                 }
                             }
                             else if (Ltc.Do(agvtask, v => v.AGVStatus == AGVTaskStatus.取消))