From a5cde4a681249e2027dd44896e33843395fce64b Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 27 九月 2025 10:46:06 +0800
Subject: [PATCH] 修改托盘自动绑定
---
Admin.NET/WCS.Application/Util/HttpService.cs | 76 +++++++++++++++++++++++++++++---------
1 files changed, 58 insertions(+), 18 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 2b7e7dd..08c0ffe 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -17,7 +17,7 @@
private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
public HttpService()
{
- var _sysConfigService = App.GetService<SysConfigService>();//todo 杩欓噷闇�瑕佹祴璇曚笅鐢熷懡鍛ㄦ湡闂
+ var _sysConfigService = App.GetService<SysConfigService>();// todo 杩欓噷闇�瑕佹祴璇曚笅鐢熷懡鍛ㄦ湡闂
Urls = _sysConfigService.GetSystemInfo().Result;
}
@@ -64,7 +64,12 @@
TaskNo = result.TaskList.TaskNo,
Levels = 999,
EndLocate = result.TaskList.EndLocate,
- EndRoadway = result.TaskList.EndRoadway
+ EndRoadway = result.TaskList.EndRoadway,
+ OrderNo=result.TaskList.OrderNo,
+
+ SkuName= result.TaskList.SkuName,//鐗╂枡鍚嶇О
+ LotNo= result.TaskList.LotNo,//鎵规鍙�
+ Qty= Convert.ToDecimal(result.TaskList.Qty),//鍏ュ簱鏁伴噺
};
_db.Insertable(taskAdd).ExecuteCommand();
@@ -103,6 +108,15 @@
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 box = new BindBox();
+ List<BindBox> bindBox = new List<BindBox>();
+ foreach (var item in detail)
+ {
+ box.BoxNo = item.BoxNo;
+ box.BoxNo2 = item.BoxNo2;
+ box.BoxNo3 = item.BoxNo3;
+ bindBox.Add(box);
+ }
var model = new BoxPalletBindVm()
{
OrderCode = "",//鏆傛棤涓婃父绯荤粺缂栧彿
@@ -110,12 +124,25 @@
AsnDetailNo = 0,//鏆傛棤鍏ュ簱鍗曟槑缁嗙紪鍙凤紝WMS鏍规嵁鐗╂枡鎵规鏌ユ壘
PalletNo = palletNo,
Qty = qty,
+ xQty = (decimal)detail[0].Qty,
+ FullQty = (decimal)detail[0].FullQty,
Type = type,
SkuNo = skuNo,
+ SkuName = detail[0].SkuName,
LotNo = lotNo,
LotText = lotText,
SupplierLot = supplierLot,
- Detail = detail
+ ProductionTime = detail[0].ProductionTime,
+ ExpirationTime = detail[0].ExpirationTime,
+ InspectMark = detail[0].InsPectMark,
+ BitBoxMark = detail[0].BitBoxMark,
+ InspectStatus = "",
+ Standard = detail[0].Standard,
+ PackageStandard = detail[0].PackageStandard,
+ StoreTime = detail[0].StoreTime,
+ QtyOrd = detail[0].QtyOrd,
+ QtyCount = detail[0].QtyCount,
+ Detail = bindBox
};
string url = Urls.WMSAddress + ":" + Urls.WMSPort;
var result = (url + "/api/DownAPi/BindRequestRoadWay").SetBody(model, "application/json", Encoding.UTF8).PostAsAsync<ResponseTasks>().Result;
@@ -137,6 +164,7 @@
_db.Insertable(taskAdd).ExecuteCommand();
endLocat = result.TaskList.EndRoadway;
returnStr = result.TaskList.EndLocate;
+ taskNo = result.TaskList.TaskNo;
}
else
{
@@ -358,8 +386,6 @@
/// <returns></returns>
public string BindPlnInHouseWcs(string Qty, string palletNo)
{
- string returnStr = "";
-
var model = new BindPalletModel()
{
BindType = "1",//鐢宠绫诲瀷
@@ -367,19 +393,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>
@@ -417,6 +434,8 @@
Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson());
return result.Success.ToString();
}
+
+
/// <summary>
/// 璋冪敤WMS鎺ュ彛鍙嶉缂犺啘瀹屾垚
@@ -482,11 +501,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