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/OP030Callback.java | 47 +++++++----------------------------------------
1 files changed, 7 insertions(+), 40 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP030Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP030Callback.java
index 05081c1..cf84695 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP030Callback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP030Callback.java
@@ -162,7 +162,7 @@
.getValue().toString();
ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP030_J_PC_FINISH,true);
miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
- /* if("2".equals(S_PRODUCT_STATE_CODE)){
+ if("2".equals(S_PRODUCT_STATE_CODE)){
ProductionOrderRecordsParam productionOrderRecordsParam = new ProductionOrderRecordsParam();
productionOrderRecordsParam.setWorkOrderNo(S_ORDER_CODE);
productionOrderRecordsParam.setProductNo(S_SFC_CODE);
@@ -170,10 +170,11 @@
if(!list.isEmpty()){
ProductionOrderRecordsResult productionOrderRecordsResult = list.get(0);
productionOrderRecordsParam.setId(productionOrderRecordsResult.getId());
- productionOrderRecordsParam.setWhetherPass(S_PRODUCT_STATE_CODE);
+ productionOrderRecordsParam.setWhetherPass("涓嶅悎鏍�");
+ productionOrderRecordsParam.setEndTime(DateTool.getLocalTimeForDate());
productionOrderRecordsService.update(productionOrderRecordsParam);
}
- }*/
+ }
//澶勭悊杩囩珯淇℃伅
PassingStationCollectionParam param = new PassingStationCollectionParam();
param.setWorkOrderNo(S_ORDER_CODE);
@@ -191,7 +192,9 @@
}
public void handleMaterial() {
-
+ if(S_ORDER_CODE.isEmpty()){
+ return;
+ }
//鏌ヨ鎵规涓婃枡淇℃伅
ProductionOrderBatchInfoParam productionOrderBatchInfoParam = new ProductionOrderBatchInfoParam();
productionOrderBatchInfoParam.setWorkOrderNo(S_ORDER_CODE);
@@ -222,42 +225,6 @@
}
}
- //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锛�");
- }
}
--
Gitblit v1.9.3