fix

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

@@ -248,7 +248,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();
@@ -258,7 +258,7 @@ namespace WCS.Service.Works.Station
                                               .Distinct()
                                               .FirstOrDefault();//去一次重
                         if (turntable == null) continue;
-                        var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => d.MEMBER == turntable)).OrderBy(p => p.CODE).FirstOrDefault();
+                        var dev = Device.Where(p => p.CODE.StartsWith("G") && p.DEVICEGROUP.Any(d => allIn.Contains(d.MEMBER.CODE))).OrderBy(p => p.CODE).FirstOrDefault();
 
                         tunnelInfos.Add(new TunnelInfo
                         {
@@ -302,7 +302,7 @@ namespace WCS.Service.Works.Station
 
                         finishTask.Station.Data.Tasknum = task.ID;
                         finishTask.Station.Data.Goodsstart = obj.Entity.CODE.Replace("G", "").ToShort();
-                        finishTask.Station.Data.Goodsend = task.ADDRNEXT.Replace("G", "").ToShort();
+                        finishTask.Station.Data.Goodsend = finishTask.Station.Entity.GetPath(task.DEVICE).CODE.ToShort();
                         finishTask.Station.Data.Goodsnum = finishTaskList.Count.ToShort();
                         finishTask.Station.Data.CmdType = IstationCmdType.分配目标地址;
                         finishTask.Station.Data.VoucherNo++;