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/conf/OPCElement.java | 10 ++++-
/dev/null | 27 -------------
jcdm-main/pom.xml | 2
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 6 ++-
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/TestClass.java | 13 ++++++
jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java | 4 +-
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 22 +++++++----
7 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/jcdm-main/pom.xml b/jcdm-main/pom.xml
index ed541ac..11ee8d4 100644
--- a/jcdm-main/pom.xml
+++ b/jcdm-main/pom.xml
@@ -69,7 +69,7 @@
<dependency>
<groupId>com.kangaroohy</groupId>
<artifactId>milo-spring-boot-starter</artifactId>
- <version>3.0.5</version>
+ <version>3.0.4</version>
</dependency>
<!-- opc end-->
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 53b1df6..b0ce95c 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -92,8 +92,10 @@
lists.add(OPCElement.PACK_OP280_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP320A_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP320B_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP340_RecordData);//璇锋眰璁板綍鏁版嵁
- lists.add(OPCElement.PACK_OP350_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP340A_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP340B_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP350A_RecordData);//璇锋眰璁板綍鏁版嵁
+ lists.add(OPCElement.PACK_OP350B_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP360_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP370_RecordData);//璇锋眰璁板綍鏁版嵁
lists.add(OPCElement.PACK_OP390_RecordData);//璇锋眰璁板綍鏁版嵁
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
index b28eddb..d039a7d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/conf/OPCElement.java
@@ -119,11 +119,17 @@
/**
* OP340
*/
- public static final String PACK_OP340_RecordData = "PACK.OP340.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String PACK_OP340A_RecordData = "PACK.OP340A.RecordData";//璇锋眰璁板綍鏁版嵁
+
+ public static final String PACK_OP340B_RecordData = "PACK.OP340B.RecordData";//璇锋眰璁板綍鏁版嵁
+
/**
* OP350
*/
- public static final String PACK_OP350_RecordData = "PACK.OP350.RecordData";//璇锋眰璁板綍鏁版嵁
+ public static final String PACK_OP350A_RecordData = "PACK.OP350A.RecordData";//璇锋眰璁板綍鏁版嵁
+
+ public static final String PACK_OP350B_RecordData = "PACK.OP350B.RecordData";//璇锋眰璁板綍鏁版嵁
+
/**
* OP360
*/
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();
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/TestClass.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/TestClass.java
new file mode 100644
index 0000000..139641f
--- /dev/null
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/TestClass.java
@@ -0,0 +1,13 @@
+package com.jcdm.main.restful.factoryMes.controller;
+
+import com.jcdm.main.restful.factoryMes.service.RestfulService;
+
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+public class TestClass {
+ public static void main(String[] args) {
+// System.out.println(RestfulService.getProductionWorkOrderRequest("0RSPA001111111E4T0000003","POP010"));
+ System.out.println(RestfulService.getWorkReportResultFeedback("0RSPA001111111E4T0000003","POP010","2024-04-26 09:38:03"));
+ }
+}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
deleted file mode 100644
index 4e849eb..0000000
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/controller/testClass.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.jcdm.main.restful.factoryMes.controller;
-
-import java.util.*;
-
-public class testClass {
- public static void main(String[] args) {
- String str = "123990016680564";
- List<String> l = new ArrayList<>();
- l.add("9900166805");
- l.add("9900171753");
- l.add("9900173353");
- Integer i = 0;
- String o = "";
- for (String s : l) {
- if(str.contains(s)){
- i = s.length();
- o = s;
- break;
- }
- }
- System.out.println(i);
- System.out.println(o);
-
-
-
- }
-}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
index b548f5a..5e2a543 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/restful/factoryMes/service/RestfulService.java
@@ -11,11 +11,11 @@
System.out.println(str.length());
}
- public static final String getRealmName = "https://imes-test-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
+ public static final String getRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/aMesSysIntegration";
public static final String postRealmName = "https://imes-uat-group.geelycv-test.com/api/mom-open/restful/interface";
- public static final String siteCode = "9786";
+ public static final String siteCode = "3983";
/**
* 鐢熶骇宸ュ崟璇锋眰鎺ュ彛
--
Gitblit v1.9.3