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/StackerCraneJob/CommonStackerCraneJob.cs | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" index 529e954..20a859b 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" @@ -75,7 +75,7 @@ #region 浠诲姟閫昏緫澶勭悊 var onlinestate = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.Onlinestate); var writeStatus = commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.WriteStatus); - if (onlinestate == (short)Onlinestate.online && writeStatus == (short)WriteStatus.Permit) + if (onlinestate == (short)Onlinestate.online /*&& writeStatus == (short)WriteStatus.Permit*/) { #region 鏌ヨ浠诲姟,閫昏緫澶勭悊 if (Enum.Parse<RunStatus>(commonStackerCrane.GetValue<StackerCraneDBName, short>(StackerCraneDBName.RunStatus).ToString()) == RunStatus.Standby) @@ -127,25 +127,8 @@ SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔� } } - #region MyRegion - //var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//绉诲簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅 - //if (task.TargetIsPickPlace && ShuttleCar != null)//绉昏蛋 - //{ - // _taskService.AddRelocationCarTask(task.TargetAddress, "", ShuttleCar.ShuttleCarCode); - //} - //else if (!task.TargetIsPickPlace && ShuttleCar == null) - //{ - // _taskService.AddRelocationCarTask("", task.TargetAddress); - //} - //else - //{ - // task.ShuttleCarCode = ShuttleCar?.ShuttleCarCode; - // _taskService.UpdateData(task); - // SendTask(commonStackerCrane, task);//涓嬪彂鍫嗗灈鏈轰换鍔� - //} - #endregion } - else if (/*task.TaskType == (int)TaskInboundTypeEnum.Inbound*/_taskService.TaskInboundTypes.Contains(task.TaskType)) + else if (_taskService.TaskInboundTypes.Contains(task.TaskType)) { var ShuttleCar = GetShuttleCarInfo(task.TargetAddress);//鍏ュ簱浠诲姟鍒ゆ柇缁堢偣鏄惁鏈夌┛姊溅 if (task.TargetIsPickPlace && ShuttleCar != null)//绉昏蛋 -- Gitblit v1.9.3