From 66da0f6808fa8496a3216c94973a552389ab96ba Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:27:25 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 65 +++++++++++++++++++++++++++-----
1 files changed, 54 insertions(+), 11 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
index 5023d85..6bd9227 100644
--- a/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs
@@ -1,11 +1,8 @@
-锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆�
-//
-// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆�
-//
-// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐ｄ换锛屾垜浠笉鎵挎媴浠讳綍璐ｄ换锛�
+锘�
+using AngleSharp.Dom;
+using Furion.DatabaseAccessor;
+using Microsoft.AspNetCore.SignalR;
-using Admin.NET.Core.Service;
-using Microsoft.AspNetCore.Http;
namespace WCS.Application;
/// <summary>
@@ -15,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>
@@ -30,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)
@@ -39,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>
@@ -112,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, s.UpdateTime,s.UpdateUserId,s.UpdateUserName }).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