From 625d2b6dd9bd4a1c63bf7e1b2701393d908f7a81 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期六, 11 五月 2024 08:31:12 +0800
Subject: [PATCH] 客户数据库变更，部分铝框没有对应玻璃信息，扫码添加出片队列时，当铝框没有对应玻璃时直接添加到出片队列
---
CanadaMes-ui/src/configuration/Positioning1.json | 162 ++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 127 insertions(+), 35 deletions(-)
diff --git a/CanadaMes-ui/src/configuration/Positioning1.json b/CanadaMes-ui/src/configuration/Positioning1.json
index 0a4f289..f9345d6 100644
--- a/CanadaMes-ui/src/configuration/Positioning1.json
+++ b/CanadaMes-ui/src/configuration/Positioning1.json
@@ -5,7 +5,9 @@
"sending": 0,
"type": "0",
"unit": "mm",
- "value":"0"
+ "value":"0",
+ "min": 0,
+ "max": 75
}],
[{
@@ -14,7 +16,9 @@
"sending": 0,
"type": "0",
"unit": "mm",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
}],
[{
@@ -23,7 +27,9 @@
"sending": 0,
"type": "0",
"unit": "mm",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":1000
}],
@@ -44,7 +50,9 @@
"unit": "mm",
"value":"0",
"address":"DB100.48",
- "count":10
+ "count":10,
+ "min":0,
+ "max":22000
},
{
"name": "22#鏍煎湴鍧�",
@@ -52,7 +60,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "43#鏍煎湴鍧�",
@@ -60,7 +70,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "64#鏍煎湴鍧�",
@@ -68,7 +80,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "85#鏍煎湴鍧�",
@@ -76,7 +90,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "106#鏍煎湴鍧�",
@@ -84,7 +100,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "127#鏍煎湴鍧�",
@@ -92,7 +110,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "148#鏍煎湴鍧�",
@@ -100,7 +120,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "169#鏍煎湴鍧�",
@@ -108,7 +130,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "190#鏍煎湴鍧�",
@@ -116,7 +140,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
}
@@ -139,7 +165,9 @@
"unit": "mm",
"value":"0",
"address":"DB100.68",
- "count":10
+ "count":10,
+ "min":0,
+ "max":22000
},
{
"name": "22#鏍煎湴鍧�",
@@ -147,7 +175,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "43#鏍煎湴鍧�",
@@ -155,7 +185,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "64#鏍煎湴鍧�",
@@ -163,7 +195,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "85#鏍煎湴鍧�",
@@ -171,7 +205,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "106#鏍煎湴鍧�",
@@ -179,7 +215,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "127#鏍煎湴鍧�",
@@ -187,7 +225,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "148#鏍煎湴鍧�",
@@ -195,7 +235,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "169#鏍煎湴鍧�",
@@ -203,7 +245,9 @@
"sending": 0,
"unit": "mm",
"type": "0" ,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
},
{
"name": "190#鏍煎湴鍧�",
@@ -211,7 +255,9 @@
"sending": 0,
"type": "0" ,
"unit": "mm",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":22000
}
@@ -232,16 +278,19 @@
"unit": "mm",
"address":"DB100.0",
"count":3,
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "22#鏍煎湴鍧�",
"read": 11,
"sending": 0,
"unit": "mm",
- "type": "0"
- ,
- "value":"0"
+ "type": "0",
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "43#鏍煎湴鍧�",
@@ -249,7 +298,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "64#鏍煎湴鍧�",
@@ -257,7 +308,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "85#鏍煎湴鍧�",
@@ -265,7 +318,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
}
@@ -285,7 +340,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "127#鏍煎湴鍧�",
@@ -293,7 +350,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "148#鏍煎湴鍧�",
@@ -301,7 +360,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "169#鏍煎湴鍧�",
@@ -309,7 +370,9 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
},
{
"name": "190#鏍煎湴鍧�",
@@ -317,13 +380,42 @@
"sending": 0,
"unit": "mm",
"type": "0",
- "value":"0"
+ "value":"0",
+ "min":0,
+ "max":9999
}
]
+
+ ,
+ [
+ {
+ "button": {
+ "name": "A01鍘熺偣璁板繂",
+ "value": 0,
+ "value2": 0,
+ "address": "DB10.0",
+ "state": 1
+
+ },"type": "1"
+
+ },
+ {
+ "button": {
+ "name": "A02鍘熺偣璁板繂",
+ "value": 0,
+ "value2": 0,
+ "address": "DB10.0",
+ "state": 1
+
+ },
+ "type": "1"
+
+ }
+ ]
--
Gitblit v1.8.0