| | |
| | | .WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim())) |
| | | .WhereIF(input.TaskType.HasValue, u => u.TaskType == input.TaskType) |
| | | .WhereIF(input.Status.HasValue, u => u.Status == input.Status) |
| | | .WhereIF(!string.IsNullOrWhiteSpace(input.PalletNo), u => u.PalletNo.Contains(input.PalletNo.Trim())) |
| | | .WhereIF(!string.IsNullOrWhiteSpace(input.Origin), u => u.Origin.Contains(input.Origin.Trim())) |
| | | .Select<WcsTaskOutput>(); |
| | | return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize); |
| | | } |
| | |
| | | if (modTask.Status > TaskStatusEnum.Doing) |
| | | throw Oops.Oh("任务状态异常"); |
| | | if (input.Status == TaskStatusEnum.Complete) |
| | | { |
| | | modTask.IsSuccess = TaskSuccessEnum.Success; |
| | | modTask.FinishDate = DateTime.Now;//完成时间 |
| | | } |
| | | else |
| | | { |
| | | modTask.IsSuccess = TaskSuccessEnum.Fail; |
| | | modTask.FinishDate = DateTime.Now; |
| | | modTask.CancelDate = DateTime.Now;//取消时间 |
| | | } |
| | | modTask.Status = input.Status; |
| | | await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Status, s.IsSuccess, s.FinishDate, s.UpdateTime,s.UpdateUserId,s.UpdateUserName }).ExecuteCommandAsync(); |
| | | await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Status, s.IsSuccess, s.FinishDate, s.CancelDate, s.UpdateTime, s.UpdateUserId, s.UpdateUserName }).ExecuteCommandAsync(); |
| | | //写入任务明细表 |
| | | WcsTaskMonitor modTaskMonitor = new WcsTaskMonitor() |
| | | { |