From e468808b680d27de0bda4099dc62daddae626910 Mon Sep 17 00:00:00 2001 From: bnala Date: Fri, 31 Oct 2025 21:59:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E5=85=A5=E5=90=8C?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/DevicesExcute/SingleSrmExcute.cs | 17 ++++++++++++----- .../Service/DevicesExcute/StationDRExcute.cs | 19 +++++++++++++++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/WCS_YongFeng_CP/Service/DevicesExcute/SingleSrmExcute.cs b/WCS_YongFeng_CP/Service/DevicesExcute/SingleSrmExcute.cs index bb86fda..2d85b31 100644 --- a/WCS_YongFeng_CP/Service/DevicesExcute/SingleSrmExcute.cs +++ b/WCS_YongFeng_CP/Service/DevicesExcute/SingleSrmExcute.cs @@ -106,12 +106,19 @@ namespace WCS_YongFeng if (!vM_SrmRead.Fork1_Goods) //货叉无货 { - List TAllTask = AllTask.FindAll(a => a.NextState == E_TaskState.堆垛机取货.GetIndexInt()).OrderBy(a => a.tNo).ToList(); + List TAllTask = App.taskList.ToList().FindAll(a => a.NextState == E_TaskState.堆垛机取货.GetIndexInt() && + ( + a.Type == E_TaskType.入库.GetIndexString() ///查找所有入库任务 + || + (a.Type == E_TaskType.出库1.GetIndexString() && !App.taskList.ToList().Exists(x => x.EntrancePlace == a.ExitPlace))///查找没有入库的出库任务 + ) + ).OrderBy(a => a.tNo).ToList(); + if (TAllTask.Count != 0 && TAllTask != null) { var sendTask = TAllTask[0]; - var loc = App.poseList.First(x => x.wcName == TAllTask[0].EntrancePlace); + var loc = App.poseList.First(x => x.wcName == sendTask.EntrancePlace); if (loc.Zpose == 2 || loc.Zpose == 4) { // 找外侧仓位 @@ -128,12 +135,12 @@ namespace WCS_YongFeng var sendResult = SendTask(sendTask); if (sendResult.Success) { - LogExecute.logNet.WriteDebug($"{device.Name}任务下发成功,任务号{TAllTask[0].tNo}"); - return BllResult.Sucess($"{device.Name}任务下发成功,任务号{TAllTask[0].tNo}"); + LogExecute.logNet.WriteDebug($"{device.Name}任务下发成功,任务号{sendTask.tNo}"); + return BllResult.Sucess($"{device.Name}任务下发成功,任务号{sendTask.tNo}"); } else { - LogExecute.logNet.WriteError($"{device.Name}任务下发失败,任务号{TAllTask[0].tNo},错误原因是{sendResult.Msg}"); + LogExecute.logNet.WriteError($"{device.Name}任务下发失败,任务号{sendTask.tNo},错误原因是{sendResult.Msg}"); } } diff --git a/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs b/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs index 69c1dc1..d245e2d 100644 --- a/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs +++ b/WCS_YongFeng_CP/Service/DevicesExcute/StationDRExcute.cs @@ -77,6 +77,25 @@ namespace WCS_YongFeng InPort = pose.wcName }; + var exitdevice = App.f_ServiceModels.FirstOrDefault(b => b.device.Point == device.BackPoint); + if (exitdevice == null || App.taskList.Any(a => a.ExitPlace == exitdevice.device.Code)) + { + vM_StationDACK.MessageID = 6; + vM_StationDACK.LoadingStatus = 1; + vM_StationDACK.ScannerNr = vM_StationDR.ScannerNr; + vM_StationDACK.PalletID = vM_StationDR.PalletID; + vM_StationDACK.DeStation = device.BackPoint; + var sendtask_send = this.PutWriteAddress(); + if (sendtask_send.Success) + { + LogExecute.logNet.WriteDebug($"响应{device.Name}站台地址回退成功,托盘号{vM_StationDR.PalletID} ,目的地{vM_StationDACK.DeStation}"); + return BllResult.Sucess(); + } + + LogExecute.logNet.WriteError($"响应{device.Name}站台地址请求失败,已存在出库任务"); + return BllResult.Sucess(); + } + var interfaceresult = WcsWebApiClient.FinishTask(reqTaskFinish); if (!interfaceresult.Success) {