From ec9c9add38591d7c7a2708ac43ed6b3fce1a4063 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期三, 06 八月 2025 16:12:09 +0800 Subject: [PATCH] 1 --- 项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs | 43 +++++++++++++++++++++++++++++++------------ 1 files changed, 31 insertions(+), 12 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs" index 717bf2f..2c01c08 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/RGVJob/CommonRGVJob.cs" @@ -40,6 +40,7 @@ using WIDESEAWCS_QuartzJob.Models; using WIDESEAWCS_QuartzJob.Service; using WIDESEAWCS_SignalR; +using WIDESEAWCS_TaskInfoRepository; using WIDESEAWCS_Tasks.ConveyorLineJob; using WIDESEAWCS_Tasks.RGVJob; using WIDESEAWCS_Tasks.StackerCraneJob; @@ -48,10 +49,11 @@ namespace WIDESEAWCS_Tasks { [DisallowConcurrentExecution] - public class CommonRGVJob :JobBase, IJob + public class CommonRGVJob : JobBase, IJob { private readonly ITaskService _taskService; private readonly ITaskRepository _taskRepository; + private readonly ITask_HtyRepository _task_HtyRepository; private readonly ITaskExecuteDetailService _taskExecuteDetailService; private readonly IRouterService _routerService; private readonly IDt_StationManagerService _stationManagerService; @@ -62,7 +64,7 @@ private static List<string>? userTokenIds; private static List<int>? userIds; - public CommonRGVJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IDt_StationManagerService stationManagerService, IMapper mapper, ICacheService cacheService, INoticeService noticeService, ITaskRepository taskRepository,IDt_StationManagerRepository stationManagerRepository) + public CommonRGVJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IDt_StationManagerService stationManagerService, IMapper mapper, ICacheService cacheService, INoticeService noticeService, ITaskRepository taskRepository,IDt_StationManagerRepository stationManagerRepository, ITask_HtyRepository task_HtyRepository) { _taskService = taskService; _taskExecuteDetailService = taskExecuteDetailService; @@ -73,6 +75,7 @@ _noticeService = noticeService; _taskRepository = taskRepository; _stationManagerRepository = stationManagerRepository; + _task_HtyRepository = task_HtyRepository; } public Task Execute(IJobExecutionContext context) @@ -84,7 +87,6 @@ { if (commonRGV.GetValue<StackerCraneDBName, bool>(StackerCraneDBName.WorkCompleted)) { - var x = commonRGV.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum); RGVTaskFinish(commonRGV, commonRGV.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum)); } @@ -158,11 +160,18 @@ { if (commonRGV != null) { + WriteInfo("RGV浠诲姟瀹屾垚", $"{commonRGV.DeviceName}瀹屾垚浠诲姟鍙穥TaskNum}"); var task = _taskRepository.QueryFirst(x => x.TaskNum == TaskNum); if (task != null) { if (task.TaskState == (int)TaskInStatusEnum.RGV_Indispatch) { + if (task.SourceAddress == "3002") + { + task.TaskState = (int)TaskInStatusEnum.RGV_IndispatchFinish; + _taskRepository.UpdateData(task); + return; + } Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress); if (stationManager != null) { @@ -171,11 +180,25 @@ { CommonConveyorLine conveyorLine = (CommonConveyorLine)device; Thread.Sleep(100); - - var Barcode = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.ConveyorLineBarcode, stationManager.stationChildCode); - if (Barcode == null||Barcode=="") + DeviceProDTO? devicePro = conveyorLine.DeviceProDTOs.Where(x => x.DeviceChildCode == stationManager.stationChildCode && x.DeviceProParamName == "ConveyorLineBarcode").FirstOrDefault(); + var x = conveyorLine.Communicator.Read(devicePro.DeviceProAddress, 5); + string Barcode = Encoding.UTF8.GetString(x); + + if (Barcode == null || Barcode == "" || Barcode.Trim().Contains("\0")) { + commonRGV.SetValue(StackerCraneDBName.PutcargoLocation, Convert.ToSByte(stationManager.stationRemark)); + commonRGV.SetValue(StackerCraneDBName.TaskNum, Convert.ToInt16(task.TaskNum)); + commonRGV.SetValue(StackerCraneDBName.TaskType, Convert.ToSByte(4)); + + task.ModifyDate = DateTime.Now; + task.Modifier = "System"; + + Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task); + task_Hty.TaskId = 0; + + _taskRepository.DeleteData(task); + _task_HtyRepository.AddData(task_Hty); return; } var content = _taskService.RGVTaskCompleted(TaskNum, Barcode); @@ -194,7 +217,6 @@ { CommonConveyorLine conveyorLine = (CommonConveyorLine)device; Thread.Sleep(100); - var Barcode = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.ConveyorLineBarcode, stationManager.stationChildCode); conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTargetAddress, Convert.ToInt16(stationManager.stationNextChildCode), stationManager.stationChildCode); Thread.Sleep(100); conveyorLine.SetValue(ConveyorLineDBName.ConveyorLineTaskNum, Convert.ToInt16(1000), stationManager.stationChildCode); @@ -219,7 +241,7 @@ Dt_Task task; if (InStock) { - task = _taskService.QueryRGVExecutingTask(commonRGV.DeviceCode); + task = _taskService.QueryRGVExecutingTask(commonRGV.DeviceCode, commonRGV.GetValue<RGVDBName, short>(RGVDBName.RGVTaskNum)); if (task != null) { return task; @@ -277,11 +299,9 @@ rgvTaskCommand.TaskNum = Convert.ToInt16(task.TaskNum); if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)//鍒ゆ柇鏄惁鏄叆搴撲换鍔� { - //rgvTaskCommand.TaskType = (byte)Convert.ToSByte(16); - //rgvTaskCommand.TaskType = (byte)Convert.ToSByte(64); 閫�鍥� if (task.TaskState == (int)TaskInStatusEnum.InNew) { - Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.SourceAddress); + Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.CurrentAddress); rgvTaskCommand.TaskType = (byte)Convert.ToSByte(3); rgvTaskCommand.PickupLocation = (byte)Convert.ToSByte(stationManager.stationRemark); } @@ -299,7 +319,6 @@ } else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup) { - if (task.TaskState == (int)TaskOutStatusEnum.Line_OutFinish) { Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.CurrentAddress); -- Gitblit v1.9.3