From dcecb039035f4b2e82e31c39b74db9402444c536 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期二, 08 四月 2025 21:35:39 +0800
Subject: [PATCH] 代码更新，优化等内容
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs"
index f1f81ec..766fe96 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGV_CSJExtend.cs"
@@ -9,9 +9,9 @@
using WIDESEAWCS_Core;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Model.Models;
-using static Dm.net.buffer.ByteArrayBuffer;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_DTO.Agv;
+using SqlSugar;
namespace WIDESEAWCS_Tasks
{
@@ -24,17 +24,19 @@
{
try
{
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt() && nameof(AGV_CSJJob).Contains(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
- foreach (var agvTask in newTasks)
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt() && !string.IsNullOrEmpty(x.DeviceCode) && nameof(AGV_CSJJob).Contains(x.DeviceCode)).OrderByDescending(x =>x.Grade).OrderBy(x=>x.CreateDate).ToList();
+ if (newTasks.Count>0)
{
- try
+ foreach (var agvTask in newTasks)
{
- AgvTaskDTO taskDTO = new AgvTaskDTO()
+ try
{
- ReqCode = Guid.NewGuid().ToString().Replace("-", ""),
- TaskTyp = AgvTaskType(agvTask.TaskType, agvTask.DeviceCode),
- PositionCodePath = new List<CodePath>()
- {
+ AgvTaskDTO taskDTO = new AgvTaskDTO()
+ {
+ ReqCode = Guid.NewGuid().ToString().Replace("-", ""),
+ TaskTyp = AgvTaskType(agvTask.TaskType, agvTask.DeviceCode),
+ PositionCodePath = new List<CodePath>()
+ {
new CodePath()
{
type="00",
@@ -45,35 +47,36 @@
type="00",
positionCode=agvTask.NextAddress
}
- },
- TaskCode = agvTask.AgvTaskNum,
- PodTyp = agvTask.PalletType < 3 ? "ZC" : "DX",
- };
- WebResponseContent content = _taskService.AgvSendTask(taskDTO);
- if (content.Status)
- {
- agvTask.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
- //agvTask.Remark = content.Data.ObjToString();
- _taskService.UpdateTask(agvTask, TaskStatusEnum.AGV_Executing);
+ },
+ TaskCode = agvTask.AgvTaskNum,
+ PodTyp = agvTask.PalletType < 3 ? "ZC" : "DX",
+ };
+ WebResponseContent content = _taskService.AgvSendTask(taskDTO);
+ if (content.Status)
+ {
+ agvTask.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
+ //agvTask.Remark = content.Data.ObjToString();
+ _taskService.UpdateTask(agvTask, TaskStatusEnum.AGV_Executing);
+ }
+ else
+ {
+ agvTask.TaskState = TaskStatusEnum.Exception.ObjToInt();
+ //agvTask.Remark = content.Data.ObjToString();
+ agvTask.ExceptionMessage = content.Message;
+ }
}
- else
+ catch (Exception ex)
{
agvTask.TaskState = TaskStatusEnum.Exception.ObjToInt();
//agvTask.Remark = content.Data.ObjToString();
- agvTask.ExceptionMessage = content.Message;
+ agvTask.ExceptionMessage = ex.Message;
+ WriteError(nameof(AGV_CSJJob), ex.Message, ex);
}
}
- catch (Exception ex)
- {
- agvTask.TaskState = TaskStatusEnum.Exception.ObjToInt();
- //agvTask.Remark = content.Data.ObjToString();
- agvTask.ExceptionMessage = ex.Message;
- WriteError(nameof(AGV_CSJJob), ex.Message, ex);
- }
+ _taskService.UpdateData(newTasks);
}
- _taskService.UpdateData(newTasks);
//鍑哄簱缁戝畾鏌ヨ
- Dt_Task outBound = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.Exception.ObjToInt() && nameof(AGV_CSJJob).Contains(x.DeviceCode) && x.TaskType==TaskTypeEnum.Outbound.ObjToInt()).ToList().OrderBy(x => x.Grade).ThenBy(x=>x.CreateDate).First();
+ Dt_Task outBound = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.Exception.ObjToInt() && nameof(AGV_CSJJob).Contains(x.DeviceCode) && x.TaskType==TaskTypeEnum.Outbound.ObjToInt()).ToList().OrderByDescending(x => x.Grade).ThenBy(x=>x.CreateDate).First();
if (outBound != null)
{
AgvPodBerthAndMatDTO andMatDTO = new AgvPodBerthAndMatDTO()
--
Gitblit v1.9.3