From e7be74e711076896e7e841b54691daa95067c567 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期四, 12 六月 2025 15:54:49 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/阻焊仓/AGV_ZHExtend.cs | 68 +++++++++++++++++++++------------
1 files changed, 43 insertions(+), 25 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs"
index cc068a3..a4da7dd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/\351\230\273\347\204\212\344\273\223/AGV_ZHExtend.cs"
@@ -16,46 +16,64 @@
{
public partial class AGV_ZHJob
{
+ /// <summary>
+ /// 涓嬪彂浠诲姟
+ /// </summary>
public void SendAGVTask()
{
try
{
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => (x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt()) && nameof(AGV_PPJob).Contains(x.DeviceCode) && !string.IsNullOrEmpty(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
- foreach (var task in newTasks)
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_Execute.ObjToInt() && !string.IsNullOrEmpty(x.DeviceCode) && nameof(AGV_ZHJob).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
{
- TaskCode = task.AgvTaskNum,
- ReqCode = DateTime.Now.ToString("yyyyMMddHHmmss") + task.AgvTaskNum,
- TaskTyp = task.TaskType < TaskTypeEnum.Inbound.ObjToInt() ? "FLC" : "FLR",
- ctnrCode = task.PalletCode,
- PositionCodePath = new List<CodePath>()
- {
+ AgvTaskDTO taskDTO = new AgvTaskDTO()
+ {
+ ReqCode = Guid.NewGuid().ToString().Replace("-", ""),
+ TaskTyp = "22",
+ PositionCodePath = new List<CodePath>()
+ {
new CodePath()
{
type="00",
- positionCode=task.CurrentAddress
+ positionCode=agvTask.CurrentAddress
},
new CodePath()
{
type="00",
- positionCode=task.NextAddress
+ positionCode=agvTask.NextAddress
}
- },
- };
- WebResponseContent content = _taskService.AgvSendTask(TaskDTO, APIEnum.Agv_ZHSendTask);
- if (!content.Status) throw new Exception(content.Message);
- task.TaskState = TaskStatusEnum.AGV_Executing.ObjToInt();
+ },
+ TaskCode = agvTask.AgvTaskNum,
+ PodTyp = agvTask.PalletType < 2 ? "XX" : "DD",
+ };
+ 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;
+ }
+ }
+ catch (Exception ex)
+ {
+ agvTask.TaskState = TaskStatusEnum.Exception.ObjToInt();
+ //agvTask.Remark = content.Data.ObjToString();
+ agvTask.ExceptionMessage = ex.Message;
+ WriteError(nameof(AGV_ZHJob), ex.Message, ex);
+ }
}
- catch (Exception ex)
- {
- task.TaskState = TaskStatusEnum.Exception.ObjToInt();
- task.ExceptionMessage = ex.Message;
- }
+ _taskService.UpdateData(newTasks);
}
- _taskService.UpdateData(newTasks);
}
catch (Exception ex)
{
@@ -69,7 +87,7 @@
{
try
{
- var WaitToTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_WaitToExecute.ObjToInt() && nameof(AGV_CSJJob).Contains(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
+ var WaitToTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskStatusEnum.AGV_WaitToExecute.ObjToInt() && nameof(AGV_ZHJob).Contains(x.DeviceCode)).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
foreach (var WaitToTask in WaitToTasks)
{
if (WaitToTask.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
@@ -156,7 +174,7 @@
}
catch (Exception ex)
{
- Console.Out.WriteLine(nameof(AGV_CSJJob) + ":" + ex.Message);
+ Console.Out.WriteLine(nameof(AGV_ZHJob) + ":" + ex.Message);
}
}
}
--
Gitblit v1.9.3