From 7f291910791bdb9a545dc12ef36c3c359cfa4e59 Mon Sep 17 00:00:00 2001
From: admin <418351270@qq.com>
Date: 星期三, 10 一月 2024 15:03:23 +0800
Subject: [PATCH] 添加查询
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/opc/OPCComm.java | 47 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 40 insertions(+), 7 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..2a2f230 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();
@@ -803,7 +810,9 @@
access.addItem(OPCElement.OP140_F_HEART_BEAT, new DataCallBack_OP140_F_HEART_BEAT());//蹇冭烦
//OP150鍥炶皟
+/*
access.addItem(OPCElement.OP150_F_HEART_BEAT, new DataCallBack_OP150_F_HEART_BEAT());//蹇冭烦
+*/
//OP160鍥炶皟
access.addItem(OPCElement.OP160_F_HEART_BEAT, new DataCallBack_OP160_F_HEART_BEAT());//蹇冭烦
@@ -843,7 +852,7 @@
access.addItem(OPCElement.DOP010_F_HEART_BEAT, new DataCallBack_DOP010_F_HEART_BEAT());//蹇冭烦
//DOP020鍥炶皟
- access.addItem(OPCElement.DOP020_F_HEART_BEAT, new DataCallBack_DOP020_F_HEART_BEAT());//蹇冭烦
+ /* access.addItem(OPCElement.DOP020_F_HEART_BEAT, new DataCallBack_DOP020_F_HEART_BEAT());//蹇冭烦*/
//EOP010鍥炶皟
access.addItem(OPCElement.EOP010_F_HEART_BEAT, new DataCallBack_EOP010_F_HEART_BEAT());//蹇冭烦
@@ -961,7 +970,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");
@@ -1109,7 +1118,7 @@
OP140_S_PRODUCT_STATE_CODE = OP140_GROUP.addItem((OPCElement.OP140_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�
//OP150缁�
- final Group OP150_GROUP = server.addGroup("OP150");
+ /* final Group OP150_GROUP = server.addGroup("OP150");
OP150_F_HEART_BEAT = OP150_GROUP.addItem((OPCElement.OP150_F_HEART_BEAT));//蹇冭烦
OP150_J_PLC_START = OP150_GROUP.addItem((OPCElement.OP150_J_PLC_START));//PLC寮�濮�
OP150_J_PC_WRITE_ORDER = OP150_GROUP.addItem((OPCElement.OP150_J_PC_WRITE_ORDER));//PC涓嬪彂宸ュ崟
@@ -1120,7 +1129,7 @@
OP150_S_PRODUCT_CODE = OP150_GROUP.addItem((OPCElement.OP150_S_PRODUCT_CODE));//浜у搧缂栧彿
OP150_S_SFC_CODE = OP150_GROUP.addItem((OPCElement.OP150_S_SFC_CODE));//鎬绘垚缂栫爜
- OP150_S_PRODUCT_STATE_CODE = OP150_GROUP.addItem((OPCElement.OP150_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�
+ OP150_S_PRODUCT_STATE_CODE = OP150_GROUP.addItem((OPCElement.OP150_S_PRODUCT_STATE_CODE));//浜у搧鐘舵�佺紪鐮�*/
//OP160缁�
final Group OP160_GROUP = server.addGroup("OP160");
@@ -1242,6 +1251,10 @@
BOP030_S_SFC_CODE = BOP030_GROUP.addItem((OPCElement.BOP030_S_SFC_CODE));//鎬绘垚缂栫爜
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");
@@ -1465,7 +1478,7 @@
DOP010_P_REPAIR_LOCATION = DOP010_GROUP.addItem((OPCElement.DOP010_P_REPAIR_LOCATION));//杩斾慨宸ヤ綅
//DOP020缁�
- final Group DOP020_GROUP = server.addGroup("DOP020");
+ /*final Group DOP020_GROUP = server.addGroup("DOP020");
DOP020_F_HEART_BEAT = DOP020_GROUP.addItem((OPCElement.DOP020_F_HEART_BEAT));//蹇冭烦
DOP020_J_PLC_START = DOP020_GROUP.addItem((OPCElement.DOP020_J_PLC_START));//PLC寮�濮�
DOP020_J_PC_WRITE_ORDER = DOP020_GROUP.addItem((OPCElement.DOP020_J_PC_WRITE_ORDER));//PC涓嬪彂宸ュ崟
@@ -1477,6 +1490,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 +3192,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