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/PLC/PLCService.cs | 281 +++++++++++++++++++++++-------
Admin.NET/WCS.Application/Service/WcsTask/WcsTaskService.cs | 58 ++++++
Admin.NET/WCS.Application/Util/HttpService.cs | 28 +++
.gitignore | 1
Web/src/api/wcs/wcsTask.ts | 8
Admin.NET/WCS.Application/Configuration/Logging.json | 2
Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs | 10
Web/src/api/log/wcsAlarmLog.ts | 50 +++++
Admin.NET/Admin.NET.Core/Logging/LoggingSetup.cs | 5
Web/src/views/wcs/wcsTask/index.vue | 79 +++++---
10 files changed, 412 insertions(+), 110 deletions(-)
diff --git a/.gitignore b/.gitignore
index 10d1295..b1a5d68 100644
--- a/.gitignore
+++ b/.gitignore
@@ -200,6 +200,7 @@
# except build/, which is used as an MSBuild target.
!**/[Pp]ackages/build/
!**/system/log/
+!**/api/log/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/[Pp]ackages/repositories.config
# NuGet v3's project.json files produces more ignorable files
diff --git a/Admin.NET/Admin.NET.Core/Logging/LoggingSetup.cs b/Admin.NET/Admin.NET.Core/Logging/LoggingSetup.cs
index 99e372f..33e1dd2 100644
--- a/Admin.NET/Admin.NET.Core/Logging/LoggingSetup.cs
+++ b/Admin.NET/Admin.NET.Core/Logging/LoggingSetup.cs
@@ -45,7 +45,10 @@
options.WithTraceId = true; // 鏄剧ず绾跨▼Id
options.WithStackFrame = true; // 鏄剧ず绋嬪簭闆�
options.FileNameRule = fileName => string.Format(fileName, DateTime.Now, logLevel.ToString()); // 姣忓ぉ鍒涘缓涓�涓枃浠�
- options.WriteFilter = logMsg => logMsg.LogLevel >= logLevel; // 鏃ュ織绾у埆
+ options.WriteFilter = (logMsg) =>
+ {
+ return logMsg.LogLevel >= logLevel && logMsg.LogName != CommonConst.SysLogCategoryName; // 鍙啓LoggingMonitor鏃ュ織
+ }; // 鏃ュ織绾у埆
options.HandleWriteError = (writeError) => // 鍐欏叆澶辫触鏃跺惎鐢ㄥ鐢ㄦ枃浠�
{
writeError.UseRollbackFileName(Path.GetFileNameWithoutExtension(writeError.CurrentFileName) + "-oops" + Path.GetExtension(writeError.CurrentFileName));
diff --git a/Admin.NET/WCS.Application/Configuration/Logging.json b/Admin.NET/WCS.Application/Configuration/Logging.json
index f1e9833..8e8520c 100644
--- a/Admin.NET/WCS.Application/Configuration/Logging.json
+++ b/Admin.NET/WCS.Application/Configuration/Logging.json
@@ -6,7 +6,7 @@
"Microsoft.EntityFrameworkCore": "Information"
},
"File": {
- "Enabled": false, // 鍚敤鏂囦欢鏃ュ織
+ "Enabled": true, // 鍚敤鏂囦欢鏃ュ織
"FileName": "logs/{0:yyyyMMdd}_{1}.log", // 鏃ュ織鏂囦欢
"Append": true, // 杩藉姞瑕嗙洊
// "MinimumLevel": "Information", // 鏃ュ織绾у埆
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 3b8b3f3..7f56930 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -147,7 +147,7 @@
if (listResult.All(s => s.IsSucceed))
{
// 鍐欏叆璺烘満浠诲姟涓嬪彂瀹屾垚
- plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "10");
+ plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "10");
// 灏嗗嚭搴撲换鍔″緟鎵ц鏀逛负姝ｅ湪鎵ц
_db.Updateable<WcsTask>()
@@ -246,7 +246,7 @@
var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
if (!res.IsSucceed)
break;
- res = plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "20");
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "20");
if (!res.IsSucceed)
break;
// 鏍规嵁璺烘満鍙风‘璁ゅ彇璐у伐浣�
@@ -304,7 +304,7 @@
var res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, taskNo);
if (!res.IsSucceed)
break;
- res = plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "30");
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
if (!res.IsSucceed)
break;
//淇敼浠诲姟鐘舵��
@@ -354,77 +354,129 @@
}
break;
case TaskTypeEnum.Out://鍑哄簱
- // 浠庡嚭搴撲换鍔¤幏鍙栧贩閬撳彿
- string num = ""; // 鏀捐揣宸ヤ綅鍙�
- if (modTask.StartRoadway == "R01")
{
- num = "11"; //浜や簰宸ヤ綅
- }
- else if (modTask.StartRoadway == "R02")
- {
- num = "7"; //浜や簰宸ヤ綅
- }
- var modDevice2 = modDevice.listDevice.FirstOrDefault(s => s.StationNum == num);
- if (modDevice2 == null)
- {
- Log.Error($"銆愯泛鏈恒�戞壘涓嶅埌宸ヤ綅{num}璁惧淇℃伅");
- break;
- }
- // 鏍规嵁鐩爣鍙ｈ幏鍙栫洰鏍囧伐浣�
- string outCode = modTask.EndLocate.IsNullOrEmpty() ? "-1" : modTask.EndLocate;
-
- var listStation = _db.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice2.Id).ToList();
- //缁橮LC鍐欏叆浠诲姟鏁版嵁
- var listResult = new List<Result>();
- //浠诲姟鍙�
- var modPosTask = listStation.FirstOrDefault(s => s.Text == "TaskNo");
- listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
- //鎵樼洏鍙�
- var modPosPalletNo = listStation.FirstOrDefault(s => s.Text == "PalletNo");
- listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
- //璧峰宸ヤ綅
- var modPosLocatNo = listStation.FirstOrDefault(s => s.Text == "StartLocatNo");
- listResult.Add(plcConn.SetPlcDBValue(modPosLocatNo.PosType, modDevice.DbNumber, modPosLocatNo.PlcPos, num));
- // 鐩爣宸ヤ綅
- var modPosEndLocatNo = listStation.FirstOrDefault(s => s.Text == "EndLocatNo");
- listResult.Add(plcConn.SetPlcDBValue(modPosEndLocatNo.PosType, modDevice.DbNumber, modPosEndLocatNo.PlcPos, outCode));
- //鍏ㄩ儴鍐欏叆鎴愬姛
- if (listResult.All(s => s.IsSucceed))
- {
- // 鍐欏叆宸ヤ綅wcs鎺у埗瀛�
- var res = plcConn.SetPlcDBValue(modDevice2.PosType, modDevice2.DbNumber, modDevice2.WcsPos, "120");
- if (!res.IsSucceed)
- break;
- //鍐欏叆plc浠诲姟鍙�
- var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
- res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, modTask.TaskNo);
- if (!res.IsSucceed)
- break;
- //鍐欏叆璺烘満wcs鎺у埗瀛楁祦绋�30 杩斿洖鍨涙満鎵ц瀹屾垚
- res = plcConn.SetPlcDBValue(modDevice.PosType.Value, modDevice.DbNumber, modDevice.WcsPos, "30");
- if (!res.IsSucceed)
- break;
- //璁板綍浠诲姟鏄庣粏
- var modTaskMonitor = new WcsTaskMonitor()
+ // 浠庡嚭搴撲换鍔¤幏鍙栧贩閬撳彿
+ string num = ""; // 鏀捐揣宸ヤ綅鍙�
+ if (modTask.StartRoadway == "R01")
{
- TaskNo = modTask.TaskNo,
- PlcId = modDevice2.PlcId,
- PlcName = modDevice2.Text,
- InteractiveMsg = $"鍐欏叆鎸囦护锛氭敹鍒拌泛鏈烘斁璐у畬鎴愶紱鏀捐揣{num}宸ヤ綅===銆媨outCode}鍑哄簱鍙�",
- PalletNo = modTask.PalletNo,
- Status = TaskStatusEnum.Complete,
- StartLocat = num, //璧峰浣嶇疆
- EndLocat = outCode, //鐩爣宸ヤ綅
- };
- _db.Insertable(modTaskMonitor).ExecuteCommand();
+ num = "11"; //浜や簰宸ヤ綅
+ }
+ else if (modTask.StartRoadway == "R02")
+ {
+ num = "7"; //浜や簰宸ヤ綅
+ }
+ var modDevice2 = modDevice.listDevice.FirstOrDefault(s => s.StationNum == num);
+ if (modDevice2 == null)
+ {
+ Log.Error($"銆愯泛鏈恒�戞壘涓嶅埌宸ヤ綅{num}璁惧淇℃伅");
+ break;
+ }
+ // 鏍规嵁鐩爣鍙ｈ幏鍙栫洰鏍囧伐浣�
+ string outCode = modTask.EndLocate.IsNullOrEmpty() ? "-1" : modTask.EndLocate;
- //涓嬪彂浠诲姟鏃ュ織
- _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
- //todo:鍨涙満鍑哄簱涓嶇┖璺�
+ var listStation = _db.Queryable<WcsPosition>().Where(s => s.DeviceId == modDevice2.Id).ToList();
+ //缁橮LC鍐欏叆浠诲姟鏁版嵁
+ var listResult = new List<Result>();
+ //浠诲姟鍙�
+ var modPosTask = listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, modTask.TaskNo));
+ //鎵樼洏鍙�
+ var modPosPalletNo = listStation.FirstOrDefault(s => s.Text == "PalletNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosPalletNo.PosType, modDevice.DbNumber, modPosPalletNo.PlcPos, modTask.PalletNo));
+ //璧峰宸ヤ綅
+ var modPosLocatNo = listStation.FirstOrDefault(s => s.Text == "StartLocatNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosLocatNo.PosType, modDevice.DbNumber, modPosLocatNo.PlcPos, num));
+ // 鐩爣宸ヤ綅
+ var modPosEndLocatNo = listStation.FirstOrDefault(s => s.Text == "EndLocatNo");
+ listResult.Add(plcConn.SetPlcDBValue(modPosEndLocatNo.PosType, modDevice.DbNumber, modPosEndLocatNo.PlcPos, outCode));
+ //鍏ㄩ儴鍐欏叆鎴愬姛
+ if (listResult.All(s => s.IsSucceed))
+ {
+ // 鍐欏叆宸ヤ綅wcs鎺у埗瀛�
+ var res = plcConn.SetPlcDBValue(modDevice2.PosType, modDevice2.DbNumber, modDevice2.WcsPos, "120");
+ if (!res.IsSucceed)
+ break;
+ //鍐欏叆plc浠诲姟鍙�
+ var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, modTask.TaskNo);
+ if (!res.IsSucceed)
+ break;
+ //鍐欏叆璺烘満wcs鎺у埗瀛楁祦绋�30 杩斿洖鍨涙満鎵ц瀹屾垚
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+ if (!res.IsSucceed)
+ break;
+ //璁板綍浠诲姟鏄庣粏
+ var modTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice2.PlcId,
+ PlcName = modDevice2.Text,
+ InteractiveMsg = $"鍐欏叆鎸囦护锛氭敹鍒拌泛鏈烘斁璐у畬鎴愶紱鏀捐揣{num}宸ヤ綅===銆媨outCode}鍑哄簱鍙�",
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete,
+ StartLocat = num, //璧峰浣嶇疆
+ EndLocat = outCode, //鐩爣宸ヤ綅
+ };
+ _db.Insertable(modTaskMonitor).ExecuteCommand();
+
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ //todo:鍨涙満鍑哄簱涓嶇┖璺�
+ }
}
-
break;
case TaskTypeEnum.Move:
+ {
+ //绉诲簱浠诲姟
+ var modStation = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ // 鍐欏叆plc浠诲姟鍙�
+ var res = plcConn.SetPlcDBValue(modStation.PosType, modDevice.DbNumber, modStation.PlcPos, taskNo);
+ if (!res.IsSucceed)
+ break;
+ //鍐欏叆plc鎺у埗瀛�
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "30");
+ if (!res.IsSucceed)
+ break;
+ modTask.Status = TaskStatusEnum.Complete;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestTask(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //璇锋眰鎴愬姛
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
+ //todo:淇敼鍌ㄤ綅淇℃伅 浠诲姟绫诲瀷 鎵ц鐘舵�� 璧峰浣嶇疆 鐩爣浣嶇疆
+ //
+
+ //璁板綍浠诲姟鏄庣粏
+ var modTaskMonitor = new WcsTaskMonitor()
+ {
+ TaskNo = modTask.TaskNo,
+ PlcId = modDevice.PlcId,
+ PlcName = modDevice.Text,
+ InteractiveMsg = "浠诲姟瀹屾垚锛岃繑鍥炵粰WMS浠诲姟瀹屾垚",
+ StartLocat = modTask.StartLocate,
+ EndLocat = modTask.EndLocate,
+ PalletNo = modTask.PalletNo,
+ Status = TaskStatusEnum.Complete
+ };
+ _db.Insertable(modTaskMonitor).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTaskMonitor(modTaskMonitor.Adapt<WcsTaskMonitorOutput>());
+ }
+ else
+ {
+ //璇锋眰澶辫触
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.Information = modResponseTask.Message;
+ _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ }
+
+ //todo:LED灞�
+
+ }
break;
default:
@@ -432,6 +484,99 @@
}
}
break;
+ case "100":
+ {
+ //绌哄彇璐у紓甯�
+ var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
+ if (!result.IsSucceed)
+ break;
+ string taskNo = Convert.ToString(TaskNo);
+ var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
+ if (modTask == null)
+ {
+ Log.Error($"銆愯泛鏈恒�戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ break;
+ }
+ var res = plcConn.SetPlcDBValue(modPosTask.PosType, modDevice.DbNumber, modPosTask.PlcPos, taskNo);
+ if (!res.IsSucceed)
+ break;
+ res = plcConn.SetPlcDBValue(modDevice.PosType, modDevice.DbNumber, modDevice.WcsPos, "100");
+ if (!res.IsSucceed)
+ break;
+ modTask.Status = TaskStatusEnum.Exception;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ Log.Information($"銆愯泛鏈恒�憌cs浠诲姟鍙樻洿绌哄彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestEmptyException(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //璇锋眰鎴愬姛
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTask(modTask.Adapt<WcsTaskOutput>());
+ }
+ else
+ {
+ //璇锋眰澶辫触
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.Information = modResponseTask.Message;
+ _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ }
+ //todo:LED灞�
+ }
+ break;
+ case "101":
+ {
+ //婊℃斁璐у紓甯�
+ var modPosPlcTask = modDevice.listStation.FirstOrDefault(s => s.Text == "PlcTaskNo");
+ var modPosTask = modDevice.listStation.FirstOrDefault(s => s.Text == "TaskNo");
+ var modPosPalletNo = modDevice.listStation.FirstOrDefault(s => s.Text == "PalletNo");
+ var (result, TaskNo) = plcConn.GetPlcDBValue(modPosPlcTask.PosType, modDevice.DbNumber, modPosPlcTask.PlcPos);
+ if (!result.IsSucceed)
+ break;
+ string taskNo = Convert.ToString(TaskNo);
+ var modTask = _db.Queryable<WcsTask>().First(s => s.TaskNo == taskNo && s.Status == TaskStatusEnum.Doing);
+ if (modTask == null)
+ {
+ Log.Error($"銆愯泛鏈恒�戝綋鍓嶄换鍔″彿涓嶅瓨鍦ㄥ搴旂殑浠诲姟锛屼换鍔″彿锛歿modTask.TaskNo}");
+ break;
+ }
+ modTask.Status = TaskStatusEnum.Exception;
+ _db.Updateable(modTask).UpdateColumns(s => s.Status).ExecuteCommand();
+ Log.Information($"銆愯泛鏈恒�憌cs浠诲姟鍙樻洿婊″彇寮傚父锛屼换鍔″彿锛歿modTask.TaskNo}");
+ var modTaskRequest = modTask.Adapt<TaskRequest>();
+ HttpService httpService = new HttpService();
+ var modResponseTask = httpService.RequestEmptyException(modTaskRequest).Result;
+ if (modResponseTask.StatusCode == "0")
+ {
+ //璇锋眰鎴愬姛
+ modTask.IsSuccess = TaskSuccessEnum.Success;
+ _db.Updateable(modTask).UpdateColumns(s => s.IsSuccess).ExecuteCommand();
+ var modInsertTask = modResponseTask.TaskList;
+ modInsertTask.TaskType = TaskTypeEnum.In;
+ modInsertTask.Origin = "WMS";
+ modInsertTask.StartLocate = modTask.StartLocate;
+ modInsertTask.Levels = 1;
+ _db.Insertable(modInsertTask);
+
+ //涓嬪彂浠诲姟鏃ュ織
+ _taskLogHubContext.Clients.All.PublicTask(modInsertTask.Adapt<WcsTaskOutput>());
+ }
+ else
+ {
+ //璇锋眰澶辫触
+ modTask.IsSuccess = TaskSuccessEnum.Fail;
+ modTask.Information = modResponseTask.Message;
+ _db.Updateable(modTask).UpdateColumns(s => new { s.IsSuccess, s.Information }).ExecuteCommand();
+ }
+ //todo:LED灞�
+
+ }
+ break;
default:
break;
}
diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
index 96cd826..9a3c42d 100644
--- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
+++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceDto.cs
@@ -34,27 +34,27 @@
/// <summary>
/// DB鍖哄煙
/// </summary>
- public string? DbNumber { get; set; }
+ public string DbNumber { get; set; }
/// <summary>
/// 宸ヤ綅鍙�
/// </summary>
- public string? StationNum { get; set; }
+ public string StationNum { get; set; }
/// <summary>
/// PLC鍋忕Щ閲�
/// </summary>
- public string? PlcPos { get; set; }
+ public string PlcPos { get; set; }
/// <summary>
/// WCS鍋忕Щ閲�
/// </summary>
- public string? WcsPos { get; set; }
+ public string WcsPos { get; set; }
/// <summary>
/// 娴佺▼瀛楃被鍨�
/// </summary>
- public PLCDataTypeEnum? PosType { get; set; }
+ public PLCDataTypeEnum PosType { get; set; }
/// <summary>
/// 鏄剧ず灞廼p鍦板潃
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("浠诲姟鐘舵�佸紓甯�");
+ }
+ }
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index cbb5172..cb84eb5 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -20,7 +20,33 @@
{
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
var result = await (url + "/api/DownAPi/ReceiveWcsSignal").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
- Log.Debug("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+ return result;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉绌哄彇寮傚父鎺ュ彛
+ /// </summary>
+ /// <param name="model">浠诲姟淇℃伅</param>
+ /// <returns></returns>
+ public async Task<ResponseTasks> RequestEmptyException(TaskRequest model)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = await (url + "/api/DownAPi/EmptyException").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉绌哄彇寮傚父鎺ュ彛" + result.ToJson());
+ return result;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉婊″彇寮傚父鎺ュ彛
+ /// </summary>
+ /// <param name="model">浠诲姟淇℃伅</param>
+ /// <returns></returns>
+ public async Task<ResponseTasks> RequestFullException(TaskRequest model)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = await (url + "/api/DownAPi/FullException").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉婊″彇寮傚父鎺ュ彛" + result.ToJson());
return result;
}
}
diff --git a/Web/src/api/log/wcsAlarmLog.ts b/Web/src/api/log/wcsAlarmLog.ts
new file mode 100644
index 0000000..b8621a9
--- /dev/null
+++ b/Web/src/api/log/wcsAlarmLog.ts
@@ -0,0 +1,50 @@
+锘縤mport request from '/@/utils/request';
+enum Api {
+ AddWcsAlarmLog = '/api/wcsAlarmLog/add',
+ DeleteWcsAlarmLog = '/api/wcsAlarmLog/delete',
+ UpdateWcsAlarmLog = '/api/wcsAlarmLog/update',
+ PageWcsAlarmLog = '/api/wcsAlarmLog/page',
+ DetailWcsAlarmLog = '/api/wcsAlarmLog/detail',
+}
+
+// 澧炲姞鎶ヨ鏃ュ織
+export const addWcsAlarmLog = (params?: any) =>
+ request({
+ url: Api.AddWcsAlarmLog,
+ method: 'post',
+ data: params,
+ });
+
+// 鍒犻櫎鎶ヨ鏃ュ織
+export const deleteWcsAlarmLog = (params?: any) =>
+ request({
+ url: Api.DeleteWcsAlarmLog,
+ method: 'post',
+ data: params,
+ });
+
+// 缂栬緫鎶ヨ鏃ュ織
+export const updateWcsAlarmLog = (params?: any) =>
+ request({
+ url: Api.UpdateWcsAlarmLog,
+ method: 'post',
+ data: params,
+ });
+
+// 鍒嗛〉鏌ヨ鎶ヨ鏃ュ織
+export const pageWcsAlarmLog = (params?: any) =>
+ request({
+ url: Api.PageWcsAlarmLog,
+ method: 'post',
+ data: params,
+ });
+
+// 璇︽儏鎶ヨ鏃ュ織
+export const detailWcsAlarmLog = (id: any) =>
+ request({
+ url: Api.DetailWcsAlarmLog,
+ method: 'get',
+ data: { id },
+ });
+
+
diff --git a/Web/src/api/wcs/wcsTask.ts b/Web/src/api/wcs/wcsTask.ts
index 54669c5..c98786f 100644
--- a/Web/src/api/wcs/wcsTask.ts
+++ b/Web/src/api/wcs/wcsTask.ts
@@ -5,6 +5,7 @@
UpdateWcsTask = '/api/wcsTask/update',
PageWcsTask = '/api/wcsTask/page',
DetailWcsTask = '/api/wcsTask/detail',
+ FinshWcsTask = '/api/wcsTask/Finsh',
}
// 澧炲姞浠诲姟琛�
@@ -48,3 +49,10 @@
});
+// 瀹屾垚/鍙栨秷浠诲姟
+export const finshWcsTask = (params?: any) =>
+ request({
+ url: Api.FinshWcsTask,
+ method: 'post',
+ data: params,
+ });
\ No newline at end of file
diff --git a/Web/src/views/wcs/wcsTask/index.vue b/Web/src/views/wcs/wcsTask/index.vue
index 5b4534c..b68e9e8 100644
--- a/Web/src/views/wcs/wcsTask/index.vue
+++ b/Web/src/views/wcs/wcsTask/index.vue
@@ -55,7 +55,7 @@
</el-row>
</el-form>
<el-table :data="tableData" style="width: 100%" v-loading="loading" tooltip-effect="light" row-key="id"
- @row-click="handleClick" @sort-change="sortChange" border="">
+ @cell-click="handleClick" @sort-change="sortChange" border="">
<el-table-column type="index" label="搴忓彿" width="55" align="center" />
<el-table-column prop="taskNo" label="浠诲姟鍙�" show-overflow-tooltip="" />
<el-table-column prop="taskType" width="85" label="浠诲姟绫诲瀷" show-overflow-tooltip="">
@@ -80,17 +80,15 @@
<ModifyRecord :data="scope.row" />
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔" width="130" align="center" fixed="right" show-overflow-tooltip=""
+ <el-table-column prop="鎿嶄綔" label="鎿嶄綔" width="130" align="center" fixed="right" show-overflow-tooltip=""
v-if="auth('wcsTask:complete') || auth('wcsTask:cancell')">
<template #default="scope">
- <!-- <el-button icon="ele-Edit" size="small" text="" type="primary" @click="openEditWcsTask(scope.row)"
- v-auth="'wcsTask:update'"> 缂栬緫 </el-button>
- <el-button icon="ele-Delete" size="small" text="" type="primary" @click="delWcsTask(scope.row)"
- v-auth="'wcsTask:delete'"> 鍒犻櫎 </el-button> -->
- <el-button icon="ele-Check" size="small" text="" type="primary" @click="completeTask(scope.row)"
- v-auth="'wcsTask:complete'"> 瀹屾垚 </el-button>
- <el-button icon="ele-Close" size="small" text="" type="primary" @click="cancellTask(scope.row)"
- v-auth="'wcsTask:cancell'"> 鍙栨秷 </el-button>
+ <template v-if="scope.row.status <= 1">
+ <el-button icon="ele-Check" size="small" text="" type="primary" @click="completeTask(scope.row)"
+ v-auth="'wcsTask:complete'"> 瀹屾垚 </el-button>
+ <el-button icon="ele-Close" size="small" text="" type="primary" @click="cancellTask(scope.row)"
+ v-auth="'wcsTask:cancell'"> 鍙栨秷 </el-button>
+ </template>
</template>
</el-table-column>
</el-table>
@@ -158,7 +156,7 @@
import printDialog from '/@/views/system/print/component/hiprint/preview.vue'
import editDialog from '/@/views/wcs/wcsTask/component/editDialog.vue'
-import { pageWcsTask, deleteWcsTask } from '/@/api/wcs/wcsTask';
+import { pageWcsTask, finshWcsTask } from '/@/api/wcs/wcsTask';
import { pageWcsMonitorTask } from '/@/api/wcs/wcsTaskMonitor';
import { signalR } from './signalR';
@@ -187,8 +185,14 @@
signalR.off('PublicTask');
signalR.on('PublicTask', (data: any) => {
console.log(data)
- if (tableData.value.filter(t => t.id == data.id).length == 0) {
+ var listTask = tableData.value.filter(t => t.id == data.id);
+ if (listTask.length == 0) {
tableData.value.unshift(data)
+ }
+ else {
+ //濡傛灉宸茬粡瀛樺湪灏辨洿鏂版暟鎹�
+ const index = tableData.value.findIndex(t => t.id == data.id);
+ tableData.value.splice(index, 1, data);
}
});
signalR.off('PublicTaskMonitor');
@@ -247,33 +251,48 @@
editDialogRef.value.openDialog(row);
};
//瀹屾垚浠诲姟
-const completeTask = (row: any) => {
-
-}
-//鍙栨秷浠诲姟
-const cancellTask = (row: any) => {
-
-}
-// 鐐瑰嚮琛ㄦ牸
-const handleClick = (row: any, event: any, column: any) => {
- queryParams2.value.taskNo = row.taskNo;
- handleQuery2();
-};
-// 鍒犻櫎
-const delWcsTask = (row: any) => {
- ElMessageBox.confirm(`纭畾瑕佸垹闄ゅ悧?`, "鎻愮ず", {
+const completeTask = async (row: any) => {
+ ElMessageBox.confirm(`纭畾瑕佸畬鎴愪换鍔″悧?`, "鎻愮ず", {
confirmButtonText: "纭畾",
cancelButtonText: "鍙栨秷",
type: "warning",
})
.then(async () => {
- await deleteWcsTask(row);
+ var param = Object.assign(row);
+ param.status = 2;
+ await finshWcsTask(param);
handleQuery();
- ElMessage.success("鍒犻櫎鎴愬姛");
+ handleQuery2();
+ ElMessage.success("瀹屾垚浠诲姟鎴愬姛");
})
.catch(() => { });
-};
+}
+//鍙栨秷浠诲姟
+const cancellTask = async (row: any) => {
+ ElMessageBox.confirm(`纭畾瑕佸彇娑堜换鍔″悧?`, "鎻愮ず", {
+ confirmButtonText: "纭畾",
+ cancelButtonText: "鍙栨秷",
+ type: "warning",
+ })
+ .then(async () => {
+ var param = Object.assign(row);
+ param.status = 4;
+ await finshWcsTask(param);
+ handleQuery();
+ handleQuery2();
+ ElMessage.success("鍙栨秷浠诲姟鎴愬姛");
+ })
+ .catch(() => { });
+}
+// 鐐瑰嚮琛ㄦ牸
+const handleClick = (row, column, cell, event) => {
+ if (column.property === '鎿嶄綔') {
+ return;
+ }
+ queryParams2.value.taskNo = row.taskNo;
+ handleQuery2();
+};
// 鏀瑰彉椤甸潰瀹归噺
const handleSizeChange = (val: number) => {
tableParams.value.pageSize = val;
--
Gitblit v1.8.0