From 70b4bdc6f999c55b75138e013abf436100e9987b Mon Sep 17 00:00:00 2001
From: liudl <673013083@qq.com>
Date: 星期一, 23 六月 2025 15:33:16 +0800
Subject: [PATCH] 修改手自动

---
 Admin.NET/WCS.Application/Util/HttpService.cs |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 7aa62f6..ad11265 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();
@@ -359,8 +364,6 @@
     /// <returns></returns>
     public string BindPlnInHouseWcs(string Qty, string palletNo)
     {
-        string returnStr = "";
-
         var model = new BindPalletModel()
         {
             BindType = "1",//鐢宠绫诲瀷
@@ -368,19 +371,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 +479,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 +504,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