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