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 | 199 +++++++++----------------------------------------
1 files changed, 36 insertions(+), 163 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 9509fb6..5a894d5 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -1,4 +1,5 @@
-锘縰sing Furion.Logging;
+锘縰sing Elastic.Clients.Elasticsearch;
+using Furion.Logging;
using Furion.RemoteRequest.Extensions;
using Newtonsoft.Json;
using System.Text;
@@ -46,14 +47,16 @@
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
var result = (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
- if (result.StatusCode == "0")
+ if (result.Success == 0)
{
var taskAdd = new WcsTask()
{
TaskType = TaskTypeEnum.In,
+ Status = TaskStatusEnum.Wait,
Origin = "WMS",
StartLocate = startLocat,
+ PalletNo = palletNo,
TaskNo = result.TaskList.TaskNo,
EndLocate = result.TaskList.EndLocate,
EndRoadway = result.TaskList.EndRoadway
@@ -80,153 +83,6 @@
endLocat = PLCCommon.RoadwayToStationNum(endLocat, ceng);
return returnStr;
- // 纭畾鐩爣宸ヤ綅//闇�娣诲姞灞傛暟纭
- //switch (endLocat)
- //{
- // case "R01":
- // if (ceng == "1")
- // {
- // endLocat = "145";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "252";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "101";
- // }
- // break;
- // case "R02":
- // if (ceng == "1")
- // {
- // endLocat = "137";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "260";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "405";
- // }
- // break;
- // case "R03":
- // if (ceng == "1")
- // {
- // endLocat = "127";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "270";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "409";
- // }
- // break;
- // case "R04":
- // if (ceng == "1")
- // {
- // endLocat = "119";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "278";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "413";
- // }
- // break;
- // case "R05":
- // if (ceng == "1")
- // {
- // endLocat = "109";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "288";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "417";
- // }
- // break;
- // case "R06":
- // if (ceng == "1")
- // {
- // endLocat = "101";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "301";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "421";
- // }
- // break;
- // case "R07":
- // if (ceng == "1")
- // {
- // endLocat = "091";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "307";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "425";
- // }
- // break;
- // case "R08":
- // if (ceng == "1")
- // {
- // endLocat = "083";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "315";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "429";
- // }
- // break;
- // case "R09":
- // if (ceng == "1")
- // {
- // endLocat = "073";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "325";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "433";
- // }
- // break;
- // case "R10":
- // if (ceng == "1")
- // {
- // endLocat = "065";
- // }
- // else if (ceng == "2")
- // {
- // endLocat = "337";
- // }
- // else if (ceng == "3")
- // {
- // endLocat = "437";
- // }
- // break;
- //}
-
-
-
}
/// <summary>
@@ -243,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)
{
@@ -258,20 +116,35 @@
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
var result = (url + "/api/DownAPi/RequestLocation").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
Log.Information("璋冪敤WMS鐢宠鍌ㄤ綅鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
- if (result.StatusCode == "0")
+ if (result.Success == 0)
{
-
- var taskAdd = new WcsTask()
+ var taskUp = _db.Queryable<WcsTask>().First(m => m.IsDelete == false && m.TaskNo == result.TaskList.TaskNo);
+ if (taskUp == null)
{
- TaskType = TaskTypeEnum.In,
- Origin = "WMS",
- StartLocate = startLocat,
- TaskNo = result.TaskList.TaskNo,
- EndLocate = result.TaskList.EndLocate,
- EndRoadway = result.TaskList.EndRoadway
- };
+ var taskAdd = new WcsTask()
+ {
+ TaskNo = result.TaskList.TaskNo,
+ TaskType = TaskTypeEnum.In,
+ Status = TaskStatusEnum.Wait,
+ //IsSuccess =TaskSuccessEnum.Success,
+ Origin = "WMS",
+ StartLocate = startLocat,
+ PalletNo = palletNo,
+ EndLocate = result.TaskList.EndLocate,
+ 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>());
+ }
- _db.Updateable(taskAdd).ExecuteCommand();
+
returnStr = result.TaskList.EndLocate;
taskNo = result.TaskList.TaskNo;
}
@@ -297,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