From e70fb4b691d0411cb6de676256160255a153cada Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期四, 18 四月 2024 09:45:19 +0800
Subject: [PATCH] -

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java |   25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 5a6836c..d6985a7 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -4,6 +4,7 @@
 import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
 import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
 import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
 import com.jcdm.main.plcserver.conf.OPCElement;
 import com.jcdm.main.plcserver.sub.OPCUaSubscription;
 import com.kangaroohy.milo.service.MiloService;
@@ -33,6 +34,9 @@
     @Autowired
     private IDaCollectionParamConfService daCollectionParamConfService;
 
+    @Autowired
+    private IOmProductionOrdeInfoService omProductionOrdeInfoService;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
@@ -40,7 +44,8 @@
                 miloService,
                 daPassingStationCollectionService,
                 collectionParamConfService,
-                daParamCollectionService);
+                daParamCollectionService,
+                omProductionOrdeInfoService);
 
         List<String> lists = getSubList();
         miloService.subscriptionFromOpcUa(lists,opcUaSubscription);
@@ -52,18 +57,20 @@
      */
     public List<String> getSubList(){
         List<String> lists = new ArrayList<>();
-//        lists.add(OPCElement.PACK_OP010_RecordSN);//璇锋眰涓嬪彂SN鍙�
         lists.add(OPCElement.PACK_OP230_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁.
-//        lists.add(OPCElement.PACK_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP250_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP250_AngleResult);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP240_RecordData);//璇锋眰璁板綍鏁版嵁.
+        lists.add(OPCElement.PACK_OP240_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP250_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP250_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP380_RecordData);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP380_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP300_RecordData);//璇锋眰璁板綍鏁版嵁
-//        lists.add(OPCElement.PACK_OP300_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP300_AngleResult);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP270_RecordData);//璇锋眰璁板綍鏁版嵁
         lists.add(OPCElement.PACK_OP270_AngleResult);//璇锋眰璁板綍鏁版嵁
+        lists.add(OPCElement.PACK_OP340_RecordData);//璇锋眰璁板綍鏁版嵁
+//        lists.add(OPCElement.PACK_OP350_RecordData);//璇锋眰璁板綍鏁版嵁
+//        lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
 //        lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
 
         return lists;

--
Gitblit v1.9.3