From ba1a7a9ef126296e2798e313dc5b43f775a1123c Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期四, 23 五月 2024 17:44:36 +0800
Subject: [PATCH] 修改数据采集
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/COP010Callback.java | 41 +++--------------------------------------
1 files changed, 3 insertions(+), 38 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/COP010Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/COP010Callback.java
index 1127578..eb743a3 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/COP010Callback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/COP010Callback.java
@@ -34,7 +34,6 @@
import cn.stylefeng.guns.modular.sc.serialNumbersConf.service.SerialNumbersConfService;
import cn.stylefeng.guns.plcserver.opc.GlobalVariable;
import cn.stylefeng.guns.plcserver.opc.OPCElement;
-import cn.stylefeng.guns.plcserver.opc.unit.OPCUnit;
import cn.stylefeng.guns.plcserver.opc.unit.SFCCodeTool;
import cn.stylefeng.guns.plcserver.tool.DateTool;
import cn.stylefeng.guns.plcserver.tool.LogUtil;
@@ -190,7 +189,9 @@
}
public void handleMaterial() {
-
+ if(S_ORDER_CODE.isEmpty()){
+ return;
+ }
//鏌ヨ鎵规涓婃枡淇℃伅
ProductionOrderBatchInfoParam productionOrderBatchInfoParam = new ProductionOrderBatchInfoParam();
productionOrderBatchInfoParam.setWorkOrderNo(S_ORDER_CODE);
@@ -221,43 +222,7 @@
}
}
- //PC璇诲弬鏁颁俊鎭�
- public void handleInfo() throws Exception {
- logger.info("handleInfo START锛�");
- if(null == list){
- CollectionParamConfParam collectionParamConfParam = new CollectionParamConfParam();
- collectionParamConfParam.setLocationCode(LOCATION_CODE);
- list = collectionParamConfService.findListBySpec(collectionParamConfParam);
- }
- if(null != list && !list.isEmpty()) {
- for (int i = 0; i < list.size(); i++) {
- CollectionParamConfResult result = (CollectionParamConfResult) list.get(i);
- Object value = miloService.
- readFromOpcUa(result.getGatherAddress())
- .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);
- }
- }
- }
-
- logger.info("handleInfo END锛�");
- }
public void handleRepair() throws Exception{
RepairManageInfoParam repairManageInfoParam = new RepairManageInfoParam();
repairManageInfoParam.setLocationCode(LOCATION_CODE);
--
Gitblit v1.9.3