From a07e4702be045efa9b04b49a561463875dd28e0a Mon Sep 17 00:00:00 2001
From: 肖洋 <cathay_xy@163.com>
Date: 星期六, 04 一月 2025 16:18:33 +0800
Subject: [PATCH] 更新配置文件和事件总线逻辑，修复任务处理逻辑
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs | 44 ++++++++++++++++++++++++++++++++------------
1 files changed, 32 insertions(+), 12 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
index 4a42ec1..88deaee 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/GWTask/RequestInbound.cs
@@ -1,19 +1,15 @@
-锘縰sing Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+锘縰sing Masuit.Tools;
+using Newtonsoft.Json;
+using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
-using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_DTO.TaskInfo;
+using WIDESEAWCS_DTO.WMS;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_Tasks.ConveyorLineJob;
-using WIDESEAWCS_DTO.WMS;
-using WIDESEAWCS_Common;
-using Masuit.Tools;
+using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
namespace WIDESEAWCS_Tasks
{
@@ -76,6 +72,9 @@
case 10:
ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
break;
+ //case 16:
+ // ExecuteStationAction(stationManager, conveyorLine, command, childDeviceCode);
+ // break;
}
#region
@@ -134,7 +133,6 @@
// }
//}
#endregion
-
}
private void ExecuteStationAction(Dt_StationManager stationManager, CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
@@ -144,20 +142,28 @@
case 8:
RequestInNextAddress(conveyorLine, command, childDeviceCode);
break;
+
case 9:
ConveyorLineInFinish(conveyorLine, command, childDeviceCode);
break;
+
case 10:
RequestOutbound(conveyorLine, command, childDeviceCode);
break;
+
case 11:
RequestOutNextAddress(conveyorLine, command, childDeviceCode);
break;
+
case 12:
ConveyorLineOutFinish(conveyorLine, command, childDeviceCode);
break;
+
case 6:
CreateAndSendEmptyTrayTask(conveyorLine, command, childDeviceCode);
+ break;
+ case 16:
+ AbNormalStationBZTask(conveyorLine, command, childDeviceCode);
break;
case 1:
@@ -345,5 +351,19 @@
//Dt_Task task= _taskRepository.QueryFirst(x=>)
//_taskRepository.QueryFirst()
}
+
+ /// <summary>
+ /// 鍖呰寮傚父鎺掑嚭鍙ｉ�昏緫
+ /// </summary>
+ /// <param name="conveyorLine"></param>
+ /// <param name="command"></param>
+ /// <param name="childDeviceCode"></param>
+ private void AbNormalStationBZTask(CommonConveyorLine_GW conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
+ {
+ Dt_StationManager stationManager = _stationManagerRepository.QueryFirst(x => x.stationChildCode == childDeviceCode && x.stationPLC == conveyorLine.DeviceCode);
+
+
+ }
+
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3