From d79fcd9534d97f5bbb4edb66dbb925dea0479304 Mon Sep 17 00:00:00 2001 From: IPC-610 <IPC-610@DESKTOP-6LEOOS3> Date: 星期日, 22 九月 2024 15:06:34 +0800 Subject: [PATCH] ssd12313 --- Admin.NET/WCS.Application/Util/HttpService.cs | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs index 644eb1b..5a894d5 100644 --- a/Admin.NET/WCS.Application/Util/HttpService.cs +++ b/Admin.NET/WCS.Application/Util/HttpService.cs @@ -99,7 +99,9 @@ string returnStr = ""; - var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo && string.IsNullOrWhiteSpace(m.EndLocate)); + var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false + && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing) + && m.TaskType == TaskTypeEnum.In && m.PalletNo == palletNo && !string.IsNullOrWhiteSpace(m.EndLocate)); if (task == null) { @@ -168,10 +170,10 @@ /// </summary> /// <param name="model">浠诲姟瀹屾垚鐘舵��</param> /// <returns></returns> - public async Task<ResponseTasks> RequestTask(TaskRequest model) + public async Task<ResponseModel> RequestTask(TaskRequestWMS model) { string url = Urls.WMSAddress + ":" + Urls.WMSPort; - var result = await (url + "/api/DownAPi/ReceiveWcsSignal").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>(); + var result = await (url + "/api/DownAPi/ReceiveWcsSignal").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseModel>(); Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson()); return result; } -- Gitblit v1.8.0