From 8abc9481eafeb715b39a4f4f8d6f628a642e6b53 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 19 三月 2025 17:38:18 +0800
Subject: [PATCH] 优化AGV和输送线、产线对接逻辑
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs | 54 +++++++++++-------------------------------------------
1 files changed, 11 insertions(+), 43 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
index 34261ee..1865c95 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineExtend/ConveyorLineExtend.cs"
@@ -42,60 +42,28 @@
{
ConveyorLineInFinish(conveyorLine, command, childDeviceCode);
}
- //else if (childDeviceCode == "1005" && command.Status == (ushort)ConveyorStatus.Stored)
- //{
- // Dt_Task task = _taskService.QueryConveyorLineTaskNum(conveyorLine.DeviceCode, childDeviceCode, command.TaskNum);
- // if (task != null)
- // {
- // task.TaskState = TaskOutStatusEnum.Line_OutExecuting.ObjToInt();
- // _taskService.UpdateData(task);
- // ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(task);
- // taskCommand.WriterTrue = (short)command.inRead;
- // conveyorLine.SendCommand(taskCommand, childDeviceCode);
- // }
- //}
else if (childDeviceCode == "1008" && command.Status == (ushort)ConveyorStatus.Stored)
{
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
{
List<Dt_Router> routers = _routerRepository.QueryData(x => x.StartPosi == task.NextAddress && x.ChildPosiDeviceCode == "AGV" && x.Remark == "鏈崰鐢�");
- if (routers.Count > 0)
+ if (routers != null && routers.Count > 0)
{
-
+ var router = routers.FirstOrDefault();
+ if (router != null)
+ {
+ task.TaskState = TaskOutStatusEnum.Line_OutFinish.ObjToInt();
+ task.CurrentAddress = childDeviceCode;
+ task.NextAddress = router.ChildPosi;
+ router.Remark = "鍗犵敤";
+ _routerRepository.UpdateData(router);
+ _taskService.UpdateData(task);
+ }
}
- task.TaskState = TaskOutStatusEnum.Line_OutFinish.ObjToInt();
- _taskService.UpdateData(task);
}
}
}
- #region MyRegion
-
- //if (command != null && command.Status == (ushort)ConveyorStatus.Stored)//娣诲姞杈撻�佺嚎鐘舵�丆onveyorLineStatus enum
- //{
- // switch (childDeviceCode)
- // {
- // case "1002":
- // {
- // RequestInbound(conveyorLine, command, childDeviceCode);
- // }
- // break;
- // case "1004":
- // ConveyorLineInFinish(conveyorLine, command, childDeviceCode);
- // break;
- // //case "105":
- // // RequestOutbound(conveyorLine, command, childDeviceCode);
- // // break;
- // case "1008":
- // ConveyorLineOutFinish(conveyorLine, command, childDeviceCode);
- // break;
- // //default:
- // // RequestInNextAddress(conveyorLine, command, childDeviceCode);
- // // RequestOutNextAddress(conveyorLine, command, childDeviceCode);
- // // break;
- // }
- //}
- #endregion
}
catch (Exception ex)
{
--
Gitblit v1.9.3