From 1a39a01ff6d99ab4c98e7243aa0d3e0a264008ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期日, 16 二月 2025 09:02:33 +0800
Subject: [PATCH] 修改测试出现的问题
---
Admin.NET/WCS.Application/Util/HttpService.cs | 152 ++++++++++++++++++++++++++++++++++++++------------
1 files changed, 115 insertions(+), 37 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 256fcc5..7aa62f6 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -35,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);
@@ -49,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,
@@ -66,12 +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
{
@@ -95,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 = "";
@@ -105,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;
@@ -137,6 +137,7 @@
_db.Insertable(taskAdd).ExecuteCommand();
endLocat = result.TaskList.EndRoadway;
returnStr = result.TaskList.EndLocate;
+ taskNo = result.TaskList.TaskNo;
}
else
{
@@ -169,8 +170,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)
@@ -214,7 +215,7 @@
HubUtil.PublicTask(taskUp.Adapt<WcsTaskOutput>());
}
-
+
returnStr = result.TaskList.EndLocate;
taskNo = result.TaskList.TaskNo;
}
@@ -259,9 +260,10 @@
//string TaskStatus = "";
//var PalletNo = "";
//var TaskNo = "";
- var str = new {
+ var str = new
+ {
PalletNo = model.PalletNo,
- TaskNo=model.TaskNo,
+ TaskNo = model.TaskNo,
TaskType = model.TaskType.ToString(),
TaskStatus = model.TaskStatus.ToString(),
};
@@ -296,7 +298,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 = "";
@@ -324,7 +326,7 @@
//IsSuccess =TaskSuccessEnum.Success,
Origin = "WMS",
StartLocate = item.StartLocate,
- StartRoadway=item.StartRoadway,
+ StartRoadway = item.StartRoadway,
PalletNo = item.PalletNo,
EndLocate = item.EndLocate,
EndRoadway = item.EndRoadway
@@ -382,21 +384,22 @@
}
/// <summary>
- /// 璋冪敤WMS鎺ュ彛鍙嶉缂犺啘寮傚父鎺ュ彛
+ /// 璋冪敤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;
+ 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>
@@ -411,10 +414,12 @@
{
PalletNo = palletno
};
- var result = (url + "/api/DownAPi/RequestUnPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
+ var result = (url + "/api/DownAPi/RequestUnPackWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson());
- return result.Success;
+ return result.Success.ToString();
}
+
+
/// <summary>
/// 璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚
@@ -428,9 +433,82 @@
{
PalletNo = palletno
};
- var result = (url + "/api/DownAPi/RequestPackedWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
+ var result = (url + "/api/DownAPi/RequestPackedWcs").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel2>().Result;
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚寮傚父鎺ュ彛" + result.ToJson());
- return result.Success;
+ 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;
+ }
+
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛楠岃瘉绠辩爜鏄惁鍙嫞璐у苟杩斿洖瑁呰溅鍙�
+ /// </summary>
+ /// <param name="boxNo">绠辩爜</param>
+ /// <returns></returns>
+ public RequestloadingAddre ResultBoxInfoExportWcs(string boxNo)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var str = new
+ {
+ BoxNo = boxNo
+ };
+ var result = (url + "/api/DownAPi/ResultBoxInfoCheckWcs").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鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson());
+ return result.Success.ToString();
+ }
}
--
Gitblit v1.8.0