From cc053094a4576b19e1fbca448bb1f966056bfd1e Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 16 八月 2023 16:24:57 +0800
Subject: [PATCH] 更改合同信息

---
 igds-core/src/main/java/models/igds.model.xml |   76 +++++++++++++++++++++++++++++++++++---
 1 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index ad7405b..68c3feb 100644
--- a/igds-core/src/main/java/models/igds.model.xml
+++ b/igds-core/src/main/java/models/igds.model.xml
@@ -154,6 +154,10 @@
         <Property name="valueProperty">name</Property>
       </Property>
     </PropertyDef>
+    <PropertyDef name="ggm">
+      <Property></Property>
+      <Property name="label">鍥借鐮�</Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtDepot">
     <Property name="creationType">com.ld.igds.models.Depot</Property>
@@ -194,12 +198,12 @@
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
-      <Property name="required">true</Property>
+      <Property name="required">false</Property>
     </PropertyDef>
     <PropertyDef name="granaryId">
       <Property></Property>
       <Property name="label">鎵�灞炲粧闂�</Property>
-      <Property name="required">true</Property>
+      <Property name="required">false</Property>
     </PropertyDef>
     <PropertyDef name="depotType">
       <Property></Property>
@@ -231,7 +235,7 @@
       <Property name="dataType">Double</Property>
       <Property name="label">瀹為檯鍌ㄩ噺</Property>
       <Property name="displayFormat">#,##0 KG</Property>
-      <Property name="required">true</Property>
+      <Property name="required">false</Property>
     </PropertyDef>
     <PropertyDef name="storeType">
       <Property></Property>
@@ -340,6 +344,42 @@
     <PropertyDef name="country">
       <Property></Property>
       <Property name="label">鍥藉埆</Property>
+      <Property name="mapping">
+        <Property name="keyProperty">key</Property>
+        <Property name="valueProperty">value</Property>
+        <Property name="mapValues">
+          <Collection>
+            <Entity>
+              <Property name="key">156</Property>
+              <Property name="value">涓浗</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">076</Property>
+              <Property name="value">宸磋タ</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">124</Property>
+              <Property name="value">鍔犳嬁澶�</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">036</Property>
+              <Property name="value">婢冲ぇ鍒╀簹</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">356</Property>
+              <Property name="value">鍗板害</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">764</Property>
+              <Property name="value">娉板浗</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">840</Property>
+              <Property name="value">缇庡浗</Property>
+            </Entity>
+          </Collection>
+        </Property>
+      </Property>
     </PropertyDef>
     <PropertyDef name="manageType">
       <Property></Property>
@@ -562,6 +602,26 @@
     <PropertyDef name="locationName">
       <Property></Property>
       <Property name="label">浣嶇疆</Property>
+    </PropertyDef>
+    <PropertyDef name="modbus">
+      <Property/>
+      <Property name="label">Modbus閰嶇疆</Property>
+    </PropertyDef>
+    <PropertyDef name="ext1">
+      <Property/>
+      <Property name="label">鎵╁睍瀛楁1</Property>
+    </PropertyDef>
+    <PropertyDef name="ext2">
+      <Property/>
+      <Property name="label">鎵╁睍瀛楁2</Property>
+    </PropertyDef>
+    <PropertyDef name="ext3">
+      <Property/>
+      <Property name="label">鎵╁睍瀛楁3</Property>
+    </PropertyDef>
+    <PropertyDef name="statusName">
+      <Property/>
+      <Property name="label">褰撳墠鐘舵��</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtDeviceSer">
@@ -893,6 +953,10 @@
         <Property name="keyProperty">code</Property>
         <Property name="valueProperty">name</Property>
       </Property>
+    </PropertyDef>
+    <PropertyDef name="gasSer">
+      <Property></Property>
+      <Property name="label">姘斾綋鍒嗘満</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtDicSlogan">
@@ -1263,15 +1327,15 @@
       <Property name="label">绫诲瀷</Property>
     </PropertyDef>
     <PropertyDef name="simple">
-      <Property/>
+      <Property></Property>
       <Property name="label">绠�鎷�</Property>
     </PropertyDef>
     <PropertyDef name="disabledTag">
-      <Property/>
+      <Property></Property>
       <Property name="label">鏄惁绂佺敤</Property>
     </PropertyDef>
     <PropertyDef name="remark">
-      <Property/>
+      <Property></Property>
       <Property name="label">澶囨敞淇℃伅</Property>
     </PropertyDef>
   </DataType>

--
Gitblit v1.9.3