From eae9077f3978f695f4e3af5301e8a08bdd8bf23c Mon Sep 17 00:00:00 2001 From: 肖洋 <cathay_xy@163.com> Date: 星期一, 09 十二月 2024 09:24:46 +0800 Subject: [PATCH] 最新程序 --- Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs index a5ce74a..5eb3c43 100644 --- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs +++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/RequestInTaskAsync.cs @@ -19,6 +19,14 @@ public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService { + /// <summary> + /// 鏍规嵁褰撳墠宸ュ簭鍒ゆ柇涓嬩竴宸ュ簭锛岄�佽嚦瀵瑰簲宸ュ簭 + /// </summary> + /// <param name="boxing">缁勭洏</param> + /// <param name="area">鍖哄煙</param> + /// <param name="input">璇锋眰鍙傛暟</param> + /// <param name="resultTray">鎵樼洏鐢佃姱</param> + /// <returns></returns> private async Task<WebResponseContent> ProcessBasedOnProcessCode(DtBoxingInfo boxing, Dt_AreaInfo area, RequestTaskDto input, ResultTrayCellsStatus resultTray) { if (boxing.ProcessCode == "OCVB") @@ -101,7 +109,7 @@ var resultProcessApply = JsonConvert.DeserializeObject<ResultProcessApply>(content.Data.ToString()); if (!resultProcessApply.Success) return content.Error("宸ヨ壓鐢宠澶辫触"); - var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode == boxing.ProcessCode).FirstOrDefault().Number.ToInt32(); + var number = resultProcessApply.ProcessInfo.Where(x => x.ProcessCode.Contains(boxing.ProcessCode)).FirstOrDefault().Number.ToInt32(); foreach (var item in resultProcessApply.ProcessInfo) { if (item.Number.ToInt32() == number + 1) @@ -157,19 +165,22 @@ return wcsBasez + address; } + /// <summary> + /// 鐢佃姱NG閫佽嚦NG鍙� + /// </summary> private async Task<WebResponseContent> HandleErrorCells(RequestTaskDto input, Dt_AreaInfo area, List<SerialNoDto> serialNosError) { WebResponseContent content = new WebResponseContent(); // TODO 鍒涘缓浠诲姟閫佽嚦NG鎺掑嚭鍙� - var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).ToList(); - if (stationManagers.Count <= 0) + var stationManagers = _stationManagerRepository.QueryData(x => x.stationType == 1 && x.stationChildCode == input.Position && x.stationArea == area.AreaCode).FirstOrDefault(); + if (stationManagers == null) { throw new Exception("鏈壘鍒癗G鍏ュ簱绔欏彴閰嶇疆"); } - List<string> NGStation = stationManagers.Select(x => x.stationNGLocation).ToList(); + List<string> NGStation = stationManagers.Roadway.Split(',').ToList(); if (NGStation.Count <= 0) { - NGStation = stationManagers.Select(x => x.stationNGChildCode).ToList(); + NGStation = stationManagers.stationNGChildCode.Split(',').ToList(); } content = await CreateNewTask(input, NGStation, 2); return content.Error("瀛樺湪寮傚父鐢佃姱"); -- Gitblit v1.9.3