From caee21a5367c06b5de60580de28c30c2b2ba6976 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 01 七月 2024 14:35:08 +0800
Subject: [PATCH] 大理片、人工下片单片玻璃已联调完成，未出现逻辑行的系统bug 下片向plc发送宽高厚保存原有尺寸，避免尺寸*10后超过类型接收最大值造成数据不准确
---
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json | 2
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java | 11
JsonFile/PlcdownGlass.json | 502 +++++++--------------------
hangzhoumesParent/JsonFile/PlcdownGlass.json | 502 +++++++--------------------
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java | 30
hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java | 3
7 files changed, 309 insertions(+), 743 deletions(-)
diff --git a/JsonFile/PlcdownGlass.json b/JsonFile/PlcdownGlass.json
index c813b1d..98366a9 100644
--- a/JsonFile/PlcdownGlass.json
+++ b/JsonFile/PlcdownGlass.json
@@ -1,362 +1,144 @@
{
- "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"
- }
- ]
+ "plcAddressBegin": "DB11.0",
+ "plcAddressLenght": "92",
+ "dataType": "word",
+ "parameteInfor": [
+
+ {
+ "codeId": "requestWord",
+ "addressIndex": "0",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "requestID",
+ "addressIndex": "2",
+ "addressLenght": "30"
+ },
+ {
+ "codeId": "currentCell",
+ "addressIndex": "32",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "glassStatus08",
+ "addressIndex": "36",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "glassStatus06",
+ "addressIndex": "40",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "glassStatus11",
+ "addressIndex": "42",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "glassStatus13",
+ "addressIndex": "44",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G04_error_status",
+ "addressIndex": "48",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G05_error_status",
+ "addressIndex": "50",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06_error_status",
+ "addressIndex": "52",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "robot_error_status",
+ "addressIndex": "54",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G08_error_status",
+ "addressIndex": "56",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G09_error_status",
+ "addressIndex": "58",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G10_error_status",
+ "addressIndex": "60",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11_error_status",
+ "addressIndex": "62",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "robot_error_status",
+ "addressIndex": "64",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G13_error_status",
+ "addressIndex": "66",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "confirmationWord",
+ "addressIndex": "72",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06_prohibit_film_production",
+ "addressIndex": "74",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11_prohibit_film_production",
+ "addressIndex": "76",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G13_prohibit_film_production",
+ "addressIndex": "78",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Glass_width",
+ "addressIndex": "80",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Glass_height",
+ "addressIndex": "82",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Glass_thickness",
+ "addressIndex": "84",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Start_cell",
+ "addressIndex": "86",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "End_cell",
+ "addressIndex": "88",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "task_type",
+ "addressIndex": "90",
+ "addressLenght": "2"
+ }
+
+ ]
}
\ No newline at end of file
diff --git a/hangzhoumesParent/JsonFile/PlcdownGlass.json b/hangzhoumesParent/JsonFile/PlcdownGlass.json
index c813b1d..979dc66 100644
--- a/hangzhoumesParent/JsonFile/PlcdownGlass.json
+++ b/hangzhoumesParent/JsonFile/PlcdownGlass.json
@@ -1,362 +1,144 @@
{
- "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"
- }
- ]
+ "plcAddressBegin": "DB11.0",
+ "plcAddressLenght": "100",
+ "dataType": "word",
+ "parameteInfor": [
+
+ {
+ "codeId": "requestWord",
+ "addressIndex": "0",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "requestID",
+ "addressIndex": "2",
+ "addressLenght": "30"
+ },
+ {
+ "codeId": "currentCell",
+ "addressIndex": "32",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "glassStatus08",
+ "addressIndex": "36",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06_glass_status",
+ "addressIndex": "40",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11_glass_status",
+ "addressIndex": "42",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G13_glass_status",
+ "addressIndex": "44",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G04_error_status",
+ "addressIndex": "48",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G05_error_status",
+ "addressIndex": "50",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06_error_status",
+ "addressIndex": "52",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "robot_error_status",
+ "addressIndex": "54",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G08_error_status",
+ "addressIndex": "56",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G09_error_status",
+ "addressIndex": "58",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G10_error_status",
+ "addressIndex": "60",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11_error_status",
+ "addressIndex": "62",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "robot_error_status",
+ "addressIndex": "64",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G13_error_status",
+ "addressIndex": "66",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "confirmationWord",
+ "addressIndex": "72",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G06_prohibit_film_production",
+ "addressIndex": "74",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G11_prohibit_film_production",
+ "addressIndex": "76",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "G13_prohibit_film_production",
+ "addressIndex": "78",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "Glass_width",
+ "addressIndex": "82",
+ "addressLenght": "4"
+ },
+ {
+ "codeId": "Glass_height",
+ "addressIndex": "86",
+ "addressLenght": "4"
+ },
+ {
+ "codeId": "Glass_thickness",
+ "addressIndex": "90",
+ "addressLenght": "4"
+ },
+ {
+ "codeId": "Start_cell",
+ "addressIndex": "94",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "End_cell",
+ "addressIndex": "96",
+ "addressLenght": "2"
+ },
+ {
+ "codeId": "task_type",
+ "addressIndex": "98",
+ "addressLenght": "2"
+ }
+
+ ]
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
index 3c0262a..23c8a17 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/PlcStorageCageTask.java
@@ -82,15 +82,15 @@
public void plcToHomeEdgScan() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
- String d02Id = plcParameterObject.getPlcParameter("D02ID").getValue();
+ String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
String d03State = plcParameterObject.getPlcParameter("D03State").getValue();
String d05State = plcParameterObject.getPlcParameter("D05State").getValue();
String mesD03Address = plcParameterObject.getPlcParameter("MESToD03").getAddress();
String mesD05Address = plcParameterObject.getPlcParameter("MESToD05").getAddress();
- log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d02Id鎵弿ID涓猴細{};", d01Id, d02Id);
- if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d02Id)) {
+ log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
+ if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
log.info("涓ゆ潯绾挎湭鏀跺埌杩涚墖浠诲姟锛岀粨鏉熸湰娆℃壂鎻忚繘鍗ц浆绔嬩换鍔�");
return;
}
@@ -104,8 +104,8 @@
if (StringUtils.isNotBlank(d01Id) && !REQUEST_WORD.equals(d03State)) {
judgeGlassTypeStatus(d01Id, Const.A09_OUT_TARGET_POSITION, mesD03Address);
}
- if (StringUtils.isNotBlank(d02Id) && !REQUEST_WORD.equals(d05State)) {
- judgeGlassTypeStatus(d02Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
+ if (StringUtils.isNotBlank(d04Id) && !REQUEST_WORD.equals(d05State)) {
+ judgeGlassTypeStatus(d04Id, Const.A10_OUT_TARGET_POSITION, mesD05Address);
}
log.info("缁撴潫鎵爜浠诲姟");
// if (flag01 && flag04) {
@@ -146,10 +146,10 @@
}
}
String d01Id = plcParameterObject.getPlcParameter("D01ID").getValue();
- String d02Id = plcParameterObject.getPlcParameter("D02ID").getValue();
- log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d02Id鎵弿ID涓猴細{};", d01Id, d02Id);
+ String d04Id = plcParameterObject.getPlcParameter("D04ID").getValue();
+ log.info("1銆佽幏鍙杁01Id鎵弿ID涓猴細{};鑾峰彇d04Id鎵弿ID涓猴細{};", d01Id, d04Id);
//涓ゆ潯绾块兘鏈夎繘鍗ц浆绔嬩换鍔★紝鐩存帴缁撴潫
-// if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d02Id)) {
+// if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {
// log.info("涓ゆ潯绾块兘瀛樺湪杩涚墖浠诲姟锛岀粨鏉熶换鍔�");
// return;
// }
@@ -160,7 +160,7 @@
return;
}
Integer lineFirst = lineList.get(0);
- String lineGlassId = lineFirst.equals(Const.A09_OUT_TARGET_POSITION) ? d01Id : d02Id;
+ String lineGlassId = lineFirst.equals(Const.A09_OUT_TARGET_POSITION) ? d01Id : d04Id;
//浠呮湁涓�鏉″厛绗﹀悎鍚姩鍚姩鏉′欢
if (lineList.size() == 1) {
//濡傛灉杩涚墖璇锋眰浣嗙幓鐠冧负绌猴紝璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
@@ -176,22 +176,22 @@
return;
}
//涓ゆ潯鍏堝潎鍙墽琛岃繘鐗囦换鍔★紝鍒ゆ柇涓ゆ潯绾挎槸鍚﹁繘鐗囪姹傛槸鍚﹂兘涓虹┖
- if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d02Id)) {
+ if (StringUtils.isBlank(d01Id) && StringUtils.isBlank(d04Id)) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
Integer line = getStartLine();
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
computeTargetByLine(line);
return;
- } else if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d02Id)) {
+ } else if (StringUtils.isNotBlank(d01Id) && StringUtils.isNotBlank(d04Id)) {
// todo:涓や釜閮芥湁杩涚墖鐜荤拑
- if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id) && computeIsRun(Const.A10_OUT_TARGET_POSITION, d02Id)) {
+ if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id) && computeIsRun(Const.A10_OUT_TARGET_POSITION, d04Id)) {
//姣旇緝鏈�鏃╀竴鐗囦换鍔＄殑鐗堝浘id鍙婄増搴� 姹傚嚭鍗ц浆绔嬬殑绾胯矾
Integer line = getStartLine();
//璁＄畻浠诲姟琛ㄨ繘鐗囨牸瀛� 鍙戦�佽繘鐗囦换鍔�
computeTargetByLine(line);
} else if (computeIsRun(Const.A09_OUT_TARGET_POSITION, d01Id)) {
computeTargetByLine(Const.A09_OUT_TARGET_POSITION);
- } else if (computeIsRun(Const.A10_OUT_TARGET_POSITION, d02Id)) {
+ } else if (computeIsRun(Const.A10_OUT_TARGET_POSITION, d04Id)) {
computeTargetByLine(Const.A10_OUT_TARGET_POSITION);
} else {
return;
@@ -421,8 +421,8 @@
String mesD05Address = plcMesObject.getPlcParameter("MESToD05").getAddress();
String outLine = line.equals(Const.A09_OUT_TARGET_POSITION) ? mesD03Address : mesD05Address;
for (int i = 1; i <= taskList.size(); i++) {
- s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), (short) taskList.get(i).getLine());
- s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport1" + i).getAddress(), (short) taskList.get(i).getTargetSlot());
+ s7control.writeWord(plcMesObject.getPlcParameter("StartAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getLine());
+ s7control.writeWord(plcMesObject.getPlcParameter("TargetAddToImport" + i).getAddress(), (short) taskList.get(i - 1).getTargetSlot());
}
s7control.writeWord(outLine, (short) 1);
}
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
index 0f18b76..d9a3548 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,7 @@
package com.mes;
//import com.mes.common.S7object;
+import com.mes.common.S7object;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -20,7 +21,7 @@
@Override
public void run(ApplicationArguments args) throws Exception {
log.info("鍚姩瀹屾垚");
- //S7object.getinstance().start();
+ S7object.getinstance().start();
}
}
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java
index 15b3372..670d12c 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/common/S7object.java
@@ -14,7 +14,7 @@
public class S7object extends Thread {
public S7control plccontrol; // PLC閫氳绫诲疄渚�
private EPlcType plcType = EPlcType.S1200; // 瑗块棬瀛怭LC绫诲瀷
- private String ip = "192.168.10.1"; // plc ip鍦板潃
+ private String ip = "192.168.30.100"; // plc ip鍦板潃
private int port = 102; // plc 绔彛鍙�
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
index 24022fa..4eaa40d 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/java/com/mes/job/DownLoadCacheGlassTask.java
@@ -26,6 +26,7 @@
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
+import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import java.util.ArrayList;
@@ -72,10 +73,10 @@
private Integer maxHeight;
- // @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void plcHomeEdgTask() {
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
- String requestWord = plcParameterObject.getPlcParameter("RequestWord").getValue();
+ String requestWord = plcParameterObject.getPlcParameter("requestWord").getValue();
String glassIdeValue = plcParameterObject.getPlcParameter("requestID").getValue();
//A08 A09琛ㄧず绾胯矾鐩稿悓 鍙仛绛変环 鏃犳暟鎹浆int寮傚父
String out06Glassstate = plcParameterObject.getPlcParameter("glassStatus06").getValue();
@@ -505,9 +506,9 @@
private Boolean sendMessageToPlc(int width, int height, int thickness, int startCell, int endCell, int taskType) {
S7control s7control = S7object.getinstance().plccontrol;
PlcParameterObject plcMesObject = S7object.getinstance().PlcMesObject;
- s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), (short) width * 10);
- s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), (short) height * 10);
- s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), (short) thickness * 10);
+ s7control.writeWord(plcMesObject.getPlcParameter("Glass_width").getAddress(), (short) width);
+ s7control.writeWord(plcMesObject.getPlcParameter("Glass_height").getAddress(), (short) height);
+ s7control.writeWord(plcMesObject.getPlcParameter("Glass_thickness").getAddress(), (short) thickness);
s7control.writeWord(plcMesObject.getPlcParameter("Start_cell").getAddress(), (short) startCell);
s7control.writeWord(plcMesObject.getPlcParameter("End_cell").getAddress(), (short) endCell);
s7control.writeWord(plcMesObject.getPlcParameter("task_type").getAddress(), (short) taskType);
diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
index 06d63e2..ac8379f 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
@@ -1,5 +1,5 @@
{
- "plcAddressBegin": "DB100.0",
+ "plcAddressBegin": "DB11.0",
"plcAddressLenght": "100",
"dataType": "word",
"parameteInfor": [
--
Gitblit v1.8.0