From 28bea7128b8c24a6a664e880f1425e1fa24b9b5f Mon Sep 17 00:00:00 2001
From: pulg <plg@Haninfo>
Date: 星期四, 05 六月 2025 17:19:49 +0800
Subject: [PATCH] 11

---
 HH.WCS.ZCQTJ/api/AgvController.cs |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/HH.WCS.ZCQTJ/api/AgvController.cs b/HH.WCS.ZCQTJ/api/AgvController.cs
index 88d39c6..da0da6e 100644
--- a/HH.WCS.ZCQTJ/api/AgvController.cs
+++ b/HH.WCS.ZCQTJ/api/AgvController.cs
@@ -29,6 +29,11 @@
     {
         private static object locko1 = new object();
 
+        /// <summary>
+        /// hosttoagv涓婃姤
+        /// </summary>
+        /// <param name="model"></param>
+        /// <returns></returns>
         [HttpPost]
         //[Route("AGVCallbackState")]
         public ReturnResult AGVCallbackState(AgvTaskState model)
@@ -45,10 +50,12 @@
                     var transportTask = newDb.Queryable<WMSTask>().Where(e => e.S_TASK_NO == model.No)?.First();
                     if (transportTask == null)
                     {
+                        LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
                         throw new Exception("鏈煡璇㈠埌璇ヤ换鍔�);
                     }
                     if (transportTask.S_B_STATE == "鍙栨秷" || transportTask.S_B_STATE == "瀹屾垚")
                     {
+                        LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
                         return new ReturnResult();
                     }
                     if ((model.State == 3 && model.ForkliftNo != "0") || (string.IsNullOrEmpty(transportTask.S_EQ_NO) && model.ForkliftNo != "0"))
@@ -84,6 +91,7 @@
 
                                 newDb.RollbackTran();
                             }
+                            LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
                             return new ReturnResult();
                         }
 
@@ -109,10 +117,11 @@
 
                                 newDb.RollbackTran();
                             }
+                            LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
                             return new ReturnResult();
                         }
                         var ta = BLLCreator.Create<StateTaskBLL>().ExecuteState(model.No, SataeLis, logPara, transportTask);
-                        LogHelper.TaskDetail(logPara, "瀹屽伐鍥炴姤杩斿洖锛� + JsonConvert.SerializeObject(ta));
+                        LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤杩斿洖锛氫换鍔″彿涓�{model.No}" + JsonConvert.SerializeObject(ta));
                         TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData, transportTask);
                         if (transportTask.S_NOTE.Equals("agv浠诲姟") && model.State == 7 && ta.Success)
                         {
@@ -136,14 +145,17 @@
                     {
                         TaskProcess.OperateReq(model.No, model.State, model.ForkliftNo, model.ExtData, transportTask);
                     }
+                    LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
                     return new ReturnResult();
                 }
                 catch (Exception ex)
                 {
                     LogHelper.TaskDetail(logPara, "瀹屽伐鍥炴姤鎶ラ敊锛� + JsonConvert.SerializeObject(ex));
+                    LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
                     return new ReturnResult();
                 }
             });
+            LogHelper.TaskDetail(logPara, $"瀹屽伐鍥炴姤 浠诲姟鍙穥model.No} 杩斿洖缁橝GV淇℃伅{JsonConvert.SerializeObject(new ReturnResult())}");
             return new ReturnResult();
         }
 

--
Gitblit v1.9.1