From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2
---
igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml | 38 +++++++++++++++++++++++++++++++-------
1 files changed, 31 insertions(+), 7 deletions(-)
diff --git a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
index 1c4353f..0992467 100644
--- a/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
+++ b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
@@ -104,6 +104,24 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
+ <PropertyDef name="bizType">
+ <Property/>
+ <Property name="label">涓氬姟绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#triggerBizType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="serId">
+ <Property/>
+ <Property name="label">鎵�灞炲垎鏈�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deviceSerPR#getAllSerCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="padding:5;regionPadding:5">
@@ -170,12 +188,18 @@
<DataColumn name="deviceCode">
<Property name="property">deviceCode</Property>
</DataColumn>
+ <DataColumn name="serId">
+ <Property name="property">serId</Property>
+ </DataColumn>
+ <DataColumn name="bizType">
+ <Property name="property">bizType</Property>
+ </DataColumn>
<ColumnGroup>
<Property name="caption">寮�鎿嶄綔</Property>
<DataColumn name="open">
<Property name="property">open</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="openFun">
<Property name="property">openFun</Property>
@@ -189,7 +213,7 @@
<DataColumn name="close">
<Property name="property">close</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="closeFun">
<Property name="property">closeFun</Property>
@@ -203,7 +227,7 @@
<DataColumn name="stop">
<Property name="property">stop</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="stopFun">
<Property name="property">stopFun</Property>
@@ -217,7 +241,7 @@
<DataColumn name="openEnd">
<Property name="property">openEnd</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="openEndFun">
<Property name="property">openEndFun</Property>
@@ -231,7 +255,7 @@
<DataColumn name="closeEnd">
<Property name="property">closeEnd</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="closeEndFun">
<Property name="property">closeEndFun</Property>
@@ -245,7 +269,7 @@
<DataColumn name="openError">
<Property name="property">openError</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="openErrorFun">
<Property name="property">openErrorFun</Property>
@@ -259,7 +283,7 @@
<DataColumn name="closeError">
<Property name="property">closeError</Property>
<Property name="caption">鍦板潃</Property>
- <Property name="width">100</Property>
+ <Property name="width">80</Property>
</DataColumn>
<DataColumn name="closeErrorFun">
<Property name="property">closeErrorFun</Property>
--
Gitblit v1.9.3