From f735e389c01eed24d6b9792b35d2f98d15f3ecbb Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期六, 14 九月 2024 08:06:45 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/Service/WcsTaskMonitor/WcsTaskMonitorService.cs | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTaskMonitor/WcsTaskMonitorService.cs b/Admin.NET/WCS.Application/Service/WcsTaskMonitor/WcsTaskMonitorService.cs
index b85a40c..a536c41 100644
--- a/Admin.NET/WCS.Application/Service/WcsTaskMonitor/WcsTaskMonitorService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTaskMonitor/WcsTaskMonitorService.cs
@@ -1,4 +1,6 @@
锘�
+using WCS.Application.Service.WcsTaskMonitor.Dto;
+
namespace WCS.Application;
/// <summary>
@@ -21,7 +23,7 @@
[HttpPost]
[ApiDescriptionSettings(Name = "Page")]
[DisplayName("鍒嗛〉鏌ヨ浠诲姟鏄庣粏鐩戞帶琛�")]
- public async Task<SqlSugarPagedList<WcsTaskMonitorOutput>> Page(PageWcsTaskMonitorInput input)
+ public async Task<SqlSugarPagedList<WcsTaskMonitorOutput2>> Page(PageWcsTaskMonitorInput input)
{
input.SearchKey = input.SearchKey?.Trim();
var query = _wcsTaskMonitorRep.AsQueryable()
@@ -29,8 +31,17 @@
u.TaskNo.Contains(input.SearchKey)
)
.WhereIF(!string.IsNullOrWhiteSpace(input.TaskNo), u => u.TaskNo.Contains(input.TaskNo.Trim()))
- .Select<WcsTaskMonitorOutput>();
- return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+ .LeftJoin<WcsDevice>((u, plcid) => u.PlcId == plcid.Id)
+ .Select((u, plcid) => new WcsTaskMonitorOutput2
+ {
+ Id = u.Id,
+ TaskNo = u.TaskNo,
+ PlcName = plcid.StationNum + "宸ヤ綅锛�" + plcid.Text,
+ InteractiveMsg = u.InteractiveMsg,
+ CreateTime = u.CreateTime
+ })
+ .OrderByDescending(u=>u.CreateTime);
+ return await query.OrderBuilder(input,"","").ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
--
Gitblit v1.8.0