From 969aafa8bd335025da4caf5939a1626bad4f4236 Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期四, 19 六月 2025 16:54:03 +0800
Subject: [PATCH] Merge branch 'csc'
---
Admin.NET/WCS.Application/Util/HttpService.cs | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 545364f..22950d2 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -37,6 +37,62 @@
};
}
+ /// <summary>
+ /// 璋冪敤WMS鎺ュ彛鐢宠鍙犳墭鏈虹┖鎵樺叆搴撴帴鍙�
+ /// </summary>
+ /// <param name="model"></param>
+ /// <returns></returns>
+ public string RequestLiKuPallet(NullPallInRequest model)
+ {
+ 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 == model.PalletNo);
+
+ if (task == null)
+ {
+ string url = Urls.WMSAddress + ":" + Urls.WMSPort;
+ var result = (url + "/api/DownAPi/RequestPalletIn").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,
+ Type = PLCTypeEnum.AGV,
+ Origin = "WMS",
+
+ Qty = result.TaskList.Qty,
+ PalletNo = model.PalletNo,
+ TaskNo = result.TaskList.TaskNo,
+ Levels = 999,
+
+ StartLocate = model.Locate,
+ StartRoadway = result.TaskList.StartRoadway,
+ EndLocate = result.TaskList.EndLocate,
+ EndRoadway = result.TaskList.EndRoadway,
+ TaskId = FourWayCarUtil.GetTaskId()
+ };
+
+ _db.Insertable(taskAdd).ExecuteCommand();
+
+ returnStr = result.TaskList.EndLocate;
+
+ }
+ else
+ {
+ returnStr = "-1:" + result.Message;
+ return returnStr;
+ }
+ }
+ else
+ {
+ returnStr = task.EndLocate;
+ }
+
+ return returnStr;
+ }
/// <summary>
/// 璋冪敤WMS鎺ュ彛鐢宠宸烽亾鎺ュ彛
@@ -332,7 +388,7 @@
{"X-lr-request-id",requestId },
{"X-lr-version","4.2" },
};
-
+ Log.Information("璋冪敤AGV灏忚溅鎺ュ彛涓嬪彂浠诲姟璁板綍" + mod.ToJson());
var result = await url.SetHeaders(dic).SetBody(mod, "application/json", Encoding.UTF8).PostAsAsync<ResponseAgvDto>();
Log.Information("璋冪敤AGV灏忚溅鎺ュ彛涓嬪彂浠诲姟" + result.ToJson());
return result;
@@ -361,7 +417,7 @@
var result = await url.SetHeaders(dic).SetBody(mod, "application/json", Encoding.UTF8).PostAsAsync<ResponseAgvDto>();
Log.Information("璋冪敤AGV灏忚溅鎺ュ彛缁х画鎵ц浠诲姟" + result.ToJson());
- return null;
+ return result;
}
/// <summary>
--
Gitblit v1.8.0