Skip to content

H
hemei
Commit 8edc3be0 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

更新 称重446

parent a02711f6
Show whitespace changes
Inline Side-by-side
Showing with 47 additions and 44 deletions
Resource/收卷/中央收卷_设备连接变量表_20191206/Generated/plcgroup.json
View file @ 8edc3be0
......@@ -1484,7 +1484,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 91,
"Addr": 96,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1493,7 +1493,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 96,
"Addr": 91,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1502,7 +1502,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3001,
"Addr": 3011,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1511,7 +1511,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3011,
"Addr": 3001,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1520,7 +1520,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 90,
"Addr": 95,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1529,7 +1529,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 95,
"Addr": 90,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1538,7 +1538,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3000,
"Addr": 3010,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1547,7 +1547,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3010,
"Addr": 3000,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1556,7 +1556,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 92,
"Addr": 97,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1565,7 +1565,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 97,
"Addr": 92,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1574,7 +1574,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3002,
"Addr": 3012,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1583,7 +1583,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3012,
"Addr": 3002,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......
thick_public @ 68de2af9
Subproject commit cba152369cbe9909af6b92f64a5bc5edae266e41
Subproject commit 68de2af9889ee81806f878dc27759ea59067ff61
脚本/install/脚本/收卷/中央收卷_设备连接变量表_20191206/Generated/plcgroup.json
View file @ 8edc3be0
......@@ -1484,7 +1484,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 91,
"Addr": 96,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1493,7 +1493,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 96,
"Addr": 91,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1502,7 +1502,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3001,
"Addr": 3011,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1511,7 +1511,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3011,
"Addr": 3001,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1520,7 +1520,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 90,
"Addr": 95,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1529,7 +1529,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 95,
"Addr": 90,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1538,7 +1538,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3000,
"Addr": 3010,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1547,7 +1547,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3010,
"Addr": 3000,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1556,7 +1556,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 92,
"Addr": 97,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1565,7 +1565,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 97,
"Addr": 92,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......@@ -1574,7 +1574,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3002,
"Addr": 3012,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[0]",
......@@ -1583,7 +1583,7 @@
{
"DeviceIndex": 0,
"Mode": "0",
"Addr": 3012,
"Addr": 3002,
"Type": "bool",
"Scale": 1.0,
"OwnerName": "Items[1]",
......
脚本/install/脚本/称重/设备连接变量表_446/Generated/plcgroup.json → 脚本/install/脚本/称重/设备连接变量表_446_v2/Generated/plcgroup.json
View file @ 8edc3be0
......@@ -338,27 +338,27 @@
{
"DeviceIndex": 0,
"Mode": "4",
"Addr": 2308,
"Type": "UInt16",
"Scale": 0.1,
"Addr": 1700,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Items[0]",
"PropertyName": "ScrewManualFreq"
},
{
"DeviceIndex": 1,
"Mode": "4",
"Addr": 2308,
"Type": "UInt16",
"Scale": 0.1,
"Addr": 1700,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Items[1]",
"PropertyName": "ScrewManualFreq"
},
{
"DeviceIndex": 2,
"Mode": "4",
"Addr": 2308,
"Type": "UInt16",
"Scale": 0.1,
"Addr": 1700,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Items[2]",
"PropertyName": "ScrewManualFreq"
},
......
脚本/install/脚本/称重/设备连接变量表_464_v2/Generated/plcgroup.json
View file @ 8edc3be0
......@@ -339,8 +339,8 @@
"DeviceIndex": 0,
"Mode": "4",
"Addr": 1700,
"Type": "UInt16",
"Scale": 0.1,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Items[0]",
"PropertyName": "ScrewManualFreq"
},
......@@ -348,8 +348,8 @@
"DeviceIndex": 1,
"Mode": "4",
"Addr": 1700,
"Type": "UInt16",
"Scale": 0.1,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Items[1]",
"PropertyName": "ScrewManualFreq"
},
......@@ -357,8 +357,8 @@
"DeviceIndex": 2,
"Mode": "4",
"Addr": 1700,
"Type": "UInt16",
"Scale": 0.1,
"Type": "float",
"Scale": 1.0,
"OwnerName": "Items[2]",
"PropertyName": "ScrewManualFreq"
},
......
脚本/restore/FLY.Thick.Blowing.UI.Fix.Client/default/password.default.json
View file @ 8edc3be0
......@@ -50,6 +50,11 @@
"Description": "地址管理",
"Level": 1
},
{
"UiName": "CustomSetting",
"Description": "客户配置",
"Level": 1
},
{
"UiName": "BorderSearch",
"Description": "边界查找",
......
脚本/restore/FLY.Thick.Blowing.UI.Fix.Client/default/serviceManager.default.json
View file @ 8edc3be0
{
"ConnAddrs": [
[
{
"ConnName": "blowing",
"Addr": "127.0.0.1:20006"
......@@ -21,4 +20,3 @@
"Addr": "127.0.0.1:20004"
}
]
\ No newline at end of file
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment