From 27ab62f7d980e13e3fe5cd3ac5a979c7d5fc92b7 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 15 一月 2026 11:04:42 +0800
Subject: [PATCH] 库区，仓库联动查询修改

---
 fzzy-igdss-view/src/main/java/models/core.model.xml |   47 ++++++++++++++++++++++++++---------------------
 1 files changed, 26 insertions(+), 21 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 bf31da5..b5a16e7 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>
@@ -879,16 +885,6 @@
       <Property name="dataType">Integer</Property>
       <Property name="label">璧峰鏍瑰彿</Property>
     </PropertyDef>
-    <PropertyDef name="diameter">
-      <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="grainAuto">
       <Property></Property>
       <Property name="label">绮儏浼樺寲</Property>
@@ -967,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>
@@ -1409,6 +1410,10 @@
       <Property></Property>
       <Property name="label">鎾斁璺緞</Property>
     </PropertyDef>
+    <PropertyDef name="plateNumUrl">
+      <Property></Property>
+      <Property name="label">杞︾墝璇嗗埆璺緞</Property>
+    </PropertyDef>
     <PropertyDef name="remark">
       <Property></Property>
       <Property name="label">澶囨敞</Property>

--
Gitblit v1.9.3