From 164a53adaed58ad0519bc214b08c0bfb287723f4 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期三, 21 一月 2026 14:40:45 +0800
Subject: [PATCH] 数据导入提交2

---
 fzzy-igdss-view/src/main/java/models/core.model.xml |   74 ++++++++++++++++++++++++++++--------
 1 files changed, 57 insertions(+), 17 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 88a3068..adf1ee5 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -229,15 +229,6 @@
         <Property name="valueProperty">dictLabel</Property>
       </Property>
     </PropertyDef>
-    <PropertyDef name="pledgeBank">
-      <Property></Property>
-      <Property name="label">鐩戠閾惰</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;bankPR#listAll&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
     <PropertyDef name="storageMax">
       <Property name="dataType">Double</Property>
       <Property name="label">璁捐鍌ㄩ噺</Property>
@@ -302,7 +293,22 @@
     <PropertyDef name="bulkWeight">
       <Property name="dataType">Double</Property>
       <Property name="label">瀹归噸</Property>
-      <Property name="displayFormat">0.0 g/L</Property>
+      <Property name="displayFormat">#0.00 g/L</Property>
+    </PropertyDef>
+    <PropertyDef name="length">
+      <Property name="dataType">Double</Property>
+      <Property name="label">闀垮害/鐩村緞</Property>
+      <Property name="displayFormat">#0.00 绫�</Property>
+    </PropertyDef>
+    <PropertyDef name="width">
+      <Property name="dataType">Double</Property>
+      <Property name="label">瀹藉害</Property>
+      <Property name="displayFormat">#0.00 绫�</Property>
+    </PropertyDef>
+    <PropertyDef name="height">
+      <Property name="dataType">Double</Property>
+      <Property name="label">楂樺害</Property>
+      <Property name="displayFormat">#0.00 绫�</Property>
     </PropertyDef>
     <PropertyDef name="storeKeeper">
       <Property></Property>
@@ -787,7 +793,6 @@
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
-      <Property name="required">true</Property>
     </PropertyDef>
     <PropertyDef name="thSer">
       <Property></Property>
@@ -958,12 +963,17 @@
     <PropertyDef name="deptId">
       <Property></Property>
       <Property name="label">鎵�灞炲簱鍖�</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getDeptByUserType&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">kqmc</Property>
+      </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="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
         <Property name="keyProperty">id</Property>
         <Property name="valueProperty">name</Property>
       </Property>
@@ -1076,11 +1086,10 @@
     <PropertyDef name="depotIds">
       <Property></Property>
       <Property name="label">璐ㄦ娂浠撳簱</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getDataByCompanyId&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
+    </PropertyDef>
+    <PropertyDef name="depotNames">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂浠撳簱</Property>
     </PropertyDef>
     <PropertyDef name="pledgeBank">
       <Property></Property>
@@ -1400,6 +1409,10 @@
     <PropertyDef name="playUrl">
       <Property></Property>
       <Property name="label">鎾斁璺緞</Property>
+    </PropertyDef>
+    <PropertyDef name="plateNumUrl">
+      <Property></Property>
+      <Property name="label">杞︾墝璇嗗埆璺緞</Property>
     </PropertyDef>
     <PropertyDef name="remark">
       <Property></Property>
@@ -2007,4 +2020,31 @@
       <Property name="label">楦熺灠鍥�</Property>
     </PropertyDef>
   </DataType>
+  <DataType name="dtSysUser">
+    <Property name="creationType">com.ruoyi.common.core.domain.entity.SysUser</Property>
+    <PropertyDef name="companyId">
+      <Property/>
+    </PropertyDef>
+    <PropertyDef name="userId">
+      <Property name="dataType">Long</Property>
+    </PropertyDef>
+    <PropertyDef name="deptId">
+      <Property name="dataType">Long</Property>
+    </PropertyDef>
+    <PropertyDef name="parentId">
+      <Property name="dataType">Long</Property>
+    </PropertyDef>
+    <PropertyDef name="roleId">
+      <Property name="dataType">Long</Property>
+    </PropertyDef>
+    <PropertyDef name="loginName">
+      <Property/>
+    </PropertyDef>
+    <PropertyDef name="userName">
+      <Property/>
+    </PropertyDef>
+    <PropertyDef name="userType">
+      <Property/>
+    </PropertyDef>
+  </DataType>
 </Model>

--
Gitblit v1.9.3