|
@@ -143,15 +143,13 @@ namespace WCS.Service.Works.Station
|
|
|
{
|
|
|
var next1 = dev.Station.Entity.GetNext(task.TUNNELDL);
|
|
|
var next2 = next1.GetNext(task.TUNNELDL);
|
|
|
- var next3 = Device.Where(v => v.IsDevGroup()).FirstOrDefault(v => v.CODE == dev.FinishCode);
|
|
|
- task.ADDRNEXT =next3.CODE;
|
|
|
+ var next3 = Device.Where(v => v.IsDevGroup()).FirstOrDefault(v => v.DEVICEGROUP.Any(p => p.MEMBER.CODE == dev.FinishCode));
|
|
|
+ task.ADDRNEXT = next3.CODE;
|
|
|
}
|
|
|
else
|
|
|
{
|
|
|
task.ADDRNEXT = "G1";
|
|
|
}
|
|
|
-
|
|
|
- task.ADDRNEXT = "G1";
|
|
|
task.CreateStatusLog(db, $"分配目标地址{task.ADDRNEXT}", this.GetType());
|
|
|
finishTaskList.Add(new FinishTaskList<int>(task.ID, dev.Station));
|
|
|
}
|