From 42727048a245026b3e3022859da9cec8977bff2a Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期四, 12 六月 2025 08:33:49 +0800
Subject: [PATCH] 提交
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 8 +++-----
Admin.NET/WCS.Application/Util/HttpService.cs | 2 +-
Admin.NET/WCS.Application/Util/AGVStorageUtil.cs | 12 ++++++------
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index 0a6df94..62a31a0 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -1433,11 +1433,9 @@
taskModel.targetRoute.Add(new targetRoute() {
seq = 0,
type = "MIX_CONDITION",
- code = new List<object>() {
- new { type = "SITE", code = modTask.StartLocate },
- new { type = "PILE_COUNT", code = modTask.Qty }
- }
-
+ // code = "[{\"type":\"SITE", code = modTask.StartLocate },new { type = "PILE_COUNT", code = modTask.Qty }]"
+
+
});
taskModel.targetRoute.Add(new targetRoute() { seq = 1, type = type2, code = modTask.EndLocate });
}
diff --git a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
index 2177065..2ab7192 100644
--- a/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
+++ b/Admin.NET/WCS.Application/Util/AGVStorageUtil.cs
@@ -99,16 +99,16 @@
case "STORAGE" when type2 == "SITE":
{
taskModle = "FJ";
- if (locate1.AreaNo == "B10")
- {
- taskModle = "DPJRK";
- }
+
}
break;
case "SITE" when type2 == "STORAGE":
{
- taskModle = "YCRK";
-
+ taskModle = "YCRK";
+ if (locate1.AreaNo == "B10")
+ {
+ taskModle = "DPJRK";
+ }
}
break;
case "SITE" when type2 == "SITE":
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index 0b69ad6..e50fc2e 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -388,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;
--
Gitblit v1.8.0