From 6dadf36ef118fbb3b2cd5aca94cde88e29fb55dc Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 23 一月 2024 11:22:04 +0800
Subject: [PATCH] 修改数据采集
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP010Callback.java | 42 ++++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP010Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP010Callback.java
index 5ad2729..dab781b 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP010Callback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP010Callback.java
@@ -252,9 +252,9 @@
List<ReadWriteEntity> lists = new ArrayList<>();
lists.add(new ReadWriteEntity(OPCElement.OP010_S_ORDER_CODE,S_ORDER_CODE));
- lists.add(new ReadWriteEntity(OPCElement.OP010_S_PRODUCT_CODE,S_PRODUCT_TYPE));
+ lists.add(new ReadWriteEntity(OPCElement.OP010_S_PRODUCT_CODE,Short.parseShort(S_PRODUCT_TYPE)));
lists.add(new ReadWriteEntity(OPCElement.OP010_S_SFC_CODE,S_SFC_CODE));
- lists.add(new ReadWriteEntity(OPCElement.OP010_S_NUMBER,result.getPlanQty().toString()));
+ lists.add(new ReadWriteEntity(OPCElement.OP010_S_NUMBER,Short.parseShort(result.getPlanQty().toString())));
lists.add(new ReadWriteEntity(OPCElement.OP010_J_PC_WRITE_ORDER,true));
miloService.writeToOpcUa(lists);
logger.info("OP010宸ヤ綅,handleOrder PC澶勭悊瀹屾垚锛乛--------------------------------------------");
@@ -359,7 +359,7 @@
List<ReadWriteEntity> lists = new ArrayList<>();
lists.add(new ReadWriteEntity(OPCElement.OP010_S_ORDER_CODE,S_ORDER_CODE));
- lists.add(new ReadWriteEntity(OPCElement.OP010_S_PRODUCT_CODE,S_PRODUCT_TYPE));
+ lists.add(new ReadWriteEntity(OPCElement.OP010_S_PRODUCT_CODE,Short.parseShort(S_PRODUCT_TYPE)));
lists.add(new ReadWriteEntity(OPCElement.OP010_S_SFC_CODE,S_SFC_CODE));
lists.add(new ReadWriteEntity(OPCElement.OP010_P_REPAIR_LOCATION,repairLocationNo));
lists.add(new ReadWriteEntity(OPCElement.OP010_J_PC_WRITE_ORDER,true));
@@ -393,24 +393,26 @@
if(null != list && !list.isEmpty()) {
for (int i = 0; i < list.size(); i++) {
CollectionParamConfResult result = (CollectionParamConfResult) list.get(i);
- String value = miloService.
+ Object value = miloService.
readFromOpcUa(result.getGatherAddress())
- .getValue().toString();//璇诲弬鏁板��
- ParamCollectionParam paramCollectionParam = new ParamCollectionParam();
- paramCollectionParam.setParamCode(result.getParamCode());
- paramCollectionParam.setParamName(result.getParamName());
- paramCollectionParam.setWorkOrderNo(S_ORDER_CODE);
- paramCollectionParam.setSfcCode(S_SFC_CODE);
- paramCollectionParam.setProductCode(S_PRODUCT_CODE);
- paramCollectionParam.setProductionLine(result.getProductionLine());
- paramCollectionParam.setLocationCode(result.getLocationCode());
- paramCollectionParam.setParamValue(value);
- paramCollectionParam.setParamLower(result.getParamLower());
- paramCollectionParam.setParamUpper(result.getParamUpper());
- paramCollectionParam.setParamStandard(result.getParamCentral());
- paramCollectionParam.setCollectionTime(DateTool.getLocalTimeForDate());
- paramCollectionParam.setUnit(result.getUnit());
- paramCollectionService.add(paramCollectionParam);
+ .getValue();//璇诲弬鏁板��
+ if(null != value) {
+ ParamCollectionParam paramCollectionParam = new ParamCollectionParam();
+ paramCollectionParam.setParamCode(result.getParamCode());
+ paramCollectionParam.setParamName(result.getParamName());
+ paramCollectionParam.setWorkOrderNo(S_ORDER_CODE);
+ paramCollectionParam.setSfcCode(S_SFC_CODE);
+ paramCollectionParam.setProductCode(S_PRODUCT_CODE);
+ paramCollectionParam.setProductionLine(result.getProductionLine());
+ paramCollectionParam.setLocationCode(result.getLocationCode());
+ paramCollectionParam.setParamValue(value.toString());
+ paramCollectionParam.setParamLower(result.getParamLower());
+ paramCollectionParam.setParamUpper(result.getParamUpper());
+ paramCollectionParam.setParamStandard(result.getParamCentral());
+ paramCollectionParam.setCollectionTime(DateTool.getLocalTimeForDate());
+ paramCollectionParam.setUnit(result.getUnit());
+ paramCollectionService.add(paramCollectionParam);
+ }
}
}
--
Gitblit v1.9.3