From a701d2fc7c3c822c581add45b6d4e0ff360fb053 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 07 六月 2025 11:37:57 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index da996a9..2cd928f 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/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;
@@ -50,12 +51,15 @@
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>
@@ -268,6 +272,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()
{
--
Gitblit v1.8.0