| | |
| | | using COSXML.Network; |
| | | using DocumentFormat.OpenXml.Drawing.Charts; |
| | | using DocumentFormat.OpenXml.Math; |
| | | using Elastic.Clients.Elasticsearch.Inference; |
| | | using Elastic.Clients.Elasticsearch.Tasks; |
| | | using Furion.DatabaseAccessor; |
| | | using Furion.Logging; |
| | |
| | | u.TaskNo.Contains(input.SearchKey) |
| | | ) |
| | | .WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim())) |
| | | .WhereIF(!string.IsNullOrWhiteSpace(input.OrderNo), u => u.OrderNo.Contains(input.OrderNo.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.OrderBy(o=>o.Levels).OrderByDescending(o=>o.CreateTime).ToPagedListAsync(input.Page, input.PageSize); |
| | | return await query.OrderBy(o=>o.Levels).OrderByDescending(o=>o.CreateTime) |
| | | .OrderByDescending(m=>m.Status).OrderBy(m=>m.TaskNo) |
| | | .ToPagedListAsync(input.Page, input.PageSize); |
| | | } |
| | | |
| | | /// <summary> |
| | |
| | | TaskType = ((int)modTask.TaskType).ToString(), |
| | | TaskStatus = ((int)TaskStatusEnum.Complete).ToString() |
| | | }; |
| | | //出库时,任务号字段增加出库口 |
| | | var taskno = modTask.TaskNo; |
| | | if (modTask.TaskType == TaskTypeEnum.Out) |
| | | { |
| | | taskno = taskno + modTask.EndLocate; |
| | | } |
| | | //任务详情 |
| | | var modTaskMonitor = new WcsTaskMonitor() |
| | | { |