From 0e4aa52a6de100ab96408178927cfb22f7328e34 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期六, 15 七月 2023 22:20:19 +0800
Subject: [PATCH] 提交武汉黄陂军粮配置信息

---
 igds-core/src/main/java/models/igds.model.xml |  329 +++++++++++++++++++++++++++---------------------------
 1 files changed, 162 insertions(+), 167 deletions(-)

diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index e786bc0..c1570ad 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -188,18 +188,24 @@
     </PropertyDef>
     <PropertyDef name="buildingId">
       <Property></Property>
-      <Property name="label">鎵�灞炲缓绛�</Property>
+      <Property name="label">鎵�灞炰粨鎴�</Property>
       <Property name="mapping">
         <Property name="mapValues">${dorado.getDataProvider(&quot;buildingPR#getCacheBuilding&quot;).getResult()}</Property>
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+      <Property name="required">false</Property>
+    </PropertyDef>
+    <PropertyDef name="granaryId">
+      <Property></Property>
+      <Property name="label">鎵�灞炲粧闂�</Property>
+      <Property name="required">false</Property>
     </PropertyDef>
     <PropertyDef name="depotType">
       <Property></Property>
-      <Property name="label">浠撳簱绫诲瀷</Property>
+      <Property name="label">浠撴埧绫诲瀷</Property>
       <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_TYPE&quot;)}</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotType&quot;).getResult()}</Property>
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
@@ -209,20 +215,23 @@
       <Property></Property>
       <Property name="label">浠撳簱鐘舵��</Property>
       <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_STATUS&quot;)}</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotStatus&quot;).getResult()}</Property>
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="storageMax">
       <Property name="dataType">Double</Property>
-      <Property name="label">璁捐浠撳</Property>
+      <Property name="label">璁捐鍌ㄩ噺</Property>
       <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="storageReal">
       <Property name="dataType">Double</Property>
       <Property name="label">瀹為檯鍌ㄩ噺</Property>
       <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">false</Property>
     </PropertyDef>
     <PropertyDef name="storeType">
       <Property></Property>
@@ -233,10 +242,6 @@
         <Property name="valueProperty">name</Property>
       </Property>
       <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="orientation">
-      <Property></Property>
-      <Property name="label">浠撳簱鏈濆悜</Property>
     </PropertyDef>
     <PropertyDef name="foodType">
       <Property></Property>
@@ -260,7 +265,7 @@
       <Property></Property>
       <Property name="label">绮绛夌骇</Property>
       <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerFoodLevel&quot;).getResult()}</Property>
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
@@ -286,7 +291,7 @@
     </PropertyDef>
     <PropertyDef name="storeKeeper">
       <Property></Property>
-      <Property name="label">淇濈鍛樿处鍙�</Property>
+      <Property name="label">淇濈鍛�</Property>
     </PropertyDef>
     <PropertyDef name="storeKeeperName">
       <Property></Property>
@@ -294,7 +299,7 @@
     </PropertyDef>
     <PropertyDef name="checkDate">
       <Property name="dataType">Date</Property>
-      <Property name="label">璐ㄦ鏃ユ湡</Property>
+      <Property name="label">鏈�鍚庤川妫�鏃ユ湡</Property>
     </PropertyDef>
     <PropertyDef name="storeDate">
       <Property name="dataType">Date</Property>
@@ -308,21 +313,151 @@
       <Property></Property>
       <Property name="label">澶囨敞</Property>
     </PropertyDef>
-    <PropertyDef name="foodVarietyName">
+  </DataType>
+  <DataType name="dtDepotStore">
+    <Property name="creationType">com.ld.igds.models.DepotStore</Property>
+    <PropertyDef name="id">
       <Property></Property>
-      <Property name="label">绮鍝佺</Property>
     </PropertyDef>
-    <PropertyDef name="foodTypeName">
+    <PropertyDef name="companyId">
+      <Property></Property>
+      <Property name="label">缁勭粐缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="deptId">
+      <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>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="country">
+      <Property></Property>
+      <Property name="label">鍥藉埆</Property>
+    </PropertyDef>
+    <PropertyDef name="manageType">
+      <Property></Property>
+      <Property name="label">绠＄悊鏂瑰紡</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerManagerType&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="storeType">
+      <Property></Property>
+      <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStoreType&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="depotStatus">
+      <Property></Property>
+      <Property name="label">璐т綅鐘舵��</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerDepotStatus&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="foodType">
       <Property></Property>
       <Property name="label">绮鎬ц川</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+      <Property name="required">true</Property>
     </PropertyDef>
-    <PropertyDef name="depotTypeName">
+    <PropertyDef name="foodVariety">
       <Property></Property>
-      <Property name="label">浠撳簱绫诲瀷</Property>
+      <Property name="label">绮鍝佺</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>
     </PropertyDef>
-    <PropertyDef name="foodLevelName">
+    <PropertyDef name="foodLevel">
       <Property></Property>
       <Property name="label">绮绛夌骇</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerFoodLevel&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="foodLocationId">
+      <Property></Property>
+      <Property name="label">绮浜у湴</Property>
+    </PropertyDef>
+    <PropertyDef name="foodLocation">
+      <Property></Property>
+      <Property name="label">绮浜у湴</Property>
+    </PropertyDef>
+    <PropertyDef name="foodYear">
+      <Property></Property>
+      <Property name="label">鏀惰揣骞村害</Property>
+    </PropertyDef>
+    <PropertyDef name="storeDate">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鍏ヤ粨鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="storageReal">
+      <Property name="dataType">Double</Property>
+      <Property name="label">瀹為檯鍌ㄩ噺</Property>
+      <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="storageSettle">
+      <Property name="dataType">Double</Property>
+      <Property name="label">璁′环鏁伴噺</Property>
+      <Property name="displayFormat">#,##0 KG</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="fullDate">
+      <Property name="dataType">Date</Property>
+      <Property name="label">灏佷粨鏃ユ湡</Property>
+    </PropertyDef>
+    <PropertyDef name="outDate">
+      <Property name="label">鍑轰粨瀹屾垚鏃堕棿</Property>
+      <Property name="dataType">DateTime</Property>
+    </PropertyDef>
+    <PropertyDef name="grainHeight">
+      <Property name="dataType">Double</Property>
+      <Property name="label">瑁呯伯绾块珮</Property>
+      <Property name="displayFormat">0.00 绫�</Property>
+    </PropertyDef>
+    <PropertyDef name="grainVolume">
+      <Property name="dataType">Double</Property>
+      <Property name="label">瑁呯伯浣撶Н</Property>
+      <Property name="displayFormat">0.00 绔嬫柟绫�</Property>
+    </PropertyDef>
+    <PropertyDef name="remark">
+      <Property></Property>
+      <Property name="label">澶囨敞</Property>
+    </PropertyDef>
+    <PropertyDef name="updateUser">
+      <Property></Property>
+      <Property name="label">淇敼浜�</Property>
+    </PropertyDef>
+    <PropertyDef name="updateDate">
+      <Property name="dataType">Date</Property>
+      <Property name="label">淇敼鏃堕棿</Property>
+    </PropertyDef>
+    <PropertyDef name="createDate">
+      <Property name="dataType">Date</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtDevice">
@@ -759,6 +894,10 @@
         <Property name="valueProperty">name</Property>
       </Property>
     </PropertyDef>
+    <PropertyDef name="gasSer">
+      <Property/>
+      <Property name="label">姘斾綋鍒嗘満</Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtDicSlogan">
     <Property name="creationType">com.ld.igds.models.DicSlogan</Property>
@@ -960,32 +1099,6 @@
       <Property name="label">椤甸潰涓殑鍧愭爣</Property>
     </PropertyDef>
   </DataType>
-  <DataType name="dtFoodOrigin">
-    <Property name="creationType">com.ld.igds.models.DicFoodOrigin</Property>
-    <PropertyDef name="id">
-      <Property name="dataType">int</Property>
-    </PropertyDef>
-    <PropertyDef name="code">
-      <Property></Property>
-      <Property name="label">浜у湴缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="name">
-      <Property></Property>
-      <Property name="label">浜у湴鍚嶇О</Property>
-    </PropertyDef>
-    <PropertyDef name="sort">
-      <Property name="dataType">int</Property>
-      <Property name="label">鎺掑簭</Property>
-    </PropertyDef>
-    <PropertyDef name="simple">
-      <Property></Property>
-      <Property name="label">浜у湴绠�鎷�</Property>
-    </PropertyDef>
-    <PropertyDef name="disabledTag">
-      <Property></Property>
-      <Property name="label">鏄惁绂佺敤</Property>
-    </PropertyDef>
-  </DataType>
   <DataType name="dtSecFire">
     <Property name="creationType">com.ld.igds.models.SecFire</Property>
     <PropertyDef name="id">
@@ -1153,135 +1266,17 @@
     <PropertyDef name="type">
       <Property name="label">绫诲瀷</Property>
     </PropertyDef>
-  </DataType>
-  <DataType name="dtDepotStore">
-    <Property name="creationType">com.ld.igds.models.DepotStore</Property>
-    <PropertyDef name="id">
+    <PropertyDef name="simple">
       <Property></Property>
+      <Property name="label">绠�鎷�</Property>
     </PropertyDef>
-    <PropertyDef name="companyId">
+    <PropertyDef name="disabledTag">
       <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="deptId">
-      <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>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="storeType">
-      <Property></Property>
-      <Property name="label">鍌ㄧ伯鏂瑰紡</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#triggerStoreType&quot;).getResult()}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="depotStatus">
-      <Property></Property>
-      <Property name="label">浠撳簱鐘舵��</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;DEPOT_STATUS&quot;)}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodType">
-      <Property></Property>
-      <Property name="label">绮鎬ц川</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodVariety">
-      <Property></Property>
-      <Property name="label">绮鍝佺</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="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodLevel">
-      <Property></Property>
-      <Property name="label">绮绛夌骇</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
-        <Property name="keyProperty">code</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodLocation">
-      <Property></Property>
-      <Property name="label">绮浜у湴</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="foodYear">
-      <Property></Property>
-      <Property name="label">鏀惰揣骞村害</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="storeDate">
-      <Property name="dataType">DateTime</Property>
-      <Property name="label">鍏ヤ粨鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="storageReal">
-      <Property name="dataType">Double</Property>
-      <Property name="label">瀹為檯鍌ㄩ噺</Property>
-      <Property name="displayFormat">#,##0 KG</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="fullDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">灏佷粨鏃ユ湡</Property>
-    </PropertyDef>
-    <PropertyDef name="outDate">
-      <Property name="label">鍑轰粨鏃堕棿</Property>
-      <Property name="dataType">DateTime</Property>
-    </PropertyDef>
-    <PropertyDef name="grainHeight">
-      <Property name="dataType">Double</Property>
-      <Property name="label">瑁呯伯绾块珮</Property>
-      <Property name="displayFormat">0.00 绫�</Property>
-      <Property name="required">true</Property>
-    </PropertyDef>
-    <PropertyDef name="grainVolume">
-      <Property name="dataType">Double</Property>
-      <Property name="label">瑁呯伯浣撶Н</Property>
-      <Property name="displayFormat">0.00 绔嬫柟绫�</Property>
-      <Property name="required">true</Property>
+      <Property name="label">鏄惁绂佺敤</Property>
     </PropertyDef>
     <PropertyDef name="remark">
       <Property></Property>
-      <Property name="label">澶囨敞</Property>
-    </PropertyDef>
-    <PropertyDef name="updateUser">
-      <Property></Property>
-      <Property name="label">淇敼浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">淇敼鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="createDate">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
+      <Property name="label">澶囨敞淇℃伅</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtFileData">

--
Gitblit v1.9.3