From 09381335e11d32e01c8067b71d897c7064ec279d Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 20 五月 2024 14:38:18 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes

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

diff --git a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
index d44cf10..3880ffc 100644
--- a/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
+++ b/hangzhoumesParent/moduleService/UnLoadGlassModule/src/main/resources/JsonFile/PlcdownGlass.json
@@ -14,22 +14,22 @@
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G06RobotTaskRequestWord",
       "addressIndex": "4",
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G06ID",
       "addressIndex": "6",
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G11RobotTaskRequestWord",
       "addressIndex": "8",
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G011ID",
       "addressIndex": "10",
       "addressLenght": "2"
     },
@@ -69,12 +69,12 @@
       "addressLenght": "2"
     },
     {
-      "codeId": "鍑虹墖ID",
+      "codeId": "OutputID",
       "addressIndex": "26",
       "addressLenght": "2"
     },
     {
-      "codeId": "鍓嶇鍚庣涓嬬墖",
+      "codeId": "FrontOrRearLowerSlice",
       "addressIndex": "28",
       "addressLenght": "2"
     },
@@ -84,22 +84,22 @@
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G06RobotTaskReply",
       "addressIndex": "32",
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G06Rack",
       "addressIndex": "34",
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G11RobotTaskReply",
       "addressIndex": "36",
       "addressLenght": "2"
     },
     {
-      "codeId": "spare",
+      "codeId": "G11Rack",
       "addressIndex": "38",
       "addressLenght": "2"
     },
@@ -144,7 +144,7 @@
       "addressLenght": "2"
     },
     {
-      "codeId": "MES浠诲姟鐘舵��",
+      "codeId": "MESTaskState",
       "addressIndex": "56",
       "addressLenght": "2"
     },
@@ -154,37 +154,37 @@
       "addressLenght": "2"
     },
     {
-      "codeId": "鎶ヨ鐘舵��",
+      "codeId": "AlarmState",
       "addressIndex": "60",
       "addressLenght": "2"
     },
     {
-      "codeId": "鎶ヨ瀛�1",
+      "codeId": "Alarm1",
       "addressIndex": "62",
       "addressLenght": "2"
     },
     {
-      "codeId": "鎶ヨ瀛�2",
+      "codeId": "Alarm2",
       "addressIndex": "64",
       "addressLenght": "2"
     },
     {
-      "codeId": "鎶ヨ瀛�3",
+      "codeId": "Alarm3",
       "addressIndex": "66",
       "addressLenght": "2"
     },
     {
-      "codeId": "鎶ヨ瀛�4",
+      "codeId": "Alarm4",
       "addressIndex": "68",
       "addressLenght": "2"
     },
     {
-      "codeId": "鍐呭",
+      "codeId": "neirong",
       "addressIndex": "70",
       "addressLenght": "2"
     },
     {
-      "codeId": "璁惧鐘舵�佸瓧",
+      "codeId": "device",
       "addressIndex": "72",
       "addressLenght": "2"
     },
@@ -199,37 +199,37 @@
       "addressLenght": "2"
     },
     {
-      "codeId": "杈撳叆杈撳嚭1",
+      "codeId": "InOut1",
       "addressIndex": "78",
       "addressLenght": "2"
     },
     {
-      "codeId": "杈撳叆杈撳嚭2",
+      "codeId": "InOut2",
       "addressIndex": "80",
       "addressLenght": "2"
     },
     {
-      "codeId": "杈撳叆杈撳嚭3",
+      "codeId": "InOut3",
       "addressIndex": "82",
       "addressLenght": "2"
     },
     {
-      "codeId": "杈撳叆杈撳嚭4",
+      "codeId": "InOut4",
       "addressIndex": "84",
       "addressLenght": "2"
     },
     {
-      "codeId": "杈撳叆杈撳嚭5",
+      "codeId": "InOut5",
       "addressIndex": "86",
       "addressLenght": "2"
     },
     {
-      "codeId": "杈撳叆杈撳嚭6",
+      "codeId": "InOut6",
       "addressIndex": "88",
       "addressLenght": "2"
     },
     {
-      "codeId": "杈撳叆杈撳嚭7",
+      "codeId": "InOut7",
       "addressIndex": "90",
       "addressLenght": "2"
     },
@@ -259,97 +259,97 @@
       "addressLenght": "2"
     },
     {
-      "codeId": "G04鍔ㄤ綔鐘舵��",
+      "codeId": "G04ActionState",
       "addressIndex": "102",
       "addressLenght": "2"
     },
     {
-      "codeId": "G05鍔ㄤ綔鐘舵��",
+      "codeId": "G05ActionState",
       "addressIndex": "104",
       "addressLenght": "2"
     },
     {
-      "codeId": "G06鍔ㄤ綔鐘舵��",
+      "codeId": "G06ActionState",
       "addressIndex": "106",
       "addressLenght": "2"
     },
     {
-      "codeId": "G07鍔ㄤ綔鐘舵��",
+      "codeId": "G07ActionState",
       "addressIndex": "108",
       "addressLenght": "2"
     },
     {
-      "codeId": "G08鍔ㄤ綔鐘舵��",
+      "codeId": "G08ActionState",
       "addressIndex": "110",
       "addressLenght": "2"
     },
     {
-      "codeId": "G09鍔ㄤ綔鐘舵��",
+      "codeId": "G09ActionState",
       "addressIndex": "112",
       "addressLenght": "2"
     },
     {
-      "codeId": "G10鍔ㄤ綔鐘舵��",
+      "codeId": "G10ActionState",
       "addressIndex": "114",
       "addressLenght": "2"
     },
     {
-      "codeId": "G11鍔ㄤ綔鐘舵��",
+      "codeId": "G11ActionState",
       "addressIndex": "116",
       "addressLenght": "2"
     },
     {
-      "codeId": "G12鍔ㄤ綔鐘舵��",
+      "codeId": "G12ActionState",
       "addressIndex": "118",
       "addressLenght": "2"
     },
     {
-      "codeId": "G13鍔ㄤ綔鐘舵��",
+      "codeId": "G13ActionState",
       "addressIndex": "120",
       "addressLenght": "2"
     },
     {
-      "codeId": "G04ID",
+      "codeId": "G04IDS",
       "addressIndex": "122",
       "addressLenght": "2"
     },
     {
-      "codeId": "G05ID",
+      "codeId": "G05IDS",
       "addressIndex": "124",
       "addressLenght": "2"
     },
     {
-      "codeId": "G06ID",
+      "codeId": "G06IDS",
       "addressIndex": "126",
       "addressLenght": "2"
     },
     {
-      "codeId": "G07ID",
+      "codeId": "G07IDS",
       "addressIndex": "128",
       "addressLenght": "2"
     },
     {
-      "codeId": "G08ID",
+      "codeId": "G08IDS",
       "addressIndex": "130",
       "addressLenght": "2"
     },
     {
-      "codeId": "G09ID",
+      "codeId": "G09IDS",
       "addressIndex": "132",
       "addressLenght": "2"
     },
     {
-      "codeId": "G10ID",
+      "codeId": "G10IDS",
       "addressIndex": "134",
       "addressLenght": "2"
     },
     {
-      "codeId": "G11ID",
+      "codeId": "G11IDS",
       "addressIndex": "136",
       "addressLenght": "2"
     },
     {
-      "codeId": "G12ID",
+      "codeId": "G12IDS",
       "addressIndex": "138",
       "addressLenght": "2"
     },

--
Gitblit v1.8.0