From 4b4afa78f556199e5778d5cac88d3d6de6d8c1da Mon Sep 17 00:00:00 2001
From: Administrator <Administrator@DESKTOP-JIE70N9>
Date: 星期四, 12 六月 2025 10:57:17 +0800
Subject: [PATCH] 修改测试问题
---
Admin.NET/WCS.Application/PLC/PLCService.cs | 4 +++-
Admin.NET/WCS.Application/Util/HttpService.cs | 2 +-
Admin.NET/WCS.Application/OpenApi/OpenApi.cs | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
index c6a068c..69ab9f6 100644
--- a/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
+++ b/Admin.NET/WCS.Application/OpenApi/OpenApi.cs
@@ -549,7 +549,7 @@
HttpService httpService = new HttpService();
var inputs = new NullPallInRequest();
- inputs.PalletNo = modTask.PalletNo;
+ inputs.PalletNo = palletNo;
inputs.PallNum = count;
inputs.Locate = "B100101";//鍙犳墭鐩樻満浣嶇疆
inputs.HouseNo = "W02";
diff --git a/Admin.NET/WCS.Application/PLC/PLCService.cs b/Admin.NET/WCS.Application/PLC/PLCService.cs
index d748ee3..0177093 100644
--- a/Admin.NET/WCS.Application/PLC/PLCService.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCService.cs
@@ -9,6 +9,7 @@
using Furion.Logging;
using IoTClient;
using NewLife.Reflection;
+using Newtonsoft.Json;
using Org.BouncyCastle.Ocsp;
using SixLabors.ImageSharp.ColorSpaces;
using WCS.Application.Entity;
@@ -1436,10 +1437,11 @@
new {type = "SITE" , code = modTask.StartLocate},
new { type = "PILE_COUNT", code = modTask.Qty }
};
+
taskModel.targetRoute.Add(new targetRoute() {
seq = 0,
type = "MIX_CONDITION",
- code = code.ToString() // "[{\"type":\"SITE", code = modTask.StartLocate },new { type = "PILE_COUNT", code = modTask.Qty }]"
+ code = JsonConvert.SerializeObject(code) // "[{\"type":\"SITE", code = modTask.StartLocate },new { type = "PILE_COUNT", code = modTask.Qty }]"
});
diff --git a/Admin.NET/WCS.Application/Util/HttpService.cs b/Admin.NET/WCS.Application/Util/HttpService.cs
index e50fc2e..294b834 100644
--- a/Admin.NET/WCS.Application/Util/HttpService.cs
+++ b/Admin.NET/WCS.Application/Util/HttpService.cs
@@ -60,7 +60,7 @@
{
TaskType = TaskTypeEnum.In,
Status = TaskStatusEnum.Wait,
- Type = PLCTypeEnum.ConveyorLine,
+ Type = PLCTypeEnum.AGV,
Origin = "WMS",
Qty = result.TaskList.Qty,
--
Gitblit v1.8.0