|
@@ -168,12 +168,20 @@ namespace WCS.Service.Works.SRM
|
|
|
//检测任务数量与可用任务数量是否有效
|
|
|
var task = db.Default.Set<WCS_TASK>().FirstOrDefault(v => v.STATUS < TaskStatus.堆垛机执行 && v.ID == st.Data2.Tasknum);
|
|
|
var taskCount = db.Default.Set<WCS_TASK>().Count(v => v.TaskGroupKey == task.TaskGroupKey);
|
|
|
- return taskCount switch
|
|
|
+
|
|
|
+ switch (taskCount)
|
|
|
{
|
|
|
- 1 => dev1IsThereATask || dev2IsThereATask,
|
|
|
- 2 => dev1IsThereATask && dev2IsThereATask,
|
|
|
- _ => throw new WarnException($"同组任务最多为2,当前任务组有{taskCount}"),
|
|
|
- };
|
|
|
+ case 1:
|
|
|
+ if (!(dev1IsThereATask || dev2IsThereATask)) throw new WarnException($"任务数量错误");
|
|
|
+
|
|
|
+ break;
|
|
|
+
|
|
|
+ case 2:
|
|
|
+ if (!(dev1IsThereATask && dev2IsThereATask)) throw new WarnException($"任务数量错误");
|
|
|
+ break;
|
|
|
+
|
|
|
+ default: throw new WarnException($"同组任务最多为2,当前任务组有{taskCount}");
|
|
|
+ }
|
|
|
|
|
|
//处理一工位
|
|
|
if (dev1IsThereATask)
|