From fcbbdae83021f307f382447452f458e640520848 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期四, 12 九月 2024 08:33:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json
index 1a32fde..9b0432b 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/JsonFile/PlcLoadGlass.json
@@ -1,6 +1,6 @@
 {
-  "plcAddressBegin":"DB14.0",
-  "plcAddressLenght":"98",
+  "plcAddressBegin":"DB1.2000",
+  "plcAddressLenght":"100",
   "dataType":"word",
   "parameteInfor":[
     {
@@ -25,6 +25,13 @@
       "unit":""
     },
     {
+      "codeId": "InkageStatus",
+      "addressIndex":"22",
+      "addressLenght":"2",
+      "ratio":"1",
+      "unit":""
+    },
+    {
       "codeId": "WorkId",
       "addressIndex":"24",
       "addressLenght":"2",

--
Gitblit v1.8.0