From 4de417b106a062452f5ac86e626e7e225b753eab Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期二, 23 九月 2025 08:03:11 +0800
Subject: [PATCH] 优化问题
---
Wms/Utility/Tools/RcsHelper.cs | 31 +++++++++++++++++++++++++------
1 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/Wms/Utility/Tools/RcsHelper.cs b/Wms/Utility/Tools/RcsHelper.cs
index 568bfda..5242185 100644
--- a/Wms/Utility/Tools/RcsHelper.cs
+++ b/Wms/Utility/Tools/RcsHelper.cs
@@ -25,7 +25,24 @@
public static bool CreateTaskForAgv(TaskDetial taskDetial, string url, out string agvMsg, string priority = null)
{
bool result = false;
- var tasktype = "F12";
+ var tasktype = "";
+ switch (taskDetial.Crtype)
+ {
+ case "1": //鍙《
+ tasktype = "F12";
+ break;
+ case "2": //鍙溅
+ tasktype = "F12";
+ break;
+ case "3": //娓呮礂鏈哄彨鑴忔《
+ tasktype = "F20";
+ break;
+ case "4": //娓呮礂鏈哄彇鍑�妗�
+ tasktype = "F21";
+ break;
+ default:
+ break;
+ }
//璺ㄦゼ灞備换鍔asktype鍊艰祴鍊尖�︹��
//tasktype = "";
@@ -50,6 +67,8 @@
AgvCreateTaskModel taskModel = new AgvCreateTaskModel();
taskModel.taskType = tasktype;
taskModel.targetRoute = pahtList;
+ taskModel.initPriority = 100;
+ taskModel.robotTaskCode = taskDetial.Taskno;
//AGV浠诲姟涓嬪彂鏃跺鍔爃earder:X-LR-REQUEST-ID,鍊间负闅忔満鏁�
long ran = DateTime.Now.Ticks;
@@ -61,7 +80,7 @@
string response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV", key);
//瑙ｆ瀽杩斿洖鏁版嵁
var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
- if (agvModel.Code == "0")
+ if (agvModel.Code == "SUCCESS")
{
result = true;//缁欎笅杞︿笅鍙戜换鍔℃垚鍔�
@@ -102,8 +121,8 @@
var jsonData = JsonConvert.SerializeObject(carrierInfo);
string response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV缁戝畾杞藉叿鍛戒护", "AGV", key);
//瑙ｆ瀽杩斿洖鏁版嵁
- var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
- if (agvModel.Code == "0")
+ var agvModel = JsonConvert.DeserializeObject<AgvTaskBindBack>(response);
+ if (agvModel.code == "SUCCESS")
{
result = true;//缁欎笅杞︿笅鍙戜换鍔℃垚鍔�
@@ -112,9 +131,9 @@
else
{
var logStr = $@".\log\AGV\涓嬪彂缁橝GV缁戝畾杞藉叿鍛戒护" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
- LogFile.SaveLogToFile($"涓嬪彂缁橝GV缁戝畾杞藉叿鍛戒护寮傚父锛�( {agvModel.Message} ),", logStr);
+ LogFile.SaveLogToFile($"涓嬪彂缁橝GV缁戝畾杞藉叿鍛戒护寮傚父锛�( {agvModel.message} ),", logStr);
- agvMsg = agvModel.Message;
+ agvMsg = agvModel.message;
}
return result;
--
Gitblit v1.8.0