From 40f71192f067a48fff730a52fa8f47a1b69ba59d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 13 十月 2025 17:28:00 +0800
Subject: [PATCH] 支持跨楼层与AGV搬运任务，优化货位管理新增跨楼层与AGV搬运任务相关页面、API及服务逻辑，支持任务状态更新与多任务类型处理。 更新货位管理功能，支持批量创建货位及批量记录货位状态变动。 重构任务状态更新逻辑，增强事务处理能力，优化代码结构。 调整页面配置与文档布局，新增常量与枚举以支持新功能。 修复部分任务状态处理中的潜在问题。
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
index 0e8a11d..ffde2f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/CommonAGVJob.cs"
@@ -2,6 +2,7 @@
using Quartz;
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -31,7 +32,7 @@
var AcrossFloorTask = _taskRepository.QueryFirst(x => x.TaskState == (int)TaskAcrossFloorStatusEnum.CarryNew);
if (AcrossFloorTask != null)
{
- var task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && x.TaskState < (int)TaskAcrossFloorStatusEnum.SecondCarryFinish);
+ var task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskAcrossFloorStatusEnum.CarryNew && x.TaskState < (int)TaskAcrossFloorStatusEnum.EndAddressExecuting);
if(task == null)
{
CommonElevator? elevator = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "TSJ1") as CommonElevator;
@@ -74,7 +75,13 @@
if (Carry != null)
{
- if (Carry.Floor == "1F")
+ if (Carry.SourceAddress.Contains("XB001") || Carry.TargetAddress.Contains("XB001"))
+ {
+ _taskService.SendAgvTask("cattleCarry1", Carry.TaskNum);
+ Carry.TaskState = (int)TaskAGVCarryStatusEnum.AGV_CarryExecuting;
+ _taskRepository.UpdateData(Carry);
+ }
+ else if (Carry.Floor == "1F")
{
_taskService.SendAgvTask("forkAutoTemplate1", Carry.TaskNum);
Carry.TaskState = (int)TaskAGVCarryStatusEnum.AGV_CarryExecuting;
@@ -94,17 +101,24 @@
if (InTask != null)
{
var OutTask = _taskRepository.QueryFirst(x => x.TaskState >= (int)TaskOutStatusEnum.OutNew && x.TaskState <(int)TaskOutStatusEnum.AGV_OutExecuting);
- var Task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskInStatusEnum.InNew && x.TaskState < (int)TaskInStatusEnum.SC_InExecuting);
- if (OutTask == null && Task == null)
+ var task = _taskRepository.QueryFirst(x => x.TaskState > (int)TaskInStatusEnum.InNew && x.TaskState < (int)TaskInStatusEnum.SC_InExecuting);
+ if (OutTask == null && task == null)
{
CommonConveyorLine? conveyorLine = Storage.Devices.FirstOrDefault(x => x.DeviceCode == "1001") as CommonConveyorLine;
if (conveyorLine != null)
{
+ bool IsWrite = false;
short InteractiveSignal = conveyorLine.GetValue<ConveyorLineDBName, short>(ConveyorLineDBName.InteractiveSignal, "LK001");
var structs = BitConverter.GetBytes(InteractiveSignal).Reverse().ToArray().ToBoolArray();
if (structs[0])
{
- conveyorLine.Communicator.WriteNoRead("DB100.0", 9999);
+ IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", 0);
+ Thread.Sleep(1000);
+ IsWrite = conveyorLine.Communicator.WriteNoRead("DB100.0", 9999);
+ if (!IsWrite)
+ {
+ return Task.CompletedTask;
+ }
_taskService.SendAgvTask("LIFANG", InTask.TaskNum);
--
Gitblit v1.9.3