|
@@ -138,7 +138,18 @@ namespace WCS.Service.Works.Station
|
|
|
var tasks = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == task.TaskGroupKey);
|
|
|
if (tasks != devise.Count) throw new WarnException($"可执行任务数{devise.Count},实际任务数{tasks}");
|
|
|
|
|
|
- //问题,要怎么确定目标巷道的货物
|
|
|
+ //找到下两个地址
|
|
|
+ if (task.TYPE == TaskType.倒库)
|
|
|
+ {
|
|
|
+ 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;
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ task.ADDRNEXT = "G1";
|
|
|
+ }
|
|
|
|
|
|
task.ADDRNEXT = "G1";
|
|
|
task.CreateStatusLog(db, $"分配目标地址{task.ADDRNEXT}", this.GetType());
|
|
@@ -579,4 +590,4 @@ namespace WCS.Service.Works.Station
|
|
|
return dev.CODE == "G1340" || dev.CODE == "G1343";
|
|
|
}
|
|
|
}
|
|
|
-}
|
|
|
+}
|