From 73bc0656dc15cd9cc95c6f4f51949ef0437088ce Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期五, 23 二月 2024 09:28:13 +0800
Subject: [PATCH] 修改数据采集
---
guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP090Callback.java | 58 +++++++++++++---------------------------------------------
1 files changed, 13 insertions(+), 45 deletions(-)
diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP090Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP090Callback.java
index 0341084..4ceb10b 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP090Callback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/OP090Callback.java
@@ -43,7 +43,7 @@
import java.util.List;
@Component
-public class OP090Callback implements SubscriptionCallback {
+public class OP090Callback{
public MiloService miloService;
@@ -127,43 +127,6 @@
this.productionOrderBatchInfoService = productionOrderBatchInfoService;
}
- @Override
- public void onSubscribe(String identifier, Object value) {
- String ecpStr = "";//寮傚父璁板綍鏍囪
- try {
- //蹇冭烦
- if(null != value && identifier.equals(OPCElement.OP090_F_HEART_BEAT)){
- if( "false".equals(value.toString()))
- {
- ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP090_F_HEART_BEAT,true);
- miloService.writeToOpcUa(entity);
- }
- }
- //PLC杩涚珯
- else if(null != value && identifier.equals(OPCElement.OP090_J_PLC_START)){
- if("true".equals(value.toString())){
- handleOrder();
- }
- }
- //PLC鍑虹珯
- else if(null != value && identifier.equals(OPCElement.OP090_J_PLC_FINISH)){
- if("true".equals(value.toString())){
- handleMaterial();
- handleFinsh();
- handleInfo();
-
- }
- }else{
- System.out.println("鍊兼病鏈夊彉");
- }
- } catch (Exception e) {
- ecpStr ="鍑虹幇寮傚父锛�" + logUtil.getTrace(e);
- }finally {
- if(!"".equals(ecpStr)){
- logger.info(ecpStr+"\r\n");
- }
- }
- }
//PC璇诲伐鍗�
public void handleOrder() throws Exception {
@@ -207,6 +170,14 @@
S_PRODUCT_STATE_CODE = object.toString();
}
+
+ Object eopSfcCode = miloService.
+ readFromOpcUa(OPCElement.OP090_S_SFC_CODE_EOP)
+ .getValue();
+
+ ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP090_J_PC_FINISH,true);
+ miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
+
PassingStationCollectionParam param = new PassingStationCollectionParam();
param.setWorkOrderNo(S_ORDER_CODE);
param.setProductCode(S_PRODUCT_CODE);
@@ -218,9 +189,7 @@
param.setOutRsSign(S_PRODUCT_STATE_CODE);//鍑虹珯鏄惁鍚堟牸
passingStationCollectionService.add(param);
- Object eopSfcCode = miloService.
- readFromOpcUa(OPCElement.OP090_S_SFC_CODE_EOP)
- .getValue();
+
if(null != eopSfcCode) {
//鏍规嵁鍒嗘�绘垚缂栫爜锛屽皢EOP鐗╂枡鏁版嵁缁戝畾鍏崇郴淇敼涓烘�绘垚缂栫爜
@@ -235,7 +204,7 @@
logger.info("S_SFC_CODE:" + S_SFC_CODE);
logger.info("eopSfcCode:" + eopSfcCode);
}
- //鏌ヨCOP鍜孊OP鏄惁鍚堟牸
+ /* //鏌ヨCOP鍜孊OP鏄惁鍚堟牸
PassingStationCollectionParam passingStationCollectionParam = new PassingStationCollectionParam();
passingStationCollectionParam.setSfcCode(S_SFC_CODE);
List<PassingStationCollectionResult> passingStationCollectionResultList =
@@ -262,10 +231,9 @@
productionOrderRecordsParam.setWhetherPass("2");
productionOrderRecordsService.update(productionOrderRecordsParam);
}
- }
+ }*/
- ReadWriteEntity entity = new ReadWriteEntity(OPCElement.OP090_J_PC_FINISH,true);
- miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
+
logger.info("handleFinsh PC澶勭悊瀹屾垚锛�");
}
public void handleMaterial() {
--
Gitblit v1.9.3