|
@@ -106,7 +106,7 @@ namespace WCS.WorkEngineering.WebApi.Controllers
|
|
|
break;
|
|
|
|
|
|
case TaskType.OutDepot:
|
|
|
- if (task.Status > Entity.TaskStatus.WaitingToExecute || task.BusType != "车间叫料")
|
|
|
+ if (task.Status > Entity.TaskStatus.WaitingToExecute || (task.BusType != "车间叫料" || task.BusType != "芯股站台送空托"))
|
|
|
{
|
|
|
response.ResDataList.Add(new HandleTaskResponse()
|
|
|
{
|
|
@@ -176,13 +176,13 @@ namespace WCS.WorkEngineering.WebApi.Controllers
|
|
|
{
|
|
|
var task = db.Default.Queryable<WCS_TaskInfo>().Where(t => t.ID == item).First();
|
|
|
if (task == null) continue;
|
|
|
- if (task.BusType != "车间叫料")
|
|
|
+ if (task.BusType != "车间叫料" || task.BusType != "芯股站台送空托")
|
|
|
{
|
|
|
response.ResDataList.Add(new HandleTaskResponse()
|
|
|
{
|
|
|
IsSuccess = false,
|
|
|
TaskNo = item,
|
|
|
- Message = $"只能手动完成机台叫料任务",
|
|
|
+ Message = $"该类型任务不支持完成",
|
|
|
});
|
|
|
continue;
|
|
|
}
|