From f40ba2a9fb9d3c2ece08e9a7cd987d4744dccab2 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 17 六月 2025 15:22:05 +0800
Subject: [PATCH] 优化库内移库，堆垛机和穿梭车交互逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVJob.cs | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVJob.cs"
index 8de000a..ef342f2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVJob.cs"
@@ -18,6 +18,7 @@
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoService;
namespace WIDESEAWCS_Tasks
{
@@ -40,6 +41,21 @@
{
try
{
+ #region 浠诲姟鍙栨秷
+ var CancelTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskInStatusEnum.InCancel.ObjToInt() || x.TaskState == TaskOutStatusEnum.OutCancel.ObjToInt()).ToList();
+ foreach (var CancelTask in CancelTasks)
+ {
+ var difference = DateTime.Now.AddMinutes(-5);
+ if (difference > CancelTask.ModifyDate)
+ {
+ //todo 鍚屾鍒癢MS
+ WMSTaskDTO WMStask = _mapper.Map<WMSTaskDTO>(CancelTask);
+ HttpHelper.PostAsync(WMSInterfaceAddress.CancelTask, WMStask.ToJson(), headers: new Dictionary<string, string>());
+ _taskService.AddTask_Hty(CancelTask, TaskOperateTypeEnum.AGVDeletion);
+ }
+ }
+ #endregion
+
#region 浠诲姟鏇存柊
var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x =>
x.TaskState > (int)TaskInStatusEnum.InNew &&
@@ -85,6 +101,11 @@
}
break;
case "09":
+ {
+ Task.TaskState = _taskService.TaskInboundTypes.Contains(Task.TaskType) ? (int)TaskInStatusEnum.InCancel : TaskOutStatusEnum.OutCancel.ObjToInt();
+ Task.ModifyDate = DateTime.Now;
+ Task.Modifier = "AGV";
+ }
break;
default:
break;
@@ -107,6 +128,7 @@
if (content.code == "20000")
{
var task = newTasks.Where(x => x.TaskNum == agvTaskDTO.outID.ObjToInt()).First();
+ task.Dispatchertime = DateTime.Now;
task.TaskState = _taskService.TaskInboundTypes.Contains(task.TaskType) ? TaskInStatusEnum.AGV_InSend.ObjToInt() : TaskOutStatusEnum.AGV_OutSend.ObjToInt();
UpnewTasks.Add(task);
}
@@ -150,7 +172,7 @@
point point2 = new point()
{
sn = "02",
- pointCode = task.NextAddress,
+ pointCode = task.NextAddress == "1001" ? "2001" : task.NextAddress,
pointType = "04",
matCode = task.PalletCode
};
--
Gitblit v1.9.3