From 5ffc36a1db18d3112a9b50a9cf3953d7fcf21bae Mon Sep 17 00:00:00 2001 From: huanghongfeng <huanghongfeng@hnkhzn.com> Date: 星期二, 19 八月 2025 16:37:24 +0800 Subject: [PATCH] 更新 --- 项目代码/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" index f428eab..cb7f295 100644 --- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" +++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" @@ -1,6 +1,7 @@ 锘縰sing log4net.Core; using Masuit.Tools; using System.Collections.Generic; +using System.Linq; using System.Net; using WIDESEA_Common; using WIDESEA_Core.Const; @@ -266,12 +267,19 @@ if(cacheinfo.Towhereabouts =="" && cacheinfo.Towhereabouts == null) throw new Exception($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖"); return content.OK(data: cacheinfo.Towhereabouts);*/ - var task = await BaseDal.QueryFirstAsync(x => x.PalletCode == input.PalletCode); - if (task == null) throw new Exception($"鏈壘鍒皗input.PalletCode}鎵樼洏淇℃伅"); - if (task.Towhereabouts == "" && task.Towhereabouts == null) throw new Exception($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖"); - return content.OK(data: task.Towhereabouts); - - + var task = await BaseDal.QueryFirstAsync(x => input.PalletCode.Contains(x.PalletCode)); + if (task != null) + { + if (task.Towhereabouts == "" && task.Towhereabouts == null) return content.Error($"{input.PalletCode}杩愯緭鐩爣鍦板潃涓虹┖"); + return content.OK(data: task.Towhereabouts); + } + else + { + Dt_Task_Hty dt_Task_Hty = _task_HtyRepository.QueryFirst(x => input.PalletCode.Contains(x.PalletCode) && x.CreateDate >= DateTime.Now.AddHours(-2)); + if (dt_Task_Hty == null) return content.Error($"鏈壘鍒皗input.PalletCode}鎵樼洏鍘嗗彶淇℃伅"); + if (dt_Task_Hty.Towhereabouts == null && dt_Task_Hty.Towhereabouts == "") return content.Error($"{input.PalletCode}鎵樼洏鍘嗗彶淇℃伅娌℃湁璁板綍鐩爣鍦板潃"); + return content.OK(data: dt_Task_Hty.Towhereabouts); + } } catch (Exception err) { -- Gitblit v1.9.3