|
@@ -108,8 +108,8 @@ namespace WCS.Service.Works.Station
|
|
|
{
|
|
|
var code = obj.Entity.CODE;
|
|
|
//两个设备都必须满足的条件
|
|
|
- if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) return;
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) return;
|
|
|
+ if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException($"等待任务执行--凭证号不一致");
|
|
|
+ if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
|
|
|
|
|
|
//成功分配巷道的任务的任务
|
|
|
var finishTaskList = new List<FinishTaskList<int>>();
|
|
@@ -220,8 +220,8 @@ namespace WCS.Service.Works.Station
|
|
|
var code = obj.Entity.CODE;
|
|
|
|
|
|
//两个设备都必须满足的条件
|
|
|
- if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) return;
|
|
|
- if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) return;
|
|
|
+ if (obj.Items.Any(v => v.Data.VoucherNo != v.Data2.VoucherNo)) throw new WarnException($"等待任务执行--凭证号不一致");
|
|
|
+ if (obj.Items.Any(v => v.Data3.Status.HasFlag(StationStatus.运行状态位))) throw new WarnException($"设备运行中");
|
|
|
//成功分配巷道的任务的任务
|
|
|
var finishTaskList = new List<FinishTaskList<int>>();
|
|
|
|