liudl
2025-01-20 48d66a079c307356997fb400d27907ff6d363b7b
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -3,6 +3,7 @@
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;
@@ -55,7 +56,9 @@
            .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>
@@ -268,6 +271,12 @@
            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()
        {