From 7d9d48cf1e9d5b28e59ea52a0ee1acdfd15f88e7 Mon Sep 17 00:00:00 2001
From: IPC-610 <IPC-610@DESKTOP-6LEOOS3>
Date: 星期二, 07 一月 2025 08:32:34 +0800
Subject: [PATCH] 问题修改
---
Admin.NET/WCS.Application/Util/HttpService.cs | 192 ++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 168 insertions(+), 24 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index b471dc6..0d79375 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;
@@ -33,7 +35,7 @@
public string RequestRoadWay(string palletNo, string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
{
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);
@@ -47,11 +49,11 @@
};
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
- var result = (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+ var result = (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
if (result.Success == 0)
{
-
+
var taskAdd = new WcsTask()
{
TaskType = TaskTypeEnum.In,
@@ -64,11 +66,12 @@
EndLocate = result.TaskList.EndLocate,
EndRoadway = result.TaskList.EndRoadway
};
-
+
_db.Insertable(taskAdd).ExecuteCommand();
endLocat = result.TaskList.EndRoadway;
+ taskNo = result.TaskList.TaskNo;
returnStr = result.TaskList.EndLocate;
-
+
}
else
{
@@ -92,7 +95,7 @@
/// 璋冪敤WMS鎺ュ彛鑷姩鐮佸灈缁戝畾淇℃伅杩斿洖宸烽亾鍙�
/// </summary>
/// <returns></returns>
- public string BindRequestRoadWay(string orderNo, string palletNo,decimal qty ,string type,string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
+ public string BindRequestRoadWay(string orderNo, string palletNo, decimal qty, string type, string skuNo, string lotNo, string lotText, string supplierLot, List<WcsBoxInfo> detail,
string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
{
string returnStr = "";
@@ -102,17 +105,17 @@
{
var model = new BoxPalletBindVm()
{
- OrderCode= "",//鏆傛棤涓婃父绯荤粺缂栧彿
- AsnNo= orderNo,
- AsnDetailNo=0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
- PalletNo=palletNo,
- Qty= qty,
- Type=type,
- SkuNo=skuNo,
- LotNo= lotNo,
- LotText= lotText,
- SupplierLot= supplierLot,
- Detail=detail
+ OrderCode = "",//鏆傛棤涓婃父绯荤粺缂栧彿
+ AsnNo = orderNo,
+ AsnDetailNo = 0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
+ PalletNo = palletNo,
+ Qty = qty,
+ Type = type,
+ SkuNo = skuNo,
+ LotNo = lotNo,
+ LotText = lotText,
+ SupplierLot = supplierLot,
+ Detail = detail
};
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
var result = (url + "/api/DownAPi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
@@ -166,8 +169,8 @@
string returnStr = "";
- var task = _db.Queryable<WcsTask>().First(m => m.IsDelete == false
- && (m.Status == TaskStatusEnum.Wait || m.Status == TaskStatusEnum.Doing)
+ 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)
@@ -211,7 +214,7 @@
HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
}
-
+
returnStr = result.TaskList.EndLocate;
taskNo = result.TaskList.TaskNo;
}
@@ -252,7 +255,18 @@
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;
}
@@ -265,7 +279,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;
}
@@ -276,7 +297,7 @@
/// <param name="Num"></param>
/// <param name="OutMode"></param>
/// <returns></returns>
- public string IssuePlnOutHouseWcs(string Num,string OutMode)
+ public string IssuePlnOutHouseWcs(string Num, string OutMode)
{
string returnStr = "";
@@ -304,7 +325,7 @@
//IsSuccess =TaskSuccessEnum.Success,
Origin = "WMS",
StartLocate = item.StartLocate,
- StartRoadway=item.StartRoadway,
+ StartRoadway = item.StartRoadway,
PalletNo = item.PalletNo,
EndLocate = item.EndLocate,
EndRoadway = item.EndRoadway
@@ -328,4 +349,127 @@
}
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 PackModel()
+ {
+ PalletNo = PalletNo
+ };
+
+ var result = (url + "/api/DownAPi/RequestPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鐢宠缂犺啘寮傚父鎺ュ彛" + result.ToJson());
+
+ return result.Success.ToString();
+ }
+
+ /// <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<IsBaleModel2>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson());
+ return result.Success.ToString();
+ }
+
+ /// <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<IsBaleModel2>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚寮傚父鎺ュ彛" + result.ToJson());
+ return result.Success.ToString();
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉鎷嗗灈鎵樼洏淇℃伅
+ /// </summary>
+ /// <param name="palletno">鎵樼洏鍙�</param>
+ /// <param name="taskno">浠诲姟鍙�</param>
+ /// <returns></returns>
+ public RequestBoxInfoCheckAll RequestBoxCheckinfo(string palletno,string taskno)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var str = new
+ {
+ PalletNo = palletno,
+ TaskNo = taskno
+ };
+ var result = (url + "/api/DownAPi/ResultBoxInfoCheckWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<RequestBoxInfoCheckAll>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗘墭鎵樼洏淇℃伅寮傚父鎺ュ彛" + result.ToJson());
+ return result;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鍙嶉鍒嗘嫞鍑哄簱绠变俊鎭�
+ /// </summary>
+ /// <param name="palletno">鎵樼洏鍙�</param>
+ /// <param name="taskno">浠诲姟鍙�</param>
+ /// <returns></returns>
+ public IsBaleModel2 RequestBoxno(string palletno)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var str = new
+ {
+ PalletNo = palletno,
+ };
+ var result = (url + "/api/DownAPi/RequestBoxno").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚寮傚父鎺ュ彛" + result.ToJson());
+ return result;
+ }
+
}
--
Gitblit v1.8.0