From e4690fca932b352927af3d186ed2a4767f017e79 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期日, 17 八月 2025 15:02:37 +0800
Subject: [PATCH] 修改问题
---
Admin.NET/WCS.Application/Util/HttpService.cs | 296 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 217 insertions(+), 79 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index b471dc6..8a24de8 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -2,6 +2,7 @@
using Elastic.Clients.Elasticsearch;
using Furion.Logging;
using Furion.RemoteRequest.Extensions;
+using NetTaste;
using Newtonsoft.Json;
using System.Text;
using WCS.Application.Entity;
@@ -10,6 +11,8 @@
namespace WCS.Application;
public class HttpService
{
+ private static readonly object OLock = new object();
+
private dynamic Urls;
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
@@ -29,29 +32,118 @@
/// <param name="ceng"></param>
/// <param name="endLocat"></param>
/// <param name="taskNo"></param>
+ /// <param name="palletHeight"></param>
+ /// <param name="palletWeight"></param>
/// <returns></returns>
- public string RequestRoadWay(string palletNo, string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo)
+ public string RequestRoadWay(string palletNo, string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo, int palletHeight,string palletWeight)
{
- string returnStr = "";
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛-鏄惁閲嶅鐢宠锛�" + palletNo);
+ lock (OLock)
+ {
+ 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);
+ 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);
+ if (task == null)
+ {
+ var model = new RequestAsnTask()
+ {
+ PalletNo = palletNo,
+ HouseNo = "W01",
+ TaskModel = taskModel,
+ PalletHeight = palletHeight,
+ StartLocat = startLocat,
+ PalletWeight = palletWeight
+ };
+
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/RequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+ if (result == null)
+ {
+ returnStr = "-1:璋冪敤WMS鎺ュ彛澶辫触";
+ return returnStr;
+ }
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉浠诲姟鎺ュ彛" + result.ToJson());
+ if (result.Success == 0)
+ {
+
+ var taskAdd = new WcsTask()
+ {
+ TaskType = TaskTypeEnum.In,
+ Status = TaskStatusEnum.Wait,
+ Origin = "WMS",
+ StartLocate = startLocat,
+ PalletNo = palletNo,
+ TaskNo = result.TaskList.TaskNo,
+ Levels = 999,
+ EndLocate = result.TaskList.EndLocate,
+ EndRoadway = result.TaskList.EndRoadway,
+ PalletQty = palletHeight//鎵樼洏楂樺害
+ };
+
+ _db.Insertable(taskAdd).ExecuteCommand();
+ endLocat = result.TaskList.EndRoadway;
+ returnStr = result.TaskList.EndLocate;
+ taskNo = taskAdd.TaskNo;
+ }
+ else
+ {
+ returnStr = "-1:" + result.Message;
+ return returnStr;
+ }
+ }
+ else
+ {
+ returnStr = task.EndLocate;
+ endLocat = task.EndRoadway;
+ taskNo = task.TaskNo;
+ }
+
+ endLocat = PLCCommon.RoadwayToStationNum(endLocat, ceng);
+
+ return returnStr;
+ }
+ }
+
+ /// <summary>
+ /// 璋冪敤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,
+ string startLocat, string taskModel, string ceng, ref string endLocat, ref string taskNo, int palletHeight)
+ {
+ 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);
if (task == null)
{
- var model = new RequestAsnTask()
+ var model = new BoxPalletBindVm()
{
+ OrderCode = "",//鏆傛棤涓婃父绯荤粺缂栧彿
+ AsnNo = orderNo,
+ AsnDetailNo = 0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
PalletNo = palletNo,
- HouseNo = "W01",
- TaskModel = taskModel
+ Qty = qty,
+ Type = type,
+ SkuNo = skuNo,
+ LotNo = lotNo,
+ LotText = lotText,
+ SupplierLot = supplierLot,
+ PalletHeight = palletHeight,
+ Detail = detail
};
-
+ Log.Information("璋冪敤WMS鑷姩鐮佸灈鎺ュ彛--璇锋眰鎶ユ枃锛�" + model.ToJson());
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());
+ var result = (url + "/api/DownApi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
+ Log.Information("璋冪敤WMS鑷姩鐮佸灈鎺ュ彛--杩斿洖鎶ユ枃锛�" + result.ToJson());
if (result.Success == 0)
{
-
+ if (result.TaskList == null)
+ {
+ returnStr = $"-1:鍚慦MS鐢宠缁勬墭鍏ュ簱澶辫触";
+ return returnStr;
+ }
var taskAdd = new WcsTask()
{
TaskType = TaskTypeEnum.In,
@@ -62,78 +154,14 @@
TaskNo = result.TaskList.TaskNo,
Levels = 999,
EndLocate = result.TaskList.EndLocate,
- EndRoadway = result.TaskList.EndRoadway
- };
-
- _db.Insertable(taskAdd).ExecuteCommand();
- endLocat = result.TaskList.EndRoadway;
- returnStr = result.TaskList.EndLocate;
-
- }
- else
- {
- returnStr = "-1:" + result.Message;
- return returnStr;
- }
- }
- else
- {
- returnStr = task.EndLocate;
- endLocat = task.EndRoadway;
- taskNo = task.TaskNo;
- }
-
- endLocat = PLCCommon.RoadwayToStationNum(endLocat, ceng);
-
- return returnStr;
- }
-
- /// <summary>
- /// 璋冪敤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,
- 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);
- if (task == null)
- {
- 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
- };
- string url = Urls.WMSAddress + ":" + Urls.WMSPort;
- var result = (url + "/api/DownAPi/BindRequestRoadWay").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,
- Status = TaskStatusEnum.Wait,
- Origin = "WMS",
- StartLocate = startLocat,
- PalletNo = palletNo,
- TaskNo = result.TaskList.TaskNo,
- EndLocate = result.TaskList.EndLocate,
- EndRoadway = result.TaskList.EndRoadway
+ EndRoadway = result.TaskList.EndRoadway,
+ PalletQty = palletHeight//鎵樼洏楂樺害
};
_db.Insertable(taskAdd).ExecuteCommand();
endLocat = result.TaskList.EndRoadway;
returnStr = result.TaskList.EndLocate;
+ taskNo = taskAdd.TaskNo;
}
else
{
@@ -161,7 +189,7 @@
/// <param name="starRoadWay"></param>
/// <param name="taskNo"></param>
/// <returns></returns>
- public string RequestLocate(string palletNo, string startLocat, string taskModel, string starRoadWay, ref string taskNo)
+ public string RequestLocate(string palletNo, string startLocat, string taskModel, string starRoadWay, ref string taskNo, int palletHeight)
{
string returnStr = "";
@@ -177,7 +205,8 @@
PalletNo = palletNo,
HouseNo = "W01",
RoadWayNo = starRoadWay,
- TaskModel = taskModel
+ TaskModel = taskModel,
+ PalletHeight = palletHeight
};
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
@@ -196,6 +225,7 @@
//IsSuccess =TaskSuccessEnum.Success,
Origin = "WMS",
StartLocate = startLocat,
+ Levels = 999,
PalletNo = palletNo,
EndLocate = result.TaskList.EndLocate,
EndRoadway = result.TaskList.EndRoadway
@@ -306,6 +336,7 @@
StartLocate = item.StartLocate,
StartRoadway=item.StartRoadway,
PalletNo = item.PalletNo,
+ Levels = 999,
EndLocate = item.EndLocate,
EndRoadway = item.EndRoadway
};
@@ -328,4 +359,111 @@
}
return returnStr;
}
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛缁欏皬杞︿笅鍙戝叆搴撲换鍔�
+ /// </summary>
+ /// <param name="endLocation"></param>
+ /// <returns></returns>
+ public async Task<ResponseModel> IssuedAgvTask(string endLocation)
+ {
+ var model = new
+ {
+ EndLocation = endLocation
+ };
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = await (url + "/api/DownAPi/WcsIssuedAgvTask").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseModel>();
+ Log.Information("璋冪敤WMS鎺ュ彛WCS鐢宠缁欏皬杞︿笅鍙戝叆搴撲换鍔℃帴鍙�" + result.ToJson());
+ return result;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鍑哄簱浠诲姟鍙疯幏鍙栧嚭搴撳崟绫诲瀷
+ /// </summary>
+ /// <param name="endLocation"></param>
+ /// <returns></returns>
+ public async Task<ResponseModel> GetSoOrderTypeByTaskNo(string taskNo)
+ {
+ var model = new
+ {
+ TaskNo = taskNo
+ };
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = await (url + "/api/DownAPi/GetSoOrderTypeByTaskNo").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseModel>();
+ Log.Information("璋冪敤WMS鎺ュ彛鏍规嵁鍑哄簱浠诲姟鍙疯幏鍙栧嚭搴撳崟绫诲瀷" + result.ToJson());
+ return result;
+ }
+
+ /// <summary>
+ /// 鏍规嵁鎵樼洏鍙疯幏鍙栨墭鐩樹笂鐗╂枡鍝佺淇℃伅
+ /// </summary>
+ /// <param name="palletNo">鎵樼洏鍙�</param>
+ /// <returns></returns>
+ public string GetPalletPzNo(string palletNo)
+ {
+ var model = new
+ {
+ PalletNo = palletNo
+ };
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/GetStockDetailByPalletNo").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseSkuInfo>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鏍规嵁鎵樼洏鍙疯幏鍙栨墭鐩樺簱瀛樻槑缁嗕俊鎭�" + result.ToJson());
+
+ string pzNo = string.Empty;
+ if (result.Success == 0)
+ {
+ var palletSkuInfo = result.PalletSkuInfo;
+ var pzInfo = _db.Queryable<WcsMateialPzInfo>().First(w => w.SkuNo == palletSkuInfo.SkuNo && w.SkuName == palletSkuInfo.SkuName);
+ if (pzInfo != null)
+ {
+ pzNo = pzInfo.PZNo;
+ }
+ }
+ return pzNo;
+ }
+ /// <summary>
+ /// 鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣
+ /// </summary>
+ /// <param name="taskNo"></param>
+ /// <returns></returns>
+ public string BoxUnstackd(string palletNo)
+ {
+ string returnStr = "";
+ var model = new
+ {
+ PalletNo = palletNo
+ };
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/BoxUnstackd").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<WmsResponseModel>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鎴愬搧绠辩爜鎷嗗灈鎷ｈ揣" + result.ToJson());
+
+ if (result.Success != 0)
+ {
+ returnStr = "-1:" + result.Message;
+ }
+ return returnStr;
+ }
+
+ /// <summary>
+ /// 鍙犳墭鏈虹敵璇风┖鎵樿泛缁戝畾
+ /// </summary>
+ /// <param name="palletNo"></param>
+ /// <returns></returns>
+ public string BindNullPalletWcs(int qty,string palletNo)
+ {
+ string returnStr = "";
+ var model = new
+ {
+ PalletNo = palletNo,
+ Qty = qty,
+ };
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/BindNullPalletWcs").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseSkuInfo>().Result;
+ Log.Information("璋冪敤WMS鎺ュ彛鍙犳墭鏈虹粦瀹氱┖鎵樿泛" + result.ToJson());
+
+ if (result.Success != 0)
+ {
+ returnStr = "-1:" + result.Message;
+ }
+ return returnStr;
+ }
}
--
Gitblit v1.8.0