From 234c852835c5f46fc9ee3f426235fc385c990442 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期六, 14 六月 2025 09:54:31 +0800
Subject: [PATCH] Merge branch 'wxw'
---
Admin.NET/WCS.Application/Util/HttpService.cs | 28 ++++++++++------------------
1 files changed, 10 insertions(+), 18 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 7aa62f6..4494c11 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,8 @@
TaskNo = result.TaskList.TaskNo,
Levels = 999,
EndLocate = result.TaskList.EndLocate,
- EndRoadway = result.TaskList.EndRoadway
+ EndRoadway = result.TaskList.EndRoadway,
+ OrderNo=result.TaskList.OrderNo
};
_db.Insertable(taskAdd).ExecuteCommand();
@@ -359,8 +360,6 @@
/// <returns></returns>
public string BindPlnInHouseWcs(string Qty, string palletNo)
{
- string returnStr = "";
-
var model = new BindPalletModel()
{
BindType = "1",//鐢宠绫诲瀷
@@ -368,19 +367,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>
@@ -485,9 +475,11 @@
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;
@@ -508,7 +500,7 @@
Port = port
};
var result = (url + "/api/DownAPi/AgcontinueTask").SetBody(str, "application/json", Encoding.UTF8).PostAsAsync<IsBaleModel>().Result;
- Log.Information("璋冪敤WMS鎺ュ彛鍙嶉鎷嗚啘寮傚父鎺ュ彛" + result.ToJson());
+ Log.Information("璋冪敤WMS鎺ュ彛鍙嶉AGV鍙斁鎺ュ彛" + result.ToJson());
return result.Success.ToString();
}
}
--
Gitblit v1.8.0