From 9e579eda4601ed7b492b9d19a24e8146f6ebdf8d Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期六, 19 四月 2025 19:50:43 +0800
Subject: [PATCH] 优化空托出入库逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/AGV/AGVJob.cs | 102 ++++++++++++++++++++++++++++++---------------------
1 files changed, 60 insertions(+), 42 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..4ebd30a 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"
@@ -5,6 +5,7 @@
using System.Collections.Generic;
using System.Linq;
using System.Reflection.Metadata;
+using System.Security.Cryptography;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common.TaskEnum;
@@ -39,9 +40,65 @@
{
try
{
+ #region 浠诲姟鏇存柊
+ var Tasks = _taskService.Db.Queryable<Dt_Task>().Where(x =>
+ x.TaskState > (int)TaskInStatusEnum.InNew &&
+ x.TaskState < (int)TaskInStatusEnum.AGV_InFinish ||
+ x.TaskState > (int)TaskOutStatusEnum.Line_OutFinish &&
+ x.TaskState < (int)TaskOutStatusEnum.AGV_OutFinish).ToList().OrderBy(x => x.Grade).ThenBy(x => x.CreateDate).ToList();
+ foreach (var Task in Tasks)
+ {
+ var obj = new
+ {
+ outID = Task.TaskNum.ToString()
+ };
+ var ResultData = HttpHelper.PostAsync(AGVInterfaceAddress.taskResult, obj.ToJson(), headers: new Dictionary<string, string>());
+ if (ResultData.Result != null)
+ {
+ var content = JsonConvert.DeserializeObject<AGVReturnInfo>(ResultData.Result);
+ if (content.code == "20000")
+ {
+ switch (content.status)
+ {
+ case "01":
+ break;
+ case "02":
+ Task.TaskState = _taskService.TaskInboundTypes.Contains(Task.TaskType) ? TaskInStatusEnum.AGV_InExecuting.ObjToInt() : TaskOutStatusEnum.AGV_OutExecuting.ObjToInt();
+ break;
+ case "08":
+ {
+ Task.TaskState = _taskService.TaskInboundTypes.Contains(Task.TaskType) ? (int)TaskInStatusEnum.AGV_InFinish : TaskOutStatusEnum.AGV_OutFinish.ObjToInt();
+ Task.CurrentAddress = Task.NextAddress;
+ Task.NextAddress = "";
+ List<Dt_Router> routers = _routerService.QueryNextRoutes(Task.CurrentAddress, Task.TargetAddress);
+ if (routers.Count > 0)
+ {
+ Task.NextAddress = routers.FirstOrDefault()?.ChildPosi ?? "";
+ }
+ if (Task.TaskState == TaskOutStatusEnum.AGV_OutFinish.ObjToInt())
+ {
+ #region 鍚慦MS鍙嶉鍫嗗灈鏈轰换鍔″畬鎴�
+ WMSTaskDTO WMStask = _mapper.Map<WMSTaskDTO>(Task);
+ HttpHelper.PostAsync(WMSInterfaceAddress.UpdateTaskStatus, WMStask.ToJson(), headers: new Dictionary<string, string>());
+ #endregion
+ }
+ }
+ break;
+ case "09":
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ Thread.Sleep(5000);
+ }
+ _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();
+ var newTasks = _taskService.Db.Queryable<Dt_Task>().Where(x => x.TaskState == TaskInStatusEnum.InNew.ObjToInt() || x.TaskState == TaskOutStatusEnum.Line_OutFinish.ObjToInt()).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>());
@@ -50,7 +107,8 @@
if (content.code == "20000")
{
var task = newTasks.Where(x => x.TaskNum == agvTaskDTO.outID.ObjToInt()).First();
- task.TaskState = TaskInStatusEnum.AGV_InSend.ObjToInt();
+ task.Dispatchertime = DateTime.Now;
+ task.TaskState = _taskService.TaskInboundTypes.Contains(task.TaskType) ? TaskInStatusEnum.AGV_InSend.ObjToInt() : TaskOutStatusEnum.AGV_OutSend.ObjToInt();
UpnewTasks.Add(task);
}
else
@@ -62,46 +120,6 @@
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();
- foreach (var Task in Tasks)
- {
- var ResultData = HttpHelper.PostAsync(AGVInterfaceAddress.taskResult + Task.TaskNum, null, headers: new Dictionary<string, string>());
- if (ResultData.Result != null)
- {
- var content = JsonConvert.DeserializeObject<AGVReturnInfo>(ResultData.Result);
- if (content.code == "20000")
- {
- switch (content.status)
- {
- case "01":
- break;
- case "02":
- Task.TaskState = TaskInStatusEnum.AGV_InExecuting.ObjToInt();
- break;
- case "08":
- {
- Task.TaskState = (int)TaskInStatusEnum.AGV_InFinish;
- Task.CurrentAddress = Task.NextAddress;
- List<Dt_Router> routers = _routerService.QueryNextRoutes(Task.CurrentAddress, Task.TargetAddress);
- if (routers.Count > 0)
- {
- Task.NextAddress = routers.FirstOrDefault().ChildPosi;
- }
- }
- break;
- case "09":
- break;
- default:
- break;
- }
- }
- }
- Thread.Sleep(1000);
- }
- _taskService.Db.Updateable(Tasks).ExecuteCommand();
#endregion
}
catch (Exception ex)
--
Gitblit v1.9.3