From 9169a8b4c581ba9270f1f185e9dacc71e75dcb08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83?= <15095123350@163.com>
Date: Fri, 9 Aug 2024 09:10:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Khd.Core.Wcs/Wcs/FirstFloor.cs     | 8 +++++++-
 src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs   | 9 ++++++++-
 src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs | 9 ++++++++-
 src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs  | 9 ++++++++-
 4 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
index 2b88967..cf96b8f 100644
--- a/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
+++ b/src/Khd.Core.Wcs/Wcs/FirstFloor.cs
@@ -750,7 +750,13 @@ namespace Khd.Core.Wcs.Wcs
                 }
                 catch (Exception ex)
                 {
-                    transaction.Rollback();
+                    try
+                    {
+                        transaction.Rollback();
+                    }
+                    catch
+                    {
+                    }
                     if (ex is PlcException)
                     {
 
diff --git a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
index b2fe13d..871db79 100644
--- a/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
+++ b/src/Khd.Core.Wcs/Wcs/FiveFloorAGV.cs
@@ -468,7 +468,14 @@ namespace Khd.Core.Wcs.Wcs
                                     }
                                     catch (Exception ex)
                                     {
-                                        dbContextTransaction.Rollback();
+                                        try
+                                        {
+                                            dbContextTransaction.Rollback();
+                                        }
+                                        catch
+                                        {
+
+                                        }
                                         _logger.Error(ex.Message + "\n" + ex.StackTrace);
                                     }
                                 }
diff --git a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs
index 2197309..e7e6a92 100644
--- a/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs
+++ b/src/Khd.Core.Wcs/Wcs/SecondFloorAGV.cs
@@ -769,7 +769,14 @@ namespace Khd.Core.Wcs.Wcs
                                     }
                                     catch (Exception ex)
                                     {
-                                        transaction.Rollback();
+                                        try
+                                        {
+                                            transaction.Rollback();
+                                        }
+                                        catch
+                                        {
+
+                                        }
                                         _logger.Error(ex.Message + "\n" + ex.StackTrace);
                                     }
                                 }
diff --git a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
index 34e564b..7bee580 100644
--- a/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
+++ b/src/Khd.Core.Wcs/Wcs/ThirdFloorAGV.cs
@@ -604,7 +604,14 @@ namespace Khd.Core.Wcs.Wcs
                                         }
                                         catch (Exception ex)
                                         {
-                                            transaction.Rollback();
+                                            try
+                                            {
+                                                transaction.Rollback();
+                                            }
+                                            catch
+                                            {
+
+                                            }
                                             _logger.Error(ex.Message + "\n" + ex.StackTrace);
                                         }
                                     }