From 37758b759bce63f0ed20d6c9c95b7ee9dda5224e Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 26 十一月 2025 18:30:56 +0800
Subject: [PATCH] 新增收储公司、库区页面，及相关逻辑调整

---
 fzzy-igdss-view/src/main/java/models/core.model.xml |   94 +++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 91 insertions(+), 3 deletions(-)

diff --git a/fzzy-igdss-view/src/main/java/models/core.model.xml b/fzzy-igdss-view/src/main/java/models/core.model.xml
index 599d8ff..fa3c9b0 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -11,7 +11,12 @@
     </PropertyDef>
     <PropertyDef name="status">
       <Property/>
-      <Property name="label">绯荤粺鐘舵��</Property>
+      <Property name="label">鏄惁鍚敤</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;dicPR#triggerYN&quot;).getResult(&quot;DEVICE_STATUS&quot;)}</Property>
+        <Property name="keyProperty">dictValue</Property>
+        <Property name="valueProperty">dictLabel</Property>
+      </Property>
     </PropertyDef>
     <PropertyDef name="remark">
       <Property/>
@@ -26,7 +31,7 @@
       <Property name="label">鍒涘缓浜�</Property>
     </PropertyDef>
     <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
+      <Property name="dataType">DateTime</Property>
       <Property name="label">鍒涘缓鏃堕棿</Property>
     </PropertyDef>
     <PropertyDef name="updateBy">
@@ -34,7 +39,7 @@
       <Property name="label">鏇存柊浜�</Property>
     </PropertyDef>
     <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
+      <Property name="dataType">DateTime</Property>
       <Property name="label">鏇存柊鏃堕棿</Property>
     </PropertyDef>
   </DataType>
@@ -60,4 +65,87 @@
       <Property name="label">鎴鏃堕棿</Property>
     </PropertyDef>
   </DataType>
+  <DataType name="dtArea">
+    <Property name="creationType">com.fzzy.igds.domain.DicArea</Property>
+    <PropertyDef name="code">
+      <Property></Property>
+      <Property name="label">鍖哄煙缂栫爜</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="name">
+      <Property></Property>
+      <Property name="label">鍚嶇О</Property>
+      <Property name="required">true</Property>
+    </PropertyDef>
+    <PropertyDef name="parentCode">
+      <Property></Property>
+      <Property name="label">鎵�灞炲尯鍩�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;dicAreaPR#getDicAreaByParentCode&quot;).getResult()}</Property>
+        <Property name="keyProperty">code</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="parentName">
+      <Property></Property>
+      <Property name="label">涓婄骇鍖哄煙</Property>
+      <Property name="required">false</Property>
+    </PropertyDef>
+    <PropertyDef name="type">
+      <Property></Property>
+      <Property name="label">绫诲瀷</Property>
+      <Property name="required">true</Property>
+      <Property name="mapping">
+        <Property name="keyProperty">value</Property>
+        <Property name="valueProperty">name</Property>
+        <Property name="mapValues">
+          <Collection>
+            <Entity>
+              <Property name="name">鐪�</Property>
+              <Property name="value">1</Property>
+            </Entity>
+            <Entity>
+              <Property name="name">甯�</Property>
+              <Property name="value">2</Property>
+            </Entity>
+            <Entity>
+              <Property name="name">鍖哄幙</Property>
+              <Property name="value">3</Property>
+            </Entity>
+          </Collection>
+        </Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="simple">
+      <Property></Property>
+      <Property name="label">绠�鎷�</Property>
+      <Property name="required">false</Property>
+    </PropertyDef>
+    <PropertyDef name="disabledTag">
+      <Property></Property>
+      <Property name="label">鏄惁绂佺敤</Property>
+      <Property name="required">false</Property>
+      <Property name="mapping">
+        <Property name="mapValues">
+          <Collection>
+            <Entity>
+              <Property name="name">绂佺敤</Property>
+              <Property name="value">Y</Property>
+            </Entity>
+            <Entity>
+              <Property name="name">鍚敤</Property>
+              <Property name="value">N</Property>
+            </Entity>
+          </Collection>
+        </Property>
+        <Property name="keyProperty">value</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="remark">
+      <Property></Property>
+      <Property name="label">澶囨敞</Property>
+      <Property name="required">false</Property>
+    </PropertyDef>
+  </DataType>
 </Model>

--
Gitblit v1.9.3