From f27f3ea5055888f7f1c797d0fd7fb26a2013c89c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:40:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/models/inout.model.xml |  188 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 135 insertions(+), 53 deletions(-)

diff --git a/igds-inout/src/main/java/models/inout.model.xml b/igds-inout/src/main/java/models/inout.model.xml
index c172533..f0077c3 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(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;KHKHH&quot;)}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
     </PropertyDef>
     <PropertyDef name="bankNum">
       <Property></Property>
@@ -68,6 +73,43 @@
     <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(&quot;deptPR#loadParents&quot;).getResult()}</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="khlx">
+      <Property></Property>
+      <Property name="label">瀹㈡埛绫诲瀷</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;contractManagePR#triggerCustomerType&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="khbh">
+      <Property></Property>
+      <Property name="label">瀹㈡埛缂栫爜</Property>
+      <Property name="required">true</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">
@@ -353,6 +395,11 @@
     <PropertyDef name="sampleType">
       <Property></Property>
       <Property name="label">鎵︽牱鏂瑰紡</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerSampleType&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
     </PropertyDef>
     <PropertyDef name="deCheck">
       <Property name="dataType">double</Property>
@@ -409,24 +456,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>
@@ -436,60 +529,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">
@@ -510,6 +572,12 @@
     </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="customerId">
       <Property></Property>
@@ -520,12 +588,19 @@
     </PropertyDef>
     <PropertyDef name="foodVariety">
       <Property></Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</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>
@@ -536,5 +611,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