From 60328b34b853959613f8c97567b4a1ba934a15a9 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期日, 22 九月 2024 17:36:39 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Util/HttpService.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 1119c0f..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)
{
@@ -116,8 +118,6 @@
Log.Information("璋冪敤WMS鐢宠鍌ㄤ綅鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
if (result.Success == 0)
{
-
-
var taskUp = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.TaskNo == result.TaskList.TaskNo);
if (taskUp == null)
{
@@ -134,12 +134,14 @@
EndRoadway = result.TaskList.EndRoadway
};
_db.Insertable(taskAdd).ExecuteCommand();
+ HubUtil.PublicTask(taskAdd.Adapt<WcsTaskOutput>());
}
else
{
taskUp.EndRoadway = result.TaskList.EndRoadway;
taskUp.EndLocate = result.TaskList.EndLocate;
_db.Updateable(taskUp).ExecuteCommand();
+ HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
}
@@ -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