From b2ad000e07e1c87d3561b5aa94fdc88c779872f0 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期二, 18 二月 2025 22:34:54 +0800
Subject: [PATCH] 1
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVJob.cs | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 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 d7d4715..4acc714 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"
@@ -39,30 +39,6 @@
{
try
{
- #region 浠诲姟涓嬪彂
- List<Dt_Task> UpnewTasks = new List<Dt_Task>();
- var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskInStatusEnum.InNew).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
- foreach (var agvTaskDTO in GetAGVTaskDTOs(newTasks))
- {
- var ResultData = HttpHelper.PostAsync(AGVInterfaceAddress.taskSent, agvTaskDTO.ToJson(), headers: new Dictionary<string, string>());
- if (ResultData.Result == null) throw new Exception($"AGV浠诲姟涓嬪彂鎺ュ彛璇锋眰瓒呮椂");
- var content = JsonConvert.DeserializeObject<AGVReturnInfo>(ResultData.Result);
- if (content.code == "20000")
- {
- var task = newTasks.Where(x => x.TaskNum == agvTaskDTO.outID.ObjToInt()).First();
- task.TaskState = TaskInStatusEnum.AGV_InSend.ObjToInt();
- UpnewTasks.Add(task);
- }
- else
- {
- var task = newTasks.Where(x => x.TaskNum == agvTaskDTO.outID.ObjToInt()).First();
- task.ExceptionMessage = content.message;
- UpnewTasks.Add(task);
- }
- Thread.Sleep(1000);
- }
- if (UpnewTasks.Count > 0) _taskService.Db.Updateable(UpnewTasks).ExecuteCommand();
- #endregion
#region 浠诲姟鏇存柊
var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState > (int)TaskInStatusEnum.InNew && x.TaskState < (int)TaskInStatusEnum.AGV_InFinish).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
@@ -103,6 +79,31 @@
}
_taskService.Db.Updateable(Tasks).ExecuteCommand();
#endregion
+
+ #region 浠诲姟涓嬪彂
+ List<Dt_Task> UpnewTasks = new List<Dt_Task>();
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == (int)TaskInStatusEnum.InNew).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
+ foreach (var agvTaskDTO in GetAGVTaskDTOs(newTasks))
+ {
+ var ResultData = HttpHelper.PostAsync(AGVInterfaceAddress.taskSent, agvTaskDTO.ToJson(), headers: new Dictionary<string, string>());
+ if (ResultData.Result == null) throw new Exception($"AGV浠诲姟涓嬪彂鎺ュ彛璇锋眰瓒呮椂");
+ var content = JsonConvert.DeserializeObject<AGVReturnInfo>(ResultData.Result);
+ if (content.code == "20000")
+ {
+ var task = newTasks.Where(x => x.TaskNum == agvTaskDTO.outID.ObjToInt()).First();
+ task.TaskState = TaskInStatusEnum.AGV_InSend.ObjToInt();
+ UpnewTasks.Add(task);
+ }
+ else
+ {
+ var task = newTasks.Where(x => x.TaskNum == agvTaskDTO.outID.ObjToInt()).First();
+ task.ExceptionMessage = content.message;
+ UpnewTasks.Add(task);
+ }
+ Thread.Sleep(1000);
+ }
+ if (UpnewTasks.Count > 0) _taskService.Db.Updateable(UpnewTasks).ExecuteCommand();
+ #endregion
}
catch (Exception ex)
{
--
Gitblit v1.9.3