From 803697bd4f3ac5262e0acd69d6d7cc519ec45b2a Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期一, 04 九月 2023 10:28:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 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-core/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml b/igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
similarity index 89%
rename from igds-core/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
rename to igds-protocol-modbus/src/main/java/com/ld/igds/modbus/DeviceModbus.view.xml
index 1c4353f..0992467 100644
--- a/igds-core/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(&quot;deviceSerPR#getAllSerCache&quot;).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