From 9c4d9f98c100f8f891f60d0706dd3d4111eeaebd Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 14 二月 2025 08:52:45 +0800
Subject: [PATCH] 修改数据库配置，增加PLC入库前信号交互
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 11 ++++++++++-
1 files changed, 10 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..5dd75ac 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;
@@ -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()
{
--
Gitblit v1.8.0