From 8847319d5066328f3b921d3e10339f595e64dc16 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期二, 09 七月 2024 13:54:12 +0800
Subject: [PATCH] 修改参数采集
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 7 ++++++-
jcdm-main/src/main/java/com/jcdm/main/plcserver/sub/OPCUaSubscription.java | 2 +-
jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java | 4 ++++
3 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
index 2f51f84..d646279 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/constant/Constants.java
@@ -1,7 +1,9 @@
package com.jcdm.main.constant;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
public class Constants {
@@ -15,6 +17,8 @@
public static final List<String> ModuleList = new ArrayList<>();//妯＄粍宸ヤ綅锛岀敤浜庢牎楠屾槸鍚︿紶鍏ユā缁勭爜
+ public static final Map<String,String> materialMap = new HashMap();//浜哄伐宸ヤ綅
+
public static final String NG = "2";
public static final String UN_PASS= "涓嶅悎鏍�";
public static final String PASS= "鍚堟牸";
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 edc3bb9..48cde8a 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
@@ -48,6 +48,11 @@
@Override
public void run(ApplicationArguments args) throws Exception {
+
+ //PLC鍒癕ES鐗╂枡杞崲
+ Constants.materialMap.put("1","9900199052A");
+ Constants.materialMap.put("2","9900199053B");
+
//鍒嗘010-090娈� 鐢佃姱宸ヤ綅
Constants.OP020_OP090.add(Constants.OP020);
Constants.OP020_OP090.add(Constants.OP030);
@@ -59,7 +64,7 @@
//浜哄伐宸ヤ綅
Constants.OP100_OP150.add(Constants.OP100_1);
Constants.OP100_OP150.add(Constants.OP100_2);
- //Constants.OP100_OP150.add(Constants.OP150);
+ Constants.OP100_OP150.add(Constants.OP150);
//妯＄粍宸ヤ綅List
Constants.ModuleList.add(Constants.OP110);
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 05cade1..9c5c2b9 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
@@ -266,7 +266,7 @@
try {
// 鏌ヨ鏈�鏂扮殑宸ュ崟淇℃伅
OmProductionOrdeInfo lastOrder = omProductionOrdeInfoService.getLastOrder();
- String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "M1OP100");
+ String orderJsonString = RestfulService.getProductionWorkOrderRequest(lastOrder.getProductNum(), "MOP100");
JSONObject jsonObject = new JSONObject(orderJsonString);
// 浠嶫SONObject涓幏鍙杁ata瀵硅薄
JSONObject dataObject = jsonObject.getJSONObject("data");
--
Gitblit v1.9.3