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/BOP010Callback.java |   52 +++++-----------------------------------------------
 1 files changed, 5 insertions(+), 47 deletions(-)

diff --git a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/BOP010Callback.java b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/BOP010Callback.java
index 3fc3b80..6cd0a4a 100644
--- a/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/BOP010Callback.java
+++ b/guns-vip-main/src/main/java/cn/stylefeng/guns/plcserver/callback/BOP010Callback.java
@@ -46,7 +46,7 @@
 import java.util.Random;
 
 @Component
-public class BOP010Callback implements SubscriptionCallback {
+public class BOP010Callback {
 
     public MiloService miloService;
 
@@ -129,49 +129,7 @@
         this.productionOrderRecordsService = productionOrderRecordsService;
         this.productionOrderBatchInfoService = productionOrderBatchInfoService;
     }
-    @Override
-    public void onSubscribe(String identifier, Object value) {
-        String ecpStr = "";//寮傚父璁板綍鏍囪
-        try {
-            //蹇冭烦
-            if(null != value && identifier.equals(OPCElement.COP010_F_HEART_BEAT)){
-                if( "false".equals(value.toString()))
-                {
-                    ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP010_F_HEART_BEAT,true);
-                    miloService.writeToOpcUa(entity);
-                }
-            }
-            //PLC杩涚珯
-            else if(null != value && identifier.equals(OPCElement.BOP010_J_PLC_START)){
-                if("true".equals(value.toString())){
-                    String isRepair = miloService.
-                            readFromOpcUa(OPCElement.BOP010_P_REPAIR)
-                            .getValue().toString();//鏄惁杩斾慨
-                    if(isRepair.equals("true")){
-                        handleRepair();
-                    }else{
-                        handleOrder();
-                    }
-                }
-            }
-            //PLC鍑虹珯
-            else if(null != value && identifier.equals(OPCElement.BOP010_J_PLC_FINISH)){
-                if("true".equals(value.toString())){
-                    handleFinsh();
-                    handleInfo();
-                    handleMaterial();
-                }
-            }else{
-                System.out.println("BOP010鍊兼病鏈夊彉");
-            }
-        } catch (Exception e) {
-            ecpStr ="鍑虹幇寮傚父锛�" + logUtil.getTrace(e);
-        }finally {
-            if(!"".equals(ecpStr)){
-                logger.info(ecpStr+"\r\n");
-            }
-        }
-    }
+
 
     public void handleOrder() throws Exception{
 
@@ -211,7 +169,8 @@
         String S_PRODUCT_STATE_CODE = miloService.
                 readFromOpcUa(OPCElement.BOP010_S_PRODUCT_STATE_CODE)
                 .getValue().toString();
-
+        ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP010_J_PC_FINISH,true);
+        miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
         //澶勭悊杩囩珯淇℃伅
         PassingStationCollectionParam param = new PassingStationCollectionParam();
         param.setWorkOrderNo(S_ORDER_CODE);
@@ -224,8 +183,7 @@
         param.setOutRsSign(S_PRODUCT_STATE_CODE);//鍑虹珯鏄惁鍚堟牸
         passingStationCollectionService.add(param);
 
-        ReadWriteEntity entity = new ReadWriteEntity(OPCElement.BOP010_J_PC_FINISH,true);
-        miloService.writeToOpcUa(entity);//鍐橮C瀹屾垚
+
         logger.info("handleFinsh PC澶勭悊瀹屾垚锛�");
     }
 

--
Gitblit v1.9.3