From cc1138597988a5c662235cbd4a2a348a5f6ec2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BE=AE=E7=AC=91=E7=9D=80=E9=9D=A2=E5=AF=B9=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9?= <752558143@qq.com>
Date: Mon, 20 May 2024 10:46:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E4=B8=BB=E6=95=B0=E6=8D=AEbu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy   | 6 +++---
 .../i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java      | 4 ++--
 .../estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java  | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy b/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy
index 8144391..a769785 100644
--- a/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy
+++ b/modules/i3plus-ext-mes-apiservice/src/groovy/mesWorkOrderToSap.groovy
@@ -25,11 +25,11 @@ class mesWorkOrderToSap {
     @Autowired
     private MesWorkOrderToSapRepository mesWorkOrderToSapRDao;
 
-    //@Resource(name = "yfasDataSource")
+    @Resource(name = "yfasDataSource")
     private DynamicDataSourceProxy yfasDataSource;
 
-    //@Resource(name = "mesDataSource")
-    //private DynamicDataSourceProxy mesDataSource;
+    @Resource(name = "mesDataSource")
+    private DynamicDataSourceProxy mesDataSource;
 
     @Getter
     @Setter
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java
index c00ec95..a2d28fe 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/MesSAPDbAdapter.java
@@ -41,10 +41,10 @@ public class MesSAPDbAdapter {
 
     public static final Logger LOGGER = LoggerFactory.getLogger(WmsSAPDbWriter.class);
 
-    //@Resource(name = "yfasDataSource")
+    @Resource(name = "yfasDataSource")
     private DynamicDataSourceProxy sapDataSourceProxy;
  
-    //@Resource(name = "mesDataSource")
+    @Resource(name = "mesDataSource")
     private DynamicDataSourceProxy mesDataSourceProxy;
 
     @Value("${sync.redis.time:1800}")
diff --git a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java
index f0baca2..247bed3 100644
--- a/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java
+++ b/modules/i3plus-ext-mes-apiservice/src/main/java/cn/estsh/i3plus/ext/mes/apiservice/dbinterface/WmsSAPDbQuery.java
@@ -26,10 +26,10 @@ import java.sql.Connection;
 public class WmsSAPDbQuery {
     public static final Logger LOGGER = LoggerFactory.getLogger(WmsSAPDbQuery.class);
     public static boolean needI18N = true;
-//    @Resource(name = "wmsDataSource")
-//    private DynamicDataSourceProxy wmsDataSourceProxy;
+    @Resource(name = "wmsDataSource")
+    private DynamicDataSourceProxy wmsDataSourceProxy;
 
-    //@Resource(name = "mesDataSource")
+    @Resource(name = "mesDataSource")
     private DynamicDataSourceProxy mesDataSourceProxy;
 
     @Autowired