From 34044b791a62914aec56576f40d9de958c4f2bd4 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期三, 28 八月 2024 16:19:39 +0800
Subject: [PATCH] 任务日志和PLC取货异常逻辑
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 insertions(+), 4 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 18318cc..62d8fe6 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,4 +1,8 @@
锘�
+using AngleSharp.Dom;
+using Furion.DatabaseAccessor;
+using Microsoft.AspNetCore.SignalR;
+
namespace WCS.Application;
/// <summary>
@@ -8,9 +12,12 @@
public class WcsTaskService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WcsTask> _wcsTaskRep;
- public WcsTaskService(SqlSugarRepository<WcsTask> wcsTaskRep)
+ private readonly IHubContext<TaskLogHub, ITaskLogHub> _taskLogHubContext;
+
+ public WcsTaskService(SqlSugarRepository<WcsTask> wcsTaskRep, IHubContext<TaskLogHub, ITaskLogHub> taskLogHubContext)
{
_wcsTaskRep = wcsTaskRep;
+ _taskLogHubContext = taskLogHubContext;
}
/// <summary>
@@ -23,7 +30,7 @@
[DisplayName("鍒嗛〉鏌ヨ浠诲姟琛�")]
public async Task<SqlSugarPagedList<WcsTaskOutput>> Page(PageWcsTaskInput input)
{
- input.SearchKey = input.SearchKey?.Trim();
+ input.SearchKey = input.SearchKey?.Trim();
var query = _wcsTaskRep.AsQueryable()
.WhereIF(!string.IsNullOrEmpty(input.SearchKey), u =>
u.TaskNo.Contains(input.SearchKey)
@@ -32,7 +39,7 @@
.WhereIF(input.TaskType.HasValue, u => u.TaskType == input.TaskType)
.WhereIF(input.Status.HasValue, u => u.Status == input.Status)
.Select<WcsTaskOutput>();
- return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
+ return await query.OrderBuilder(input).ToPagedListAsync(input.Page, input.PageSize);
}
/// <summary>
@@ -105,7 +112,50 @@
return await _wcsTaskRep.AsQueryable().Select<WcsTaskOutput>().ToListAsync();
}
-
+ /// <summary>
+ /// 瀹屾垚/鍙栨秷浠诲姟琛�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Finsh")]
+ [DisplayName("瀹屾垚/鍙栨秷浠诲姟琛�")]
+ [UnitOfWork]
+ public async Task Finsh(UpdateWcsTaskInput input)
+ {
+ if (input.Status == TaskStatusEnum.Complete || input.Status == TaskStatusEnum.Cancell)
+ {
+ var modTask = await _wcsTaskRep.GetByIdAsync(input.Id);
+ if (modTask.Status > TaskStatusEnum.Doing)
+ throw Oops.Oh("浠诲姟鐘舵�佸紓甯�");
+ if (input.Status == TaskStatusEnum.Complete)
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ else
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.FinishDate = DateTime.Now;
+ modTask.Status = input.Status;
+ await _wcsTaskRep.Context.Updateable(modTask).UpdateColumns(s => new { s.Status, s.IsSuccess, s.FinishDate }).ExecuteCommandAsync();
+ //鍐欏叆浠诲姟鏄庣粏琛�
+ WcsTaskMonitor modTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = 0,
+ PlcName = "",
+ Status = TaskStatusEnum.Complete,
+ StartLocat = modTask.StartLocate,
+ EndLocat = modTask.EndLocate,
+ InteractiveMsg = input.Status == TaskStatusEnum.Complete ? "浠诲姟宸叉墜鍔ㄥ畬鎴�" : "浠诲姟宸叉墜鍔ㄥ彇娑�",
+ PalletNo = modTask.PalletNo
+ };
+ await _wcsTaskRep.Context.Insertable(modTaskMonitor).ExecuteCommandAsync();
+ //await _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ //await _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+ else
+ {
+ throw Oops.Oh("浠诲姟鐘舵�佸紓甯�");
+ }
+ }
--
Gitblit v1.8.0