From 219a08427376efdd304e9b11e481ccd8276018bb Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 18 十月 2025 11:14:29 +0800
Subject: [PATCH] 巷道形式存取放物料

---
 Wms/Utility/Tools/RcsHelper.cs |   37 ++++++++++++++++++++++++++++++-------
 1 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/Wms/Utility/Tools/RcsHelper.cs b/Wms/Utility/Tools/RcsHelper.cs
index 568bfda..88d44ab 100644
--- a/Wms/Utility/Tools/RcsHelper.cs
+++ b/Wms/Utility/Tools/RcsHelper.cs
@@ -25,10 +25,31 @@
         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 = "";
+            if (taskDetial.Endport.Substring(0,3) == "C01")
+            {
+                tasktype = "F23";
+            }
+            
 
             List<targetRoute> pahtList = new List<targetRoute>();
             //璧峰浣嶇疆
@@ -50,6 +71,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 +84,7 @@
             string response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV", key);
             //瑙f瀽杩斿洖鏁版嵁 
             var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
-            if (agvModel.Code == "0")
+            if (agvModel.Code == "SUCCESS")
             {
                 result = true;//缁欎笅杞︿笅鍙戜换鍔℃垚鍔�
 
@@ -102,8 +125,8 @@
             var jsonData = JsonConvert.SerializeObject(carrierInfo);
             string response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV缁戝畾杞藉叿鍛戒护", "AGV", key);
             //瑙f瀽杩斿洖鏁版嵁 
-            var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
-            if (agvModel.Code == "0")
+            var agvModel = JsonConvert.DeserializeObject<AgvTaskBindBack>(response);
+            if (agvModel.code == "SUCCESS")
             {
                 result = true;//缁欎笅杞︿笅鍙戜换鍔℃垚鍔�
 
@@ -112,9 +135,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