From e6058f7ecd0f7dcf9414d8adf2fbdff77b0baff9 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 13 五月 2024 08:48:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/JsonFile/PlcCacheGlass.json | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/JsonFile/PlcCacheGlass.json b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/JsonFile/PlcCacheGlass.json
index 0e9ca40..01969b7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/JsonFile/PlcCacheGlass.json
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/JsonFile/PlcCacheGlass.json
@@ -1,5 +1,5 @@
{
- "plcAddressBegin":"DB14.0",
+ "plcAddressBegin":"DB11.0",
"plcAddressLenght":"80",
"dataType":"word",
"parameteInfor":[
@@ -18,29 +18,36 @@
"unit":""
},
{
+ "codeId": "Current_slot",
+ "addressIndex":"36",
+ "addressLenght":"2",
+ "ratio":"1",
+ "unit":""
+ },
+ {
"codeId": "MES_confirmation_word",
- "addressIndex":"40",
+ "addressIndex":"38",
"addressLenght":"2",
"ratio":"1",
"unit":""
},
{
- "codeId": "A09_glass_status",
- "addressIndex":"70",
+ "codeId": "A08_glass_status",
+ "addressIndex":"68",
"addressLenght":"2",
"ratio":"1",
"unit":""
},
{
"codeId": "A10_glass_status",
- "addressIndex":"72",
+ "addressIndex":"70",
"addressLenght":"2",
"ratio":"1",
"unit":""
},
{
"codeId": "A09_prohibit_film_production",
- "addressIndex":"74",
+ "addressIndex":"72",
"addressLenght":"2",
"ratio":"1",
"unit":""
@@ -48,7 +55,7 @@
,
{
"codeId": "A10_prohibit_film_production",
- "addressIndex":"76",
+ "addressIndex":"74",
"addressLenght":"2",
"ratio":"1",
"unit":""
--
Gitblit v1.8.0