From 6a9cbabce3dab5b74fa466d6f7ab27bd1a1be3cb Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期六, 11 十月 2025 14:16:50 +0800
Subject: [PATCH] 优化任务逻辑并新增文件与文档支持 移除字段 "生产产线" 相关代码，优化 AGV 同层搬运与入库任务逻辑，新增对写入信号的判断处理，提升任务执行可靠性。 新增 `HttpHelper.cs`、`TaskEnumHelper.cs`、`PDAController.cs` 等文件，调整文档布局，更新索引与视图状态。 清理无用代码，完善堆垛机任务完成逻辑，新增日志记录。 新增与数据库相关的二进制文件及 Excel 文件支持。
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index d3fd64a..9152ae9 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -6,6 +6,7 @@
using SqlSugar;
using System.Reflection;
using System.Text;
+using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
@@ -28,6 +29,7 @@
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_SignalR;
using WIDESEAWCS_Tasks.ConveyorLineJob;
+using WIDESEAWCS_Tasks.ElevatorJob;
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
namespace WIDESEAWCS_Tasks
@@ -76,7 +78,49 @@
CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
if (conveyorLine != null)
{
-
+ ConveyorLineTaskCommand conmmand = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>("LK001");
+ if (conmmand != null)
+ {
+ var structs = BitConverter.GetBytes(conmmand.InteractiveSignal).Reverse().ToArray().ToBoolArray();
+ if (structs[2])
+ {
+ var task = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.Line_InExecuting && x.TaskNum == conmmand.ConveyorLineTargetAddress);
+ if (task != null)
+ {
+ task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ task.CurrentAddress = task.NextAddress;
+ //鑾峰彇WMS璐т綅淇℃伅
+ task.NextAddress = task.TargetAddress;
+ _taskRepository.UpdateData(task);
+ }
+ }
+
+ if (structs[0])
+ {
+ var task = _taskService.QueryRequestConveyorLineSignalTask();
+
+ if (task != null && task.AGVSign == "RequestPickUp")
+ {
+ if (conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.AllowPickUp, "LK001") == 1)
+ {
+ await _taskService.ContinueAgvTask(task.AGVTaskNum);
+ task.AGVSign = "";
+ task.TaskState = (int)TaskOutStatusEnum.Line_OutFinish;
+ _taskRepository.UpdateData(task);
+ }
+ }
+ if (task != null && task.AGVSign == "RequestPut")
+ {
+ if (conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.AllowPut, "LK001") == 1)
+ {
+ await _taskService.ContinueAgvTask(task.AGVTaskNum);
+ task.AGVSign = "";
+ _taskRepository.UpdateData(task);
+ }
+ }
+
+ }
+ }
}
}
catch (Exception ex)
--
Gitblit v1.9.3