fix

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

@@ -509,62 +509,69 @@ namespace WCS.Service.Works.Station
 
                     taskList.ValidTaskCheck(enumerable.Count(), 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)
+                    if (taskList.Any(v => v.TYPE == TaskType.倒库))
                     {
-                        //当前巷道的取货点
-                        var allIn = Device.Where(v => v.Is(DF.SRM涂布取货)) //一楼所有取货点
-                                          .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)))
-                                              .Where(v => stationDeviceGroup.Items.Any(p => p.Entity == v))// 筛选出包含在当前设备组的设备
-                                              .Distinct()
-                                              .FirstOrDefault();//去一次重
-                        if (turntable == null) continue;
-                        var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == turntable)).MinBy(p => p.CODE);
-
-                        tunnelInfos.Add(new TunnelInfo
+                        foreach (var item in taskList)
                         {
-                            Tunnel = item,
-                            taskIN = dev, //找到放货点设备所在组
-                            SRM = Device.Where(p => p.IsSC()).FirstOrDefault(p => item.ROUTES.Any(d => d.NEXT.CODE == p.CODE)).Create<SRMDevice>()
-                        });
+                            var dev = enumerable.FirstOrDefault(v => v.Data2.Tasknum == item.ID).Entity.Create<StationDevice>();
+                            finishTaskList.Add(new FinishTaskList<int>(item.ID, dev));
+                        }
                     }
-                    //筛选出优先级最高的可用巷道
-                    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; } }).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
-                    if (tunnelInfo == null) throw new WarnException("无可用巷道");
-
-                    //开始变更任务信息
-                    foreach (var item in enumerable)
+                    else
                     {
-                        var dev = item.Entity.Create<StationDevice>();
-                        var task = taskList.FirstOrDefault(p => p.ID == dev.Data2.Tasknum);
-                        if (task.TYPE == TaskType.倒库)
+                        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.SRM涂布取货)) //一楼所有取货点
+                                              .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)))
+                                                  .Where(v => stationDeviceGroup.Items.Any(p => p.Entity == v))// 筛选出包含在当前设备组的设备
+                                                  .Distinct()
+                                                  .FirstOrDefault();//去一次重
+                            if (turntable == null) continue;
+                            var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == turntable)).MinBy(p => p.CODE);
+
+                            tunnelInfos.Add(new TunnelInfo
+                            {
+                                Tunnel = item,
+                                taskIN = dev, //找到放货点设备所在组
+                                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; } }).MinBy(v => tunnelNo.IndexOf(v.Tunnel.CODE));
+                        if (tunnelInfo == null) throw new WarnException("无可用巷道");
+
+                        //开始变更任务信息
+                        foreach (var item in enumerable)
+                        {
+                            var dev = item.Entity.Create<StationDevice>();
+                            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 = dev.Entity.GetPath(task.DEVICE).CODE;
+                            task.TaskGroupKey = res.WMSTaskGroupKey;
+                            task.ADDRTO = task.DEVICE;
+                            var msg = $"下达从{stationDeviceGroup.Entity.CODE}移动至{task.ADDRNEXT}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
+                            msg += $"[{dev.Data.Tasknum}][{stationDeviceGroup.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));
-                            continue;
                         }
-                        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 = dev.Entity.GetPath(task.DEVICE).CODE;
-                        task.TaskGroupKey = res.WMSTaskGroupKey;
-                        task.ADDRTO = task.DEVICE;
-                        var msg = $"下达从{stationDeviceGroup.Entity.CODE}移动至{task.ADDRNEXT}的PLC指令。同时将任务分配至[{task.TUNNEL}]-[{task.DEVICE}]";
-                        msg += $"[{dev.Data.Tasknum}][{stationDeviceGroup.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));
+                        db.Default.SaveChanges();
                     }
-                    db.Default.SaveChanges();
                 });
 
                 // 开始将任务信息写入到设备
@@ -607,4 +614,4 @@ namespace WCS.Service.Works.Station
             "G1429",
         };
     }
-}
+}