From c7093edbf1fb3c91107c457ea13935305e1a9458 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期五, 05 七月 2024 14:58:50 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

---
 hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json |  502 +++++++++++++++----------------------------------------
 1 files changed, 142 insertions(+), 360 deletions(-)

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
index 3880ffc..ac8379f 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/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

--
Gitblit v1.8.0