From d77d9ff80f5fd8cd70c775fbfc30dc27061bfad2 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期四, 02 一月 2025 09:13:06 +0800
Subject: [PATCH] 增加缠膜机交互和修改满放和空取程序
---
Admin.NET/WCS.Application/Util/HttpService.cs | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 106 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 9e0a195..256fcc5 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -1,8 +1,10 @@
锘縰sing DocumentFormat.OpenXml.EMMA;
+using DocumentFormat.OpenXml.Vml.Office;
using Elastic.Clients.Elasticsearch;
using Furion.Logging;
using Furion.RemoteRequest.Extensions;
using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using System.Text;
using WCS.Application.Entity;
using static SKIT.FlurlHttpClient.Wechat.Api.Models.ComponentTCBBatchCreateContainerServiceVersionResponse.Types;
@@ -253,7 +255,17 @@
public async Task<ResponseTasks> RequestEmptyException(TaskRequest model)
{
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
- var result = await (url + "/api/DownAPi/EmptyException").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
+ //string TaskType = "";
+ //string TaskStatus = "";
+ //var PalletNo = "";
+ //var TaskNo = "";
+ var str = new {
+ PalletNo = model.PalletNo,
+ TaskNo=model.TaskNo,
+ TaskType = model.TaskType.ToString(),
+ TaskStatus = model.TaskStatus.ToString(),
+ };
+ var result = await (url + "/api/DownAPi/EmptyException").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉绌哄彇寮傚父鎺ュ彛" + result.ToJson());
return result;
}
@@ -266,7 +278,14 @@
public async Task<ResponseTasks> RequestFullException(TaskRequest model)
{
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
- var result = await (url + "/api/DownAPi/FullException").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
+ var str = new
+ {
+ PalletNo = model.PalletNo,
+ TaskNo = model.TaskNo,
+ TaskType = model.TaskType.ToString(),
+ TaskStatus = model.TaskStatus.ToString(),
+ };
+ var result = await (url + "/api/DownAPi/FullException").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>();
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉婊″彇寮傚父鎺ュ彛" + result.ToJson());
return result;
}
@@ -329,4 +348,89 @@
}
return returnStr;
}
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鐢宠绌烘墭璺虹粦瀹�
+ /// </summary>
+ /// <param name="Qty"></param>
+ /// <param name="palletNo"></param>
+ /// <returns></returns>
+ public string BindPlnInHouseWcs(string Qty, string palletNo)
+ {
+ string returnStr = "";
+
+ var model = new BindPalletModel()
+ {
+ BindType = "1",//鐢宠绫诲瀷
+ Qty = int.Parse(Qty),//鍙犳墭鏈鸿泛鎵樼洏鏁�
+ PalletNo = palletNo,//鎵樼洏鍙�
+ };
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/BindPlnInHouseWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseOutPallet>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+
+ if (result.Success == 0)
+ {
+ returnStr = result.TaskList.ToString();
+ }
+ else
+ {
+ returnStr = "-1:" + result.Message;
+ return returnStr;
+ }
+ return returnStr;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉缂犺啘寮傚父鎺ュ彛
+ /// </summary>
+ /// <param name="PalletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ public string RequestPackWcs(string PalletNo)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ //var str = new
+ //{
+ // PalletNo = palletno
+ //};
+ var result = (url + "/api/DownAPi/RequestPackWcs").SetBody(PalletNo, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘寮傚父鎺ュ彛" + result.ToJson());
+
+ return result.Success;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛
+ /// </summary>
+ /// <param name="palletno">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ public string RequestUnPackWcs(string palletno)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var str = new
+ {
+ PalletNo = palletno
+ };
+ var result = (url + "/api/DownAPi/RequestUnPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson());
+ return result.Success;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚
+ /// </summary>
+ /// <param name="palletno">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ public string RequestPackedWcs(string palletno)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var str = new
+ {
+ PalletNo = palletno
+ };
+ var result = (url + "/api/DownAPi/RequestPackedWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚寮傚父鎺ュ彛" + result.ToJson());
+ return result.Success;
+ }
+
}
--
Gitblit v1.8.0