From d3553d8dd6fc00634ac32228e5b8e4d0624eda11 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 11:10:51 +0800
Subject: [PATCH] 调整Modbus配置-解决轴流风机与轴流窗不在同一个分机配置的问题

---
 igds-inout/src/main/java/models/inout.model.xml |  119 +++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index f4c8009..0ca54b0 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -453,24 +453,70 @@
       <Property></Property>
       <Property name="label">缁勭粐缂栫爜</Property>
     </PropertyDef>
+    <PropertyDef name="deptId">
+      <Property></Property>
+      <Property name="label">搴撳尯缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="inoutType">
+      <Property></Property>
+      <Property name="label">鍑哄叆搴撶被鍨�</Property>
+    </PropertyDef>
+    <PropertyDef name="bizType">
+      <Property></Property>
+      <Property name="label">澶勭悊鏂瑰紡</Property>
+    </PropertyDef>
+    <PropertyDef name="depotId">
+      <Property></Property>
+      <Property name="label">鎵�灞炰粨搴�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="contractId">
+      <Property></Property>
+      <Property name="label">鍚堝悓缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="contractName">
+      <Property></Property>
+      <Property name="label">鍚堝悓鍚嶇О</Property>
+    </PropertyDef>
     <PropertyDef name="payPrice">
       <Property name="dataType">Double</Property>
       <Property name="label">绮鍗曚环</Property>
       <Property name="displayFormat">0.000 鍏�/鍏枻</Property>
     </PropertyDef>
-    <PropertyDef name="paySum">
+    <PropertyDef name="payMoney">
       <Property name="dataType">Double</Property>
       <Property name="label">缁撶畻鎬婚</Property>
       <Property name="displayFormat">锟�0.00</Property>
     </PropertyDef>
+    <PropertyDef name="settleWeight">
+      <Property name="dataType">Double</Property>
+      <Property name="label">缁撶畻閲嶉噺</Property>
+      <Property name="displayFormat">0 KG</Property>
+    </PropertyDef>
+    <PropertyDef name="payTime">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">缁撶畻鏃堕棿</Property>
+    </PropertyDef>
     <PropertyDef name="payType">
       <Property></Property>
-      <Property name="label">浠樻鏂瑰紡</Property>
+      <Property name="label">缁撶畻鏂瑰紡</Property>
       <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;PAY_TYPE&quot;)}</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;inoutSettlePR#triggerPayType&quot;).getResult()}</Property>
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+    </PropertyDef>
+    <PropertyDef name="payee">
+      <Property></Property>
+      <Property name="label">鏀舵浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="payeeId">
+      <Property></Property>
+      <Property name="label">鏀舵浜虹渷浠借瘉鍙�</Property>
     </PropertyDef>
     <PropertyDef name="bank">
       <Property></Property>
@@ -480,60 +526,29 @@
       <Property></Property>
       <Property name="label">閾惰鍗″彿</Property>
     </PropertyDef>
+    <PropertyDef name="payUnit">
+      <Property></Property>
+      <Property name="label">浠樻鍗曚綅</Property>
+    </PropertyDef>
     <PropertyDef name="payUser">
       <Property></Property>
       <Property name="label">缁撶畻浜�</Property>
     </PropertyDef>
-    <PropertyDef name="payTime">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">缁撶畻鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="settleWeight">
-      <Property name="dataType">Double</Property>
-      <Property name="label">缁撶畻閲嶉噺</Property>
-      <Property name="displayFormat">0 KG</Property>
-    </PropertyDef>
-    <PropertyDef name="fullWeight">
-      <Property name="dataType">Double</Property>
-      <Property name="label">姣涢噸</Property>
-      <Property name="displayFormat">0 KG</Property>
-    </PropertyDef>
-    <PropertyDef name="emptyWeight">
-      <Property name="dataType">Double</Property>
-      <Property name="label">鐨噸</Property>
-      <Property name="displayFormat">0 KG</Property>
-    </PropertyDef>
-    <PropertyDef name="netWeight">
-      <Property name="dataType">Double</Property>
-      <Property name="label">鍑�閲�</Property>
-      <Property name="displayFormat">0 KG</Property>
-    </PropertyDef>
-    <PropertyDef name="deSum">
-      <Property name="dataType">Double</Property>
-      <Property name="label">鎬绘墸閲�</Property>
-      <Property name="displayFormat">0 KG</Property>
-    </PropertyDef>
-    <PropertyDef name="type">
-      <Property></Property>
-      <Property name="label">鍑哄叆搴撶被鍨�</Property>
-    </PropertyDef>
-    <PropertyDef name="customerId">
-      <Property></Property>
-      <Property name="label">瀹㈡埛缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="customerName">
-      <Property></Property>
-      <Property name="label">瀹㈡埛鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="otherSum">
-      <Property></Property>
-      <Property name="label">鍏朵粬鎵ｈ垂</Property>
-      <Property name="dataType">Double</Property>
-      <Property name="displayFormat">锟�0.00</Property>
-    </PropertyDef>
     <PropertyDef name="remarks">
       <Property></Property>
       <Property name="label">澶囨敞淇℃伅</Property>
+    </PropertyDef>
+    <PropertyDef name="updateTime">
+      <Property name="dataType">Date</Property>
+      <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="bankCategory">
+      <Property/>
+      <Property name="label">閾惰琛屽埆浠ｇ爜</Property>
+    </PropertyDef>
+    <PropertyDef name="bankCode">
+      <Property/>
+      <Property name="label">寮�鎴疯鍙�</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtNoticeDto">
@@ -594,10 +609,10 @@
       <Property name="dataType">Date</Property>
     </PropertyDef>
     <PropertyDef name="unitName">
-      <Property/>
+      <Property></Property>
     </PropertyDef>
     <PropertyDef name="contractName">
-      <Property/>
+      <Property></Property>
       <Property name="label">鎵�灞炲悎鍚�</Property>
     </PropertyDef>
   </DataType>

--
Gitblit v1.9.3