From ee8d6bd6c4077c3aeb84170bec819264b5ca29d8 Mon Sep 17 00:00:00 2001 From: wxw <Administrator@DESKTOP-5BIMHQ3> Date: 星期六, 07 六月 2025 11:32:53 +0800 Subject: [PATCH] 任务列表增加单据查询 --- Admin.NET/WCS.Application/Util/HttpService.cs | 45 +++++++++++++++++++++++++++++---------------- 1 files changed, 29 insertions(+), 16 deletions(-) diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs index fde3f28..7e9fd77 100644 --- a/Admin.NET/WCS.Application/Util/HttpService.cs +++ b/Admin.NET/WCS.Application/Util/HttpService.cs @@ -64,7 +64,8 @@ TaskNo = result.TaskList.TaskNo, Levels = 999, EndLocate = result.TaskList.EndLocate, - EndRoadway = result.TaskList.EndRoadway + EndRoadway = result.TaskList.EndRoadway, + OrderNo=result.TaskList.OrderNo }; _db.Insertable(taskAdd).ExecuteCommand(); @@ -359,8 +360,6 @@ /// <returns></returns> public string BindPlnInHouseWcs(string Qty, string palletNo) { - string returnStr = ""; - var model = new BindPalletModel() { BindType = "1",//鐢宠绫诲瀷 @@ -368,19 +367,10 @@ PalletNo = palletNo,//鎵樼洏鍙� }; string url = Urls.WMSAddress + ":" + Urls.WMSPort; - var result = (url + "/api/DownAPi/BindPlnInHouseWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseOutPallet>().Result; + var result = (url + "/api/DownAPi/BindPlnInHouseWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result; Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson()); - if (result.Success == 0) - { - returnStr = result.TaskList.ToString(); - } - else - { - returnStr = "-1:" + result.Message; - return returnStr; - } - return returnStr; + return result.Success.ToString(); } /// <summary> @@ -418,6 +408,8 @@ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson()); return result.Success.ToString(); } + + /// <summary> /// 璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚 @@ -483,11 +475,32 @@ string url = Urls.WMSAddress + ":" + Urls.WMSPort; var str = new { - BoxNo = boxNo + BoxNo = boxNo, + PalletNo = "", + TaskNo = "" }; - var result = (url + "/api/DownAPi/ResultBoxInfoCheckWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<RequestloadingAddre>().Result; + var result = (url + "/api/DownAPi/ResultBoxInfoExportWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<RequestloadingAddre>().Result; Log.Information("璋冪敤WMS鎺ュ彛楠岃瘉绠辩爜鏄惁鍙嫞璐у苟杩斿洖瑁呰溅鍙�:" + result.ToJson()); return result; } + + /// <summary> + /// 璋冪敤WMS鎺ュ彛鍙嶉AGV鍙斁淇″彿 + /// </summary> + /// <param name="taskno">浠诲姟鍙�</param> + /// <param name="port">宸ヤ綅鍙�</param> + /// <returns></returns> + public string RequesContinueAgv(string taskno,string port) + { + string url = Urls.WMSAddress + ":" + Urls.WMSPort; + var str = new + { + TaskNo = taskno, + Port = port + }; + var result = (url + "/api/DownAPi/AgcontinueTask").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result; + Log.Information("璋冪敤WMS鎺ュ彛鍙嶉AGV鍙斁鎺ュ彛" + result.ToJson()); + return result.Success.ToString(); + } } -- Gitblit v1.8.0