|
|
@@ -594,8 +594,14 @@ namespace WCS.Service.Extensions
|
|
|
//获取当前工位的目标地址
|
|
|
var ELine = i == 0 ? Data.ELine_1.ToString() : Data.ELine_2.ToString();
|
|
|
task = db.Default.Set<WCS_TASK>().Single(v => taskIds[i] == v.ID);
|
|
|
- if (task.STATUS != TaskStatus.堆垛机执行)
|
|
|
- throw new Exception($"堆垛机已完成任务[{task.ID}]但WCS状态为[{task.STATUS}],应为[{TaskStatus.堆垛机执行}]");
|
|
|
+ if (task.STATUS != TaskStatus.堆垛机执行 && task.STATUS != TaskStatus.堆垛机完成) continue;
|
|
|
+
|
|
|
+ if (task.STATUS == TaskStatus.堆垛机完成)
|
|
|
+ {
|
|
|
+ if (i == 0) Data.FinishedACK_1 = 1;
|
|
|
+ else Data.FinishedACK_2 = 1;
|
|
|
+ throw new DoException("二次处理堆垛机完成任务");
|
|
|
+ }
|
|
|
|
|
|
if (task.TYPE == TaskType.入库)
|
|
|
{
|
