From 10373a585e3d1d04a7eddb2e3297eeeb2c729e71 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 28 八月 2023 09:29:51 +0800
Subject: [PATCH] 更新MODBUS-TCP协议，调整配置
---
igds-inout/src/main/java/models/inout.model.xml | 312 +++++++++++++++++++++++++++++++++------------------
1 files changed, 201 insertions(+), 111 deletions(-)
diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index c356dfd..0ca54b0 100644
--- a/igds-inout/src/main/java/models/inout.model.xml
+++ b/igds-inout/src/main/java/models/inout.model.xml
@@ -9,7 +9,7 @@
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
- <Property name="label">瀹㈡埛绫诲瀷</Property>
+ <Property name="label">涓氬姟鍒嗙被</Property>
<Property name="mapping">
<Property name="mapValues">
<Collection>
@@ -34,12 +34,12 @@
</PropertyDef>
<PropertyDef name="name">
<Property></Property>
- <Property name="label">鍗曚綅鍚嶅悕绉�</Property>
+ <Property name="label">瀹㈡埛鍚嶇О</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="cardId">
<Property></Property>
- <Property name="label">韬唤璇佸彿</Property>
+ <Property name="label">鑱旂郴浜鸿韩浠借瘉鍙�</Property>
</PropertyDef>
<PropertyDef name="address">
<Property></Property>
@@ -56,6 +56,11 @@
<PropertyDef name="bank">
<Property></Property>
<Property name="label">寮�鎴烽摱琛�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("KHKHH")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="bankNum">
<Property></Property>
@@ -68,6 +73,40 @@
<PropertyDef name="deptId">
<Property></Property>
<Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="khlx">
+ <Property></Property>
+ <Property name="label">瀹㈡埛绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("contractManagePR#triggerCustomerType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="khbh">
+ <Property></Property>
+ <Property name="label">瀹㈡埛缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="fddbr">
+ <Property></Property>
+ <Property name="label">娉曞畾浠ｈ〃浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="yzbm">
+ <Property></Property>
+ <Property name="label">閭斂缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="dzyx">
+ <Property></Property>
+ <Property name="label">鐢靛瓙淇＄</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtInoutRecord">
@@ -156,14 +195,6 @@
<Property></Property>
<Property name="label">杩愯緭鏂瑰紡</Property>
</PropertyDef>
- <PropertyDef name="specType">
- <Property></Property>
- <Property name="label">瑙勬牸</Property>
- </PropertyDef>
- <PropertyDef name="customerId">
- <Property></Property>
- <Property name="label">寰�鏉ュ崟浣岻D</Property>
- </PropertyDef>
<PropertyDef name="customerName">
<Property></Property>
<Property name="label">寰�鏉ュ崟浣�</Property>
@@ -178,26 +209,6 @@
<Property name="label">绮骞翠唤</Property>
<Property name="required">true</Property>
</PropertyDef>
- <PropertyDef name="impurity">
- <Property name="dataType">Double</Property>
- <Property name="label">鏉傝川</Property>
- <Property name="displayFormat">0.00 %</Property>
- </PropertyDef>
- <PropertyDef name="wet">
- <Property name="dataType">Double</Property>
- <Property name="label">姘村垎</Property>
- <Property name="displayFormat">0.00 %</Property>
- </PropertyDef>
- <PropertyDef name="deImpurity">
- <Property name="dataType">Double</Property>
- <Property name="label">鏉傝川鎵ｉ噸</Property>
- <Property name="displayFormat">0.0 KG</Property>
- </PropertyDef>
- <PropertyDef name="deWet">
- <Property name="dataType">Double</Property>
- <Property name="label">姘村垎澧為噸</Property>
- <Property name="displayFormat">0.0 KG</Property>
- </PropertyDef>
<PropertyDef name="deHandle">
<Property name="dataType">Double</Property>
<Property name="label">鍊间粨鎵ｉ噸</Property>
@@ -206,11 +217,6 @@
<PropertyDef name="deOther">
<Property name="dataType">Double</Property>
<Property name="label">鍏朵粬鎵ｉ噸</Property>
- <Property name="displayFormat">0.0 KG</Property>
- </PropertyDef>
- <PropertyDef name="deSum">
- <Property name="dataType">Double</Property>
- <Property name="label">鎬绘墸閲�</Property>
<Property name="displayFormat">0.0 KG</Property>
</PropertyDef>
<PropertyDef name="fullWeight">
@@ -271,7 +277,7 @@
</PropertyDef>
<PropertyDef name="completeTime">
<Property name="dataType">DateTime</Property>
- <Property name="label">瀹屾垚鏃堕棿</Property>
+ <Property name="label">绂诲簱鏃堕棿</Property>
<Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="completeUser">
@@ -336,7 +342,7 @@
</PropertyDef>
<PropertyDef name="foodLevel">
<Property></Property>
- <Property name="label">绮绛夌骇</Property>
+ <Property name="label">绮瀹氱瓑</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
<Property name="keyProperty">code</Property>
@@ -345,23 +351,16 @@
</PropertyDef>
<PropertyDef name="checkUser">
<Property></Property>
- <Property name="label">鍖栭獙浜�</Property>
+ <Property name="label">璐ㄦ浜�</Property>
</PropertyDef>
<PropertyDef name="checkId">
<Property></Property>
<Property name="label">鍖栭獙鍗曞彿</Property>
</PropertyDef>
- <PropertyDef name="curStorage">
- <Property name="dataType">double</Property>
- <Property name="label">褰撳墠搴撳瓨</Property>
- </PropertyDef>
<PropertyDef name="price">
<Property name="dataType">double</Property>
- <Property name="label">鍗曚环</Property>
- </PropertyDef>
- <PropertyDef name="settleMoney">
- <Property name="dataType">double</Property>
- <Property name="label">缁撶畻閲戦</Property>
+ <Property name="label">绮瀹氫环</Property>
+ <Property name="displayFormat">#.00 鍏�/鍏枻</Property>
</PropertyDef>
<PropertyDef name="foodType">
<Property></Property>
@@ -371,21 +370,77 @@
<Property></Property>
<Property name="label">閫氱煡鍗曠紪鐮�</Property>
</PropertyDef>
- <PropertyDef name="noticeName">
- <Property></Property>
- <Property name="label">閫氱煡鍗�</Property>
- </PropertyDef>
- <PropertyDef name="price">
- <Property name="dataType">Double</Property>
- <Property name="label">鍗曚环</Property>
- <Property name="displayFormat">#.00 鍏�/鍏枻</Property>
- </PropertyDef>
- <PropertyDef name="settleTag">
- <Property></Property>
- <Property name="label">鏄惁缁撶畻</Property>
- </PropertyDef>
<PropertyDef name="remarks">
<Property name="label">澶囨敞璇存槑</Property>
+ </PropertyDef>
+ <PropertyDef name="foodLocationId">
+ <Property></Property>
+ <Property name="label">浜у湴鍚嶇О浠ｇ爜</Property>
+ </PropertyDef>
+ <PropertyDef name="checkTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璐ㄦ鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="sampleUser">
+ <Property></Property>
+ <Property name="label">鎵︽牱浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="sampleTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鎵︽牱鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="sampleType">
+ <Property></Property>
+ <Property name="label">鎵︽牱鏂瑰紡</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerSampleType").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="deCheck">
+ <Property name="dataType">double</Property>
+ <Property name="label">璐ㄦ鎵ｉ噸</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="addCheck">
+ <Property name="dataType">double</Property>
+ <Property name="label">璐ㄦ澧為噸</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="jjlx">
+ <Property></Property>
+ <Property name="label">妫�鏂ょ被鍨�</Property>
+ </PropertyDef>
+ <PropertyDef name="dePackage">
+ <Property name="dataType">double</Property>
+ <Property name="label">鍖呰鎵ｉ噸</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="deOtherInfo">
+ <Property></Property>
+ <Property name="label">鍏朵粬鎵ｉ噸鍘熷洜</Property>
+ </PropertyDef>
+ <PropertyDef name="settleId">
+ <Property></Property>
+ <Property name="label">缁撶畻鍗曞彿</Property>
+ </PropertyDef>
+ <PropertyDef name="bzw">
+ <Property></Property>
+ <Property name="label">鍖呰鐗�</Property>
+ </PropertyDef>
+ <PropertyDef name="dbz">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鍗曞寘閲�</Property>
+ <Property name="displayFormat">0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="bzbjs">
+ <Property name="dataType">int</Property>
+ <Property name="label">鍖呬欢鏁�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
</PropertyDef>
</DataType>
<DataType name="dtInoutSettle">
@@ -398,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("depotPR#getAllCache").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("dicTriggerPR#dicTrigger").getResult("PAY_TYPE")}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("inoutSettlePR#triggerPayType").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>
@@ -425,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">
@@ -499,6 +569,12 @@
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
+ <Property name="label">鎵�娑変粨搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="customerId">
<Property></Property>
@@ -509,12 +585,19 @@
</PropertyDef>
<PropertyDef name="foodVariety">
<Property></Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="label">绮鍝佺</Property>
</PropertyDef>
<PropertyDef name="foodType">
<Property></Property>
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
+ <Property name="label">骞翠唤</Property>
</PropertyDef>
<PropertyDef name="targetNumber">
<Property name="dataType">double</Property>
@@ -525,5 +608,12 @@
<PropertyDef name="completeTime">
<Property name="dataType">Date</Property>
</PropertyDef>
+ <PropertyDef name="unitName">
+ <Property></Property>
+ </PropertyDef>
+ <PropertyDef name="contractName">
+ <Property></Property>
+ <Property name="label">鎵�灞炲悎鍚�</Property>
+ </PropertyDef>
</DataType>
</Model>
--
Gitblit v1.9.3