From 1c703617885275090d69c697e82e61f4940c0bdc Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 28 五月 2024 14:20:29 +0800
Subject: [PATCH] 380新产品,优化

---
 jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
index d2a7344..1db0ce5 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java
@@ -99,6 +99,16 @@
                         logger.info("-------鐩戝惉鍒�,{}鐨勬壂鐮佹灙鎵爜鐨凜ODE_CHECK鐨勪俊鍙�",identifier);
                         scannerGunMessage();
                     }
+                    if (identifier.equals(OPCElement.OP060_HX_CODE_CHECK) && "1".equals(value.toString())){
+                        Object SNCodeObject = miloService.readFromOpcUa("CFL4HX.OP060.Code1").getValue();
+                        if (null == SNCodeObject){
+                            SNCodeObject = miloService.readFromOpcUa("CFL4HX.OP060.Code").getValue();
+                        }
+                        if (null != SNCodeObject){
+                            String SNCode = SNCodeObject.toString();
+                            passingStationCollectionServiceImpl.sendMessage("P0SQ0-01FZ01-1000;T231224116;DBBBBA*P0SQ0-041000-1002;T2312020675;DAABBA;S500003","OP060");
+                        }
+                    }
                 }
                 if (collect2.contains(identifier)){
                     if ("1".equals(value.toString())){
@@ -125,7 +135,7 @@
         }
         if (null != SNCodeObject){
             String SNCode = SNCodeObject.toString();
-            passingStationCollectionServiceImpl.sendMessage(SNCode);
+            passingStationCollectionServiceImpl.sendMessage(SNCode,"OP120");
         }
     }
 
@@ -136,7 +146,7 @@
             Object SNCodeObject = miloService.readFromOpcUa(parts[0] + "." + parts[1] + ".Code").getValue();
             if(null != SNCodeObject) {
                 String SNCode=SNCodeObject.toString();
-//                String a=passingStationCollectionServiceImpl.SelectSN(SNCode,parts[1]);
+//              String a=passingStationCollectionServiceImpl.SelectSN(SNCode,parts[1]);
                 String a;
                 BsOrderScheduling bsOrderSchedulingQuery = new BsOrderScheduling();
                 bsOrderSchedulingQuery.setEngineNo(SNCode);

--
Gitblit v1.9.3