From 52ba6b195a4126df405ef453d52ba6eaab6521da Mon Sep 17 00:00:00 2001
From: yanjinhui <3306209981@qq.com>
Date: 星期五, 17 四月 2026 17:37:32 +0800
Subject: [PATCH] 优化3-4楼提升机以及添加报错接口
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs | 30 +++++++-----------------------
1 files changed, 7 insertions(+), 23 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs"
index 8e37567..f3a9530 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/Task/TaskJob.cs"
@@ -11,8 +11,10 @@
using System.ComponentModel;
using System.Linq;
using System.Reflection;
+using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core.BaseRepository;
@@ -38,8 +40,9 @@
private readonly ITrackloginfoService _trackloginfoService;
private readonly IUnitOfWorkManage _unitOfWorkManage;
private readonly IAGVCartInfoService _agvcartInfoService;
+ private readonly IStationInfoService _stationInfoService;
- public TaskJob(ITaskService taskService, IApiInfoService apiInfoService, IRGVLocationInfoService rGVLocationInfoService, IStationMangerService stationMangerService, ITrackloginfoService trackloginfoService, IUnitOfWorkManage unitOfWorkManage, IAGVCartInfoService agvcartInfoService)
+ public TaskJob(ITaskService taskService, IApiInfoService apiInfoService, IRGVLocationInfoService rGVLocationInfoService, IStationMangerService stationMangerService, ITrackloginfoService trackloginfoService, IUnitOfWorkManage unitOfWorkManage, IAGVCartInfoService agvcartInfoService, IStationInfoService stationInfoService)
{
_taskService = taskService;//娉ㄥ叆
_apiInfoService = apiInfoService;
@@ -48,6 +51,7 @@
_trackloginfoService = trackloginfoService;
_unitOfWorkManage = unitOfWorkManage;
_agvcartInfoService = agvcartInfoService;
+ _stationInfoService = stationInfoService;
}
public Task Execute(IJobExecutionContext context)
@@ -58,28 +62,8 @@
SendWaitToTask();
- #region 澶勭悊鍐欏叆璁惧淇″彿寮傚父浠诲姟
- var tasks = _taskService.Repository.QueryData(x => x.TaskState == TaskStatusEnum.Finish.ObjToInt() && !string.IsNullOrEmpty(x.Remark));
- if (tasks.Count > 0)
- {
- List<Dt_Task> list = new List<Dt_Task>();
- foreach (var item in tasks)
- {
- var infos = item.Remark.Split("_");
- var device = Storage.Devices.FirstOrDefault(x => x.DeviceCode == infos[0]) as OtherDevice;
- if (device != null && device.IsConnected)
- {
- DeviceProDTO? devicePro = device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == infos[1] && x.DeviceChildCode == infos[3]);
- if (devicePro != null)
- {
- var W = device.Communicator.WriteObj(devicePro.DeviceProAddress, devicePro.DeviceDataType, infos[2]);
- if (W) list.Add(item);
- }
- }
- }
- _taskService.Repository.DeleteAndMoveIntoHty(list, OperateTypeEnum.鑷姩鍒犻櫎);
- }
- #endregion
+ HandleTasks();
+
}
catch (Exception ex)
{
--
Gitblit v1.9.3