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/AutomaticParameterSetting.json |  120 +++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 70 insertions(+), 50 deletions(-)

diff --git a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
index 87ec239..190f2f3 100644
--- a/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
+++ b/CanadaMes-ui/src/configuration/AutomaticParameterSetting.json
@@ -8,7 +8,9 @@
       "address": "DB100.0",
       "count": 3,
       "unit": "掳",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     },
     {
       "name": "A01琛岃蛋浣庨�熻搴�",
@@ -17,7 +19,9 @@
       "address": "DB100.0",
       "unit": "掳",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     },
     {
       "name": "A01杈撻�佹帴鐗囪搴�",
@@ -26,7 +30,9 @@
       "unit": "掳",
       "address": "DB100.0",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     },
     {
       "name": "A01绗煎瓙瑙掑害",
@@ -35,7 +41,9 @@
       "unit": "掳",
       "address": "DB100.0",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     }
   ],
   [
@@ -47,7 +55,9 @@
       "unit": "掳",
       "address": "DB100.0",
       "count": 3,
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     },
     {
       "name": "A02琛岃蛋浣庨�熻搴�",
@@ -56,7 +66,9 @@
       "unit": "掳",
       "address": "DB100.0",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     },
     {
       "name": "A02杈撻�佹帴鐗囪搴�",
@@ -65,7 +77,9 @@
       "unit": "掳",
       "address": "DB100.0",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     },
     {
       "name": "A02绗煎瓙瑙掑害",
@@ -74,7 +88,9 @@
       "unit": "掳",
       "address": "DB100.0",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     }
   ],
   [
@@ -86,7 +102,9 @@
       "unit": "m/min",
       "address": "DB100.0",
       "count": 3,
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 3000
     }
   ],
   [
@@ -97,7 +115,9 @@
       "unit": "m/min",
       "address": "DB100.0",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 2000
     }
   ],
   [
@@ -108,7 +128,9 @@
       "unit": "m/min",
       "address": "DB100.0",
       "type": "0",
-      "value": ""
+      "value": "",
+      "min": 0,
+      "max": 99
     }
   ],
   [
@@ -118,22 +140,16 @@
           
         }
       },
-  {
-    "name": "鏈�楂橀�熷害",
-    "read": 33,
-    "sending": 0,
-    "type": "0",
-    "unit": "m/min",
-    "count":3,
-    "value":0
-  },
+ 
   {
     "name": "楂橀�熺嚎閫熷害",
     "read": 11,
     "sending": 0,
     "type": "0",
     "unit": "m/min",
-    "value":0
+    "value":0,
+    "min": 0,
+    "max": 60
   },
   {
     "name": "浣庨�熺嚎閫熷害",
@@ -141,7 +157,9 @@
     "sending": 0,
     "type": "0",
     "unit": "m/min",
-    "value":0
+    "value":0,
+    "min": 0,
+    "max": 60
   },
   {
     "name": "鎵嬪姩閫熷害",
@@ -149,7 +167,9 @@
     "sending": 0,
     "type": "0",
     "unit": "m/min",
-    "value":0
+    "value":0,
+    "min": 0,
+    "max": 60
   }
   
  
@@ -162,22 +182,16 @@
         
       }
     },
-{
-  "name": "鏈�楂橀�熷害",
-  "read": 33,
-  "sending": 0,
-  "type": "0",
-  "unit": "m/min",
-  "count":3,
-  "value":0
-},
+
 {
   "name": "楂橀�熺嚎閫熷害",
   "read": 11,
   "sending": 0,
   "unit": "m/min",
   "type": "0",
-  "value":0
+  "value":0,
+  "min": 0,
+  "max": 60
 },
 {
   "name": "浣庨�熺嚎閫熷害",
@@ -185,7 +199,9 @@
   "sending": 0,
   "unit": "m/min",
   "type": "0",
-  "value":0
+  "value":0,
+  "min": 0,
+  "max": 60
 },
 {
   "name": "鎵嬪姩閫熷害",
@@ -193,7 +209,9 @@
   "sending": 0,
   "unit": "m/min",
   "type": "0",
-  "value":0
+  "value":0,
+  "min": 0,
+  "max": 60
 }
 
 
@@ -204,22 +222,16 @@
       
     }
   },
-{
-"name": "鏈�楂橀�熷害",
-"read": 33,
-"sending": 0,
-"type": "0",
-"unit": "m/min",
-"count":3,
-"value":0
-},
+
 {
 "name": "楂橀�熺嚎閫熷害",
 "read": 11,
 "sending": 0,
 "type": "0",
 "unit": "m/min",
-"value":0
+"value":0,
+"min": 0,
+"max": 60
 },
 {
 "name": "浣庨�熺嚎閫熷害",
@@ -227,7 +239,9 @@
 "sending": 0,
 "type": "0",
 "unit": "m/min",
-"value":0
+"value":0,
+"min": 0,
+"max": 60
 },
 {
 "name": "鎵嬪姩閫熷害",
@@ -235,7 +249,9 @@
 "sending": 0,
 "type": "0",
 "unit": "m/min",
-"value":0
+"value":0,
+"min": 0,
+"max": 60
 }
 
 
@@ -247,10 +263,12 @@
 "read": 33,
 "sending": 0,
 "type": "0",
-"unit": "mm/S",
+"unit": "掳/S",
 
 "count":3,
-"value":0
+"value":0,
+"min": 0,
+"max": 99
 }
 
 
@@ -264,7 +282,9 @@
 "sending": 0,
 "unit": "mm/S",
 "type": "0",
-"value":0
+"value":0,
+"min": 0,
+"max": 2000
 }
 
 

--
Gitblit v1.8.0