From e339917989dcd29c08a0000deb41f10ded43dd5d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期三, 29 五月 2024 09:27:29 +0800
Subject: [PATCH] 增加联机状态,更改json文件位置
---
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java | 3
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java | 1
hangzhoumesParent/JsonFile/PlcdownGlass.json | 362 ++++++++++++++++++++++++++++++++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 78 ++++--
hangzhoumesParent/JsonFile/PlcLoadGlass.json | 78 +++++++
hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/WebSocketConfig.java | 3
hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json | 57 +++++
hangzhoumesParent/JsonFile/PlcCacheGlass.json | 64 +++++
8 files changed, 620 insertions(+), 26 deletions(-)
diff --git a/hangzhoumesParent/JsonFile/PlcCacheGlass.json b/hangzhoumesParent/JsonFile/PlcCacheGlass.json
new file mode 100644
index 0000000..01969b7
--- /dev/null
+++ b/hangzhoumesParent/JsonFile/PlcCacheGlass.json
@@ -0,0 +1,64 @@
+{
+ "plcAddressBegin":"DB11.0",
+ "plcAddressLenght":"80",
+ "dataType":"word",
+ "parameteInfor":[
+ {
+ "codeId": "A06_request_word",
+ "addressIndex":"0",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "A05_scanning_ID",
+ "addressIndex":"2",
+ "addressLenght":"30",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "Current_slot",
+ "addressIndex":"36",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "MES_confirmation_word",
+ "addressIndex":"38",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "A08_glass_status",
+ "addressIndex":"68",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "A10_glass_status",
+ "addressIndex":"70",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "A09_prohibit_film_production",
+ "addressIndex":"72",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ,
+ {
+ "codeId": "A10_prohibit_film_production",
+ "addressIndex":"74",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ]
+}
diff --git a/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json b/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
new file mode 100644
index 0000000..5838dac
--- /dev/null
+++ b/hangzhoumesParent/JsonFile/PlcCacheVerticalGlass.json
@@ -0,0 +1,57 @@
+{
+ "plcAddressBegin":"DB.0",
+ "plcAddressLenght":"72",
+ "dataType":"word",
+ "parameteInfor":[
+ {
+ "codeId": "D01Request",
+ "addressIndex":"0",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "D01ID1",
+ "addressIndex":"2",
+ "addressLenght":"6",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "D04Request",
+ "addressIndex":"8",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "D04ID1",
+ "addressIndex":"10",
+ "addressLenght":"6",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "D02Go",
+ "addressIndex":"20",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "D05Go",
+ "addressIndex":"22",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ,
+ {
+ "codeId": "DeviceStatus",
+ "addressIndex":"70",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/JsonFile/PlcLoadGlass.json b/hangzhoumesParent/JsonFile/PlcLoadGlass.json
new file mode 100644
index 0000000..9b0432b
--- /dev/null
+++ b/hangzhoumesParent/JsonFile/PlcLoadGlass.json
@@ -0,0 +1,78 @@
+{
+ "plcAddressBegin":"DB1.2000",
+ "plcAddressLenght":"100",
+ "dataType":"word",
+ "parameteInfor":[
+ {
+ "codeId": "loadRequest",
+ "addressIndex":"0",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":"m/min"
+ },
+ {
+ "codeId": "PlcStatus",
+ "addressIndex":"10",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "MesToPlc",
+ "addressIndex":"20",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "InkageStatus",
+ "addressIndex":"22",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "WorkId",
+ "addressIndex":"24",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "GlassWidth",
+ "addressIndex":"26",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "GlassHeight",
+ "addressIndex":"28",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ,
+ {
+ "codeId": "MesToPlcStatus",
+ "addressIndex":"40",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "MesToPlcStatusId",
+ "addressIndex":"42",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
+ "codeId": "MesTaskStatus",
+ "addressIndex":"56",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ }
+ ]
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/JsonFile/PlcdownGlass.json b/hangzhoumesParent/JsonFile/PlcdownGlass.json
new file mode 100644
index 0000000..c813b1d
--- /dev/null
+++ b/hangzhoumesParent/JsonFile/PlcdownGlass.json
@@ -0,0 +1,362 @@
+{
+ "plcAddressBegin": "DB100.0",
+ "plcAddressLenght": "142",
+ "dataType": "word",
+ "parameteInfor": [
+ {
+ "codeId": "RequestWord",
+ "addressIndex": "0",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G04ID",
+ "addressIndex": "2",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06RobotTaskRequestWord",
+ "addressIndex": "4",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06ID",
+ "addressIndex": "6",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11RobotTaskRequestWord",
+ "addressIndex": "8",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G011ID",
+ "addressIndex": "10",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "12",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "14",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "16",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "18",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "MESSendingWord",
+ "addressIndex": "20",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InputGrid",
+ "addressIndex": "22",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "OutputGrid",
+ "addressIndex": "24",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "OutputID",
+ "addressIndex": "26",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "FrontOrRearLowerSlice",
+ "addressIndex": "28",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "30",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06RobotTaskReply",
+ "addressIndex": "32",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06Rack",
+ "addressIndex": "34",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11RobotTaskReply",
+ "addressIndex": "36",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11Rack",
+ "addressIndex": "38",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "40",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "42",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "44",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "46",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "48",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "50",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "52",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "54",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "MESTaskState",
+ "addressIndex": "56",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "58",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "AlarmState",
+ "addressIndex": "60",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Alarm1",
+ "addressIndex": "62",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Alarm2",
+ "addressIndex": "64",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Alarm3",
+ "addressIndex": "66",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Alarm4",
+ "addressIndex": "68",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "neirong",
+ "addressIndex": "70",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "device",
+ "addressIndex": "72",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "74",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "76",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InOut1",
+ "addressIndex": "78",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InOut2",
+ "addressIndex": "80",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InOut3",
+ "addressIndex": "82",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InOut4",
+ "addressIndex": "84",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InOut5",
+ "addressIndex": "86",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InOut6",
+ "addressIndex": "88",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "InOut7",
+ "addressIndex": "90",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "92",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "94",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "96",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "98",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "spare",
+ "addressIndex": "100",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G04ActionState",
+ "addressIndex": "102",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G05ActionState",
+ "addressIndex": "104",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06ActionState",
+ "addressIndex": "106",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G07ActionState",
+ "addressIndex": "108",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G08ActionState",
+ "addressIndex": "110",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G09ActionState",
+ "addressIndex": "112",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G10ActionState",
+ "addressIndex": "114",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11ActionState",
+ "addressIndex": "116",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G12ActionState",
+ "addressIndex": "118",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G13ActionState",
+ "addressIndex": "120",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G04IDS",
+ "addressIndex": "122",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G05IDS",
+ "addressIndex": "124",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06IDS",
+ "addressIndex": "126",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G07IDS",
+ "addressIndex": "128",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G08IDS",
+ "addressIndex": "130",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G09IDS",
+ "addressIndex": "132",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G10IDS",
+ "addressIndex": "134",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11IDS",
+ "addressIndex": "136",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G12IDS",
+ "addressIndex": "138",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G13ID",
+ "addressIndex": "140",
+ "addressLenght": "2"
+ }
+ ]
+}
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/WebSocketConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/WebSocketConfig.java
index 387f053..f5d16bf 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/WebSocketConfig.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/common/config/WebSocketConfig.java
@@ -4,6 +4,9 @@
import org.springframework.context.annotation.Configuration;
import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+/**
+ * @author SNG-010
+ */
@Configuration
public class WebSocketConfig {
/**
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index c05fbee..d0d6e14 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -47,33 +47,38 @@
@Scheduled(fixedDelay = 300)
public void plcLoadGlassTask() throws InterruptedException {
try {
- //鑾峰彇鏄惁鏈変笂鐗囪姹�
- String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
- String mesToPlc = plcParameterObject.getPlcParameter("MesToPlc").getValue();
- //鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
- Engineering engineering = engineeringService.selectInitiate(1);
- if ("1".equals(loadRequest) && engineering != null) {
- log.info("寮�濮嬩笂鐗囦换鍔�");
- UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
- log.info("褰撴湁璇锋眰鏃舵煡璇㈠綋鍓嶄笂鐗囬『搴忕殑鐜荤拑淇℃伅{}", upPattenUsage);
- UpWorkstation upwork = upWorkstationService.selectWorkstation(upPattenUsage);
- log.info("绗﹀悎鐨勫昂瀵哥殑宸ヤ綅鐜荤拑锛歿}", upwork);
- if (upwork != null) {
- int workId = upwork.getWorkstationId();//宸ヤ綅id
- double width = upwork.getPatternWidth();//瀹藉害
- double height = upwork.getPatternHeight();//楂樺害
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (long) width);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (long) height);
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
- //鏇存敼涓婄墖琛ㄧ姸鎬�
- upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
+ //鑾峰彇鑱旀満鐘舵��
+ String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ if("1".equals(inkageStatus)) {
+ //鑾峰彇鏄惁鏈変笂鐗囪姹�
+ String loadRequest = plcParameterObject.getPlcParameter("loadRequest").getValue();
+ String mesToPlc = plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ //鍒ゆ柇寮�濮嬩笂鐗囩殑宸ョ▼鍙�
+ Engineering engineering = engineeringService.selectInitiate(1);
+ if ("1".equals(loadRequest) && engineering != null) {
+ log.info("寮�濮嬩笂鐗囦换鍔�");
+ UpPattenUsage upPattenUsage = upWorkstationService.selectPriority(engineering);
+ log.info("褰撴湁璇锋眰鏃舵煡璇㈠綋鍓嶄笂鐗囬『搴忕殑鐜荤拑淇℃伅{}", upPattenUsage);
+ UpWorkstation upwork = upWorkstationService.selectWorkstation(upPattenUsage);
+ log.info("绗﹀悎鐨勫昂瀵哥殑宸ヤ綅鐜荤拑锛歿}", upwork);
+ if (upwork != null) {
+ int workId = upwork.getWorkstationId();//宸ヤ綅id
+ double width = upwork.getPatternWidth();//瀹藉害
+ double height = upwork.getPatternHeight();//楂樺害
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("WorkId").getAddress(), workId);
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassWidth").getAddress(), (long) width);
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("GlassHeight").getAddress(), (long) height);
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 1);
+ //鏇存敼涓婄墖琛ㄧ姸鎬�
+ upPattenUsageService.updateUpPattenUsageState(upPattenUsage, workId);
+
+ }
}
- }
- if("1".equals(mesToPlc)&& "0".equals(loadRequest)){
- //璇锋眰瀛椾负闆舵椂锛屼换鍔″瓧娓呴浂
- S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
+ if ("1".equals(mesToPlc) && "0".equals(loadRequest)) {
+ //璇锋眰瀛椾负闆舵椂锛屼换鍔″瓧娓呴浂
+ S7object.getinstance().plccontrol.writetime(plcParameterObject.getPlcParameter("MesToPlc").getAddress(), 0);
+ }
}
//鎵ц鍚庝紤鐪�300姣
//Thread.sleep(300);
@@ -135,6 +140,29 @@
}
}
}
+ @Scheduled(fixedDelay = 5000)
+ public void loadGlassStatus(){
+ JSONObject jsonObject = new JSONObject();
+ //姝ｅ湪杩涜鐨勪换鍔�
+ //String inkageStatus =plcParameterObject.getPlcParameter("MesToPlc").getValue();
+ String inkageStatus ="1";
+ jsonObject.append("InkageStatus", inkageStatus);
+ ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("loadGlass");
+ if (sendwServer != null) {
+ for (WebSocketServer webserver : sendwServer) {
+ if (webserver != null) {
+ webserver.sendMessage(jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ } else {
+ log.info("Home is closed");
+ }
+ }
+ }
+ }
public void overTask(String loadStatus, int state) {
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
index f1907fe..257bc80 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/controller/UpWorkstationController.java
@@ -53,6 +53,7 @@
public Result<String> updateMesInkageLoad(@RequestBody short inKageWord) {
String result = upWorkstationService.updateMesInkageLoad(inKageWord);
return Result.success(result);
+
}
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
index a9d15bf..b7d08c2 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/workstation/service/impl/UpWorkstationServiceImpl.java
@@ -92,7 +92,8 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
log.info("淇敼璁惧鑱斿姩璇锋眰涓簕}锛�0绂荤嚎锛�1鑱斿姩", inKageWord);
S7object.getinstance().plccontrol.writeWord(plcParameterObject.getPlcParameter("InkageStatus").getAddress(), inKageWord);
- return "success";
+ //璇诲彇plc鐨勫��
+ return plcParameterObject.getPlcParameter("InkageStatus").getValue();
}
}
\ No newline at end of file
--
Gitblit v1.8.0