From b1cd3679b7efeac6c1054ce4bcff2660bea332f4 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 14 八月 2023 17:15:02 +0800
Subject: [PATCH] 优化

---
 igds-core/src/main/java/models/igds.model.xml |   72 +++++++++++++++++++++--------------
 1 files changed, 43 insertions(+), 29 deletions(-)

diff --git a/igds-core/src/main/java/models/igds.model.xml b/igds-core/src/main/java/models/igds.model.xml
index c2e1770..3ac10d3 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>
@@ -562,6 +566,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">
@@ -894,6 +918,10 @@
         <Property name="valueProperty">name</Property>
       </Property>
     </PropertyDef>
+    <PropertyDef name="gasSer">
+      <Property></Property>
+      <Property name="label">姘斾綋鍒嗘満</Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtDicSlogan">
     <Property name="creationType">com.ld.igds.models.DicSlogan</Property>
@@ -1095,32 +1123,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">
@@ -1288,6 +1290,18 @@
     <PropertyDef name="type">
       <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>
+    <PropertyDef name="remark">
+      <Property></Property>
+      <Property name="label">澶囨敞淇℃伅</Property>
+    </PropertyDef>
   </DataType>
   <DataType name="dtFileData">
     <Property name="creationType">com.ld.igds.file.dto.FileData</Property>

--
Gitblit v1.9.3