From 7a08677172276853ea984a26b76bae0e88ab00ed Mon Sep 17 00:00:00 2001 From: admin <15939171744@163.com> Date: 星期六, 27 四月 2024 09:18:33 +0800 Subject: [PATCH] - --- jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 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 dc802b1..a261df7 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 @@ -37,14 +37,16 @@ //鏂拌嚜鍔ㄥ伐绔� public List<String> automaticList = Arrays.asList("OP280", "OP320A","OP320B", "OP340A","OP340B", "OP350A","OP350B", "OP360","OP365","OP370", "OP390", "OP470"); - //鑷姩宸ヤ綅 -// public List<String> automaticList = Arrays.asList("OP300","OP280", "OP320A","OP320B", "OP340", "OP350", "OP360","OP370", "OP390", "OP470", "OP530", "OP540"); + //閲囬泦妯$粍宸ヤ綅 ModuleCode + public List<String> moduleCodeList = Arrays.asList("OP320A","OP320B","OP340A","OP340B","OP365", "OP350A", "OP350B", "OP330"); - //閲囬泦妯$粍宸ヤ綅 - public List<String> moduleCodeList = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330"); + //鍖哄垎妯$粍鍨嬪彿宸ヤ綅 + public List<String> distinguishingModules = Arrays.asList("OP300","OP310", "OP340", "OP350", "OP330"); + //鍖哄垎pack鍨嬪彿鐨勫伐浣� - public List<String> packIdList = Arrays.asList("OP280"); + public List<String> packIdList = Arrays.asList("OP280","OP360","OP390","OP470"); + //绌虹殑 public List<String> nullList = Arrays.asList("OP250","OP260"); @@ -112,7 +114,7 @@ //鑷姩宸ヤ綅 if(automaticList.stream().anyMatch(s -> s.equals(device))){ //plc缁欐垜浠竴涓ā缁勭爜锛屾嬁妯$粍鐮佹牎楠屽嚭鍨嬪彿 - if(moduleCodeList.stream().anyMatch(s -> s.equals(device))) { + if(distinguishingModules.stream().anyMatch(s -> s.equals(device))) { //璇绘ā缁勭爜 String moduleCode = miloService.readFromOpcUa(thoroughfare + "." + device + ".ModuleCode").getValue().toString(); String productTye = thoroughfare + "." + device + ".ProductType"; @@ -130,6 +132,12 @@ } else { miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(thoroughfare + "." + device + ".RecordDataDone").value(12).build()); } + }else { + //pack 濡傛灉鍖哄垎鍨嬪彿鐨勮瘽灏辫澶勭悊 + //璁板綍鏁版嵁瀹屾垚 + String RecordDataDoneAddress = thoroughfare + "." + device + ".RecordDataDone"; + + miloService.writeToOpcShort(ReadWriteEntity.builder().identifier(RecordDataDoneAddress).value(11).build()); } }else { //鎵嬪姩宸ヤ綅澶勭悊閫昏緫 @@ -217,8 +225,6 @@ String workOrderNo = ""; String productCode = ""; //2銆佷繚瀛樿繃绔欓噰闆嗘暟鎹� -// String workOrderNo = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue().toString(); -// String productCode = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "ProductType").getValue().toString(); Object orderNumberObject = miloService.readFromOpcUa(thoroughfare + "." + device + "." + "WorkOrderNumber").getValue(); if(orderNumberObject!=null){ workOrderNo = orderNumberObject.toString(); -- Gitblit v1.9.3