From 5da3a276b7847187a7c155ee069d3cd4c9e58074 Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期日, 07 十二月 2025 23:28:14 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs"
index a3943da..126bd1f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/SpeStackerCraneJob/SpeStackerCraneJob.cs"
@@ -20,6 +20,7 @@
using WIDESEA_Common.Log;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_DTO.Enum;
using WIDESEAWCS_ISystemServices;
@@ -48,15 +49,19 @@
private readonly ITaskRepository _taskRepository;
private readonly IRouterService _routerService;
private readonly IAgvStationService _agvStationService;
+ IRepository<AbnormalTask> _abnormalTask;
+ IRgvoperainformService _rgvoperainformService;
- public SpeStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IAgvStationService agvStationService)
+ public SpeStackerCraneJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IRouterService routerService, IAgvStationService agvStationService, IRepository<AbnormalTask> abnormalTask, IRgvoperainformService rgvoperainformService)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
_taskRepository = taskRepository;
_routerService = routerService;
_agvStationService = agvStationService;
+ _abnormalTask = abnormalTask;
+ _rgvoperainformService = rgvoperainformService;
}
@@ -70,6 +75,9 @@
if (speStackerCrane != null)
{
GetStackerObject getStackerObject = new GetStackerObject(speStackerCrane);
+
+ _rgvoperainformService.LogAlarmToDatabase(speStackerCrane.DeviceCode);
+
if (getStackerObject.RGVInitializationValue == RGVInitialize.Initialized)
{
@@ -160,7 +168,17 @@
}
else if (getStackerObject.StaclerkJobJobStatusValue == RGV_Rgvtaskstutas.AbnormalCompletion && getStackerObject.CurrentRgvtaskid != 0 && getStackerObject.CurrentRgvtaskid != 30001)
{
-
+ string ErrorContent = RgvOperationService.AQMReadAlarminform();
+ if (ErrorContent != null && ErrorContent != "")
+ {
+ _abnormalTask.AddData(new AbnormalTask
+ {
+ TaskNum = getStackerObject.CurrentRgvtaskid,
+ ErrorContent = ErrorContent,
+ CreateDate = DateTime.Now,
+ Creater = "system",
+ });
+ }
//淇敼浠诲姟鐘舵�佷负寮傚父瀹屾垚
_taskService.HandleInAbnormal(getStackerObject.CurrentRgvtaskid);
@@ -302,7 +320,7 @@
}
else if (getStackerObject.RGVCurrentlocation == RGVTaskdevice.WaitmomentTwo) //鍒欓渶瑕佸垽鏂袱涓瘝杞︾殑浣嶅瓙
{
- //鍒ゆ柇涓や釜瀛愯溅鏄惁鍦ㄥ爢鍨涙満鍙栬揣鍙�
+ //鍒ゆ柇涓や釜姣嶈溅鏄惁鍦ㄥ爢鍨涙満鍙栬揣鍙�
//姣嶈溅1
var mu1rgv = _agvStationService.GetMothervehicle(RGVTaskdevice.MotherCarDeviceCode);
@@ -642,7 +660,7 @@
=> Findshippingtask(RGVTaskdevice, getStackerObject.RGVCurrentlocation), //瀛愯溅鍙栬揣鍚庯紝杩涜鏀捐揣锛堝凡瀹屾垚锛�
((int)RGVEquipment.OutRGVForklift, RgvEquipmentStatus.NoCargo)
- => OutboundGateVehicle(RGVTaskdevice), //鍑哄簱鍙GV鍙栬揣锛堝凡瀹屾垚锛�
+ => OutboundGateVehicle(RGVTaskdevice), //鍑哄簱鍙GV鍙栬揣锛堝凡瀹屾垚锛�
((int)RGVEquipment.OutRGVForklift, RgvEquipmentStatus.HasCargo)
=> _taskService.GetOutkouFinhuoTask(RGVTaskdevice.ChildPosiDeviceCode,
--
Gitblit v1.9.3