From c64c9f6fb38f65be99b827c1af8d3c3852f68ba4 Mon Sep 17 00:00:00 2001
From: cheng <418351270@qq.com>
Date: 星期二, 12 十二月 2023 17:18:19 +0800
Subject: [PATCH] 添加油脂

---
 guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java
index 1cda02e..c3d48a6 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java
@@ -8,6 +8,7 @@
 import cn.stylefeng.guns.modular.dq.materialTraceability.service.MaterialTraceabilityService;
 import cn.stylefeng.guns.modular.em.equipmentAlarm.service.EquipmentAlarmService;
 import cn.stylefeng.guns.modular.em.equipmentStatus.service.EquipmentStatusService;
+import cn.stylefeng.guns.modular.gm.greaseManage.service.GreaseManageService;
 import cn.stylefeng.guns.modular.om.productionOrdeInfo.service.ProductionOrdeInfoService;
 import cn.stylefeng.guns.modular.sc.repairManageInfo.service.RepairManageInfoService;
 import cn.stylefeng.guns.modular.sc.serialNumbersConf.service.SerialNumbersConfService;
@@ -103,6 +104,8 @@
 
     @Autowired
     public LocationInfoService locationInfoService;
+    @Autowired
+    public GreaseManageService greaseManageService;
 
     //OP010
     private Item OP010_F_HEART_BEAT;//蹇冭烦
@@ -181,7 +184,7 @@
 
     private Item OP050_S_PRODUCT_STATE_CODE;//浜у搧鐘舵�佺紪鐮�
 
-
+    private Item OP050_OIL_STATE;//娌硅剛鐘舵��
     //OP070
     private Item OP070_F_HEART_BEAT;//蹇冭烦
     private Item OP070_J_PLC_START;//PLC寮�濮�
@@ -461,6 +464,7 @@
 
     private Item BOP030_S_PRODUCT_STATE_CODE;//浜у搧鐘舵�佺紪鐮�
 
+    private Item BOP030_OIL_STATE;//娌硅剛鐘舵��
     //BOP030B
     private Item BOP030B_F_HEART_BEAT;//蹇冭烦
     private Item BOP030B_J_PLC_START;//PLC寮�濮�
@@ -698,6 +702,7 @@
 
     private Item DOP020_S_PRODUCT_STATE_CODE;//浜у搧鐘舵�佺紪鐮�
 
+    private Item DOP020_OIL_STATE;//娌硅剛鐘舵��
 
     /**
      * 鍗曚緥妯″紡
@@ -721,7 +726,8 @@
                      MaterialTraceabilityService materialTraceabilityService,
                      EquipmentInfoService equipmentInfoService,
                      RepairManageInfoService repairManageInfoService,
-                     LocationInfoService locationInfoService
+                     LocationInfoService locationInfoService,
+                     GreaseManageService greaseManageService
                     ) throws Exception {
         this.productionOrdeInfoService = productionOrdeInfoService;
         this.passingStationCollectionService = passingStationCollectionService;
@@ -734,6 +740,7 @@
         this.equipmentInfoService = equipmentInfoService;
         this.repairManageInfoService = repairManageInfoService;
         this.locationInfoService = locationInfoService;
+        this.greaseManageService = greaseManageService;
 
         // 鍔犺浇閰嶇疆鏂囦欢
         final ConnectionInformation ci = getCLSIDConnectionInfomation();
@@ -961,7 +968,7 @@
 
             OP050_S_PRODUCT_STATE_CODE = OP050_GROUP.addItem((OPCElement.OP050_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�
 
-
+            OP050_OIL_STATE = OP050_GROUP.addItem((OPCElement.OP050_OIL_STATE));//娌硅剛鐘舵��
 
             //OP070缁�
             final Group OP070_GROUP = server.addGroup("OP070");
@@ -1243,6 +1250,10 @@
 
             BOP030_S_PRODUCT_STATE_CODE = BOP030_GROUP.addItem((OPCElement.BOP030_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�
 
+            BOP030_OIL_STATE = BOP030_GROUP.addItem((OPCElement.BOP030_OIL_STATE));//娌硅剛鐘舵��
+
+
+
             //BOP030B缁�
             final Group BOP030B_GROUP = server.addGroup("BOP030B");
             BOP030B_F_HEART_BEAT = BOP030B_GROUP.addItem((OPCElement.BOP030B_F_HEART_BEAT));//蹇冭烦
@@ -1477,6 +1488,10 @@
             DOP020_S_SFC_CODE = DOP020_GROUP.addItem((OPCElement.DOP020_S_SFC_CODE));//鎬绘垚缂栫爜
 
             DOP020_S_PRODUCT_STATE_CODE = DOP020_GROUP.addItem((OPCElement.DOP020_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�
+
+            DOP020_OIL_STATE = DOP020_GROUP.addItem((OPCElement.DOP020_OIL_STATE));//娌硅剛鐘舵��
+
+
             // start reading
             access.bind();
         } catch (final JIException e) {
@@ -3175,4 +3190,20 @@
     public Item getDOP010_P_REPAIR_LOCATION() {
         return DOP010_P_REPAIR_LOCATION;
     }
+
+    public GreaseManageService getGreaseManageService() {
+        return greaseManageService;
+    }
+
+    public Item getOP050_OIL_STATE() {
+        return OP050_OIL_STATE;
+    }
+
+    public Item getBOP030_OIL_STATE() {
+        return BOP030_OIL_STATE;
+    }
+
+    public Item getDOP020_OIL_STATE() {
+        return DOP020_OIL_STATE;
+    }
 }

--
Gitblit v1.9.3