From 0df64f37379ce5c04e380f1c411dc52b01ac6b51 Mon Sep 17 00:00:00 2001
From: HuBingJie <3146306518@qq.com>
Date: 星期六, 29 十一月 2025 13:24:32 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index a944ecd..68bc838 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -9,6 +9,7 @@
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoService;
using WIDESEAWCS_Tasks.ConveyorLineJob;
using WIDESEAWCS_Tasks.StackerCraneJob;
@@ -24,6 +25,7 @@
private readonly IMapper _mapper;
private readonly IRgvOperationService _gvOperationService;
private readonly IEquipmentStatusService _equipmentStatusService;
+ //private readonly TaskService _task;
public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IAgvStationService agvStation, IMapper mapper, IRgvOperationService gvOperationService, IEquipmentStatusService equipmentStatusService)
{
@@ -34,6 +36,7 @@
_mapper = mapper;
_gvOperationService = gvOperationService;
_equipmentStatusService=equipmentStatusService;
+ //_task = task;
}
public async Task Execute(IJobExecutionContext context)
@@ -88,7 +91,7 @@
if (aQMConveyor.DoorRequest == 1 && aQMConveyor.IndicatorStatus == (int)SafetyDoorStatus.YellowBlink2Hz)
{
- if (aQMConveyor.EmergencyStopStatus == 1)
+ if (aQMConveyor.EmergencyStopStatus == 1) //璇锋眰寮�闂ㄧ瓑寰呬换鍔″畬鎴�
{
bool AQMzckm = tasktype == 1 ? GetDeviceAddress.InRGVRGVStepprocess() : GetDeviceAddress.OutRGVRGVStepprocess(); //鍒ゆ柇鏄惁鏈夎繘绋嬩换鍔�
if (AQMzckm)
@@ -97,7 +100,8 @@
bool RGVRGV_DWorkingmode = tasktype == 1 ? _gvOperationService.InWriteOutbuttonpause(null).Status : _gvOperationService.WriteOutbuttonpause(null).Status;
bool RGVstate = tasktype == 1 ? GetDeviceAddress.InRGVStatice() : GetDeviceAddress.OutRGVStatice(); //鍒ゆ柇鏄惁鍏ㄤ负鎵嬪姩
- if (RGVstate)
+ WebResponseContent webResponse = _taskService.StkRunStatus();
+ if (RGVstate && webResponse.Status == true)
{
//鍐欏叆寮�闂ㄤ俊鍙�
GetDeviceAddress.WriteSecurityDoorpolice(aGVStation.ChildPosiDeviceCode, "OpenDoor", 1);
@@ -105,10 +109,12 @@
}
}
- else
+ else //鎬ュ仠绔嬮┈鏆傚仠璁惧
{
bool AQMkm = tasktype == 1 ? GetDeviceAddress.InRGVStatice() : GetDeviceAddress.OutRGVStatice();
- if (AQMkm)
+ WebResponseContent webResponse = _taskService.StkRunStatus();
+
+ if (AQMkm && webResponse.Status == true)
{
GetDeviceAddress.WriteSecurityDoorpolice(aGVStation.ChildPosiDeviceCode, "OpenDoor", 1);
}
--
Gitblit v1.9.3