From 1eddf64a7104dcd06065e8ac309eebc42c24fb05 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 27 三月 2026 14:29:56 +0800
Subject: [PATCH] 出入库记录导入，判重兜底校验纠正

---
 fzzy-igdss-view/src/main/java/models/core.model.xml |  314 ++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 240 insertions(+), 74 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 69a5b44..f1e741b 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>
@@ -1073,6 +1083,14 @@
         <Property name="minLength">1</Property>
       </Validator>
     </PropertyDef>
+    <PropertyDef name="depotIds">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂浠撳簱</Property>
+    </PropertyDef>
+    <PropertyDef name="depotNames">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂浠撳簱</Property>
+    </PropertyDef>
     <PropertyDef name="pledgeBank">
       <Property></Property>
       <Property name="label">鎵�灞為摱琛�</Property>
@@ -1110,7 +1128,7 @@
         <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
         <Property name="valueProperty">kqmc</Property>
       </Property>
-      <Property name="required">true</Property>
+      <Property name="required">false</Property>
     </PropertyDef>
     <PropertyDef name="signTime">
       <Property name="dataType">Date</Property>
@@ -1151,6 +1169,55 @@
     <PropertyDef name="updateTime">
       <Property name="dataType">Date</Property>
       <Property name="label">鏇存柊鏃堕棿</Property>
+    </PropertyDef>
+    <Reference name="depotData">
+      <Property name="parameter">$${this.id}</Property>
+      <Property name="dataProvider">pledgeContractPR#listAllData</Property>
+      <Property name="dataType">[dtPledgeContractDepot]</Property>
+    </Reference>
+  </DataType>
+  <DataType name="dtPledgeContractDepot">
+    <Property name="creationType">com.fzzy.igds.domain.PledgeContractDepot</Property>
+    <PropertyDef name="companyId">
+      <Property></Property>
+      <Property name="label">缁勭粐缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="createBy">
+      <Property></Property>
+    </PropertyDef>
+    <PropertyDef name="createTime">
+      <Property name="dataType">Date</Property>
+    </PropertyDef>
+    <PropertyDef name="updateBy">
+      <Property></Property>
+    </PropertyDef>
+    <PropertyDef name="updateTime">
+      <Property name="dataType">Date</Property>
+    </PropertyDef>
+    <PropertyDef name="id">
+      <Property></Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeId">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂鍚堝悓Id</Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeDept">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂搴撳尯</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">kqmc</Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="pledgeDepot">
+      <Property></Property>
+      <Property name="label">璐ㄦ娂浠撳簱</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getData&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">name</Property>
+      </Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtSnapRecord">
@@ -1206,65 +1273,6 @@
     <PropertyDef name="imgPath">
       <Property></Property>
       <Property name="label">鐓х墖璺緞</Property>
-    </PropertyDef>
-  </DataType>
-  <DataType name="dtSnapConf">
-    <Property name="creationType">com.fzzy.igds.domain.SnapConf</Property>
-    <PropertyDef name="companyId">
-      <Property></Property>
-      <Property name="label">缁勭粐缂栫爜</Property>
-    </PropertyDef>
-    <PropertyDef name="createBy">
-      <Property></Property>
-      <Property name="label">鍒涘缓浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="createTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鍒涘缓鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="updateBy">
-      <Property></Property>
-      <Property name="label">鏇存柊浜�</Property>
-    </PropertyDef>
-    <PropertyDef name="updateTime">
-      <Property name="dataType">Date</Property>
-      <Property name="label">鏇存柊鏃堕棿</Property>
-    </PropertyDef>
-    <PropertyDef name="id">
-      <Property></Property>
-    </PropertyDef>
-    <PropertyDef name="deptId">
-      <Property></Property>
-      <Property name="label">鎵�灞炲簱鍖�</Property>
-      <Property name="mapping">
-        <Property name="valueProperty">kqmc</Property>
-        <Property name="mapValues">${dorado.getDataProvider(&quot;deptPR#getAllData&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="cameraId">
-      <Property></Property>
-      <Property name="label">鎶撴媿鐩戞帶</Property>
-      <Property name="mapping">
-        <Property name="mapValues">${dorado.getDataProvider(&quot;secCameraPR#listCamera&quot;).getResult()}</Property>
-        <Property name="keyProperty">id</Property>
-        <Property name="valueProperty">name</Property>
-      </Property>
-    </PropertyDef>
-    <PropertyDef name="actHour1">
-      <Property name="dataType">int</Property>
-      <Property name="label">绗竴娆�</Property>
-      <Property name="displayFormat"># 鐐�</Property>
-    </PropertyDef>
-    <PropertyDef name="actHour2">
-      <Property name="dataType">int</Property>
-      <Property name="label">绗簩娆�</Property>
-      <Property name="displayFormat"># 鐐�</Property>
-    </PropertyDef>
-    <PropertyDef name="actHour3">
-      <Property name="dataType">int</Property>
-      <Property name="label">绗笁娆�</Property>
-      <Property name="displayFormat"># 鐐�</Property>
     </PropertyDef>
   </DataType>
   <DataType name="dtNoticeDto">
@@ -1450,6 +1458,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>
@@ -1902,11 +1914,11 @@
       <Property name="label">宸￠�讳汉</Property>
     </PropertyDef>
     <PropertyDef name="start">
-      <Property name="dataType">DateTime</Property>
+      <Property name="dataType">Time</Property>
       <Property name="label">鐝璧峰鏃堕棿</Property>
     </PropertyDef>
     <PropertyDef name="end">
-      <Property name="dataType">DateTime</Property>
+      <Property name="dataType">Time</Property>
       <Property name="label">鐝鎴鏃堕棿</Property>
     </PropertyDef>
     <PropertyDef name="remark">
@@ -1930,4 +1942,158 @@
       <Property name="label">鏇存柊鏃堕棿</Property>
     </PropertyDef>
   </DataType>
+  <DataType name="dtDept">
+    <Property name="creationType">com.fzzy.igds.domain.Dept</Property>
+    <PropertyDef name="id">
+      <Property></Property>
+      <Property name="label">搴撳尯缂栫爜</Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="parentId">
+      <Property></Property>
+      <Property name="label">鏀跺偍鍏徃</Property>
+      <Property name="mapping">
+        <Property name="mapValues">${dorado.getDataProvider(&quot;companyPR#getData&quot;).getResult()}</Property>
+        <Property name="keyProperty">id</Property>
+        <Property name="valueProperty">dwmc</Property>
+      </Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="companyId">
+      <Property></Property>
+      <Property name="label">缁勭粐缂栫爜</Property>
+    </PropertyDef>
+    <PropertyDef name="kqmc">
+      <Property></Property>
+      <Property name="label">搴撳尯鍚嶇О</Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="kqdz">
+      <Property></Property>
+      <Property name="label">搴撳尯鍦板潃</Property>
+    </PropertyDef>
+    <PropertyDef name="xzqhdm">
+      <Property></Property>
+      <Property name="label">鍖哄垝浠ｇ爜</Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="xzqhmc">
+      <Property></Property>
+      <Property name="label">鎵�鍦ㄥ尯鍘�</Property>
+    </PropertyDef>
+    <PropertyDef name="kqcq">
+      <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">1</Property>
+              <Property name="value">1-鑷湁</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">2</Property>
+              <Property name="value">2-绉熻祦</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">3</Property>
+              <Property name="value">3-鍏辨湁</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">4</Property>
+              <Property name="value">4-娣峰悎</Property>
+            </Entity>
+            <Entity>
+              <Property name="key">9</Property>
+              <Property name="value">9-鍏朵粬</Property>
+            </Entity>
+          </Collection>
+        </Property>
+      </Property>
+    </PropertyDef>
+    <PropertyDef name="yxcr">
+      <Property name="dataType">Double</Property>
+      <Property name="label">鏈夋晥浠撳</Property>
+      <Property name="displayFormat">#0.000 鍚�</Property>
+    </PropertyDef>
+    <PropertyDef name="zdmj">
+      <Property name="dataType">Double</Property>
+      <Property name="label">鍗犲湴闈㈢Н</Property>
+      <Property name="displayFormat">#0.000 骞虫柟绫�</Property>
+    </PropertyDef>
+    <PropertyDef name="cfs">
+      <Property name="dataType">Integer</Property>
+      <Property name="label">浠撳簱鏁�</Property>
+      <Property name="displayFormat">#0 鏍�</Property>
+    </PropertyDef>
+    <PropertyDef name="jd">
+      <Property name="dataType">Double</Property>
+      <Property name="label">缁忓害</Property>
+    </PropertyDef>
+    <PropertyDef name="wd">
+      <Property name="dataType">Double</Property>
+      <Property name="label">绾害</Property>
+    </PropertyDef>
+    <PropertyDef name="remark">
+      <Property></Property>
+      <Property name="label">澶囨敞璇存槑</Property>
+    </PropertyDef>
+    <PropertyDef name="createTime">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鍒涘缓鏃堕棿</Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="createBy">
+      <Property></Property>
+      <Property name="label">鍒涘缓浜�</Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="updateTime">
+      <Property name="dataType">DateTime</Property>
+      <Property name="label">鏇存柊鏃堕棿</Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="updateBy">
+      <Property></Property>
+      <Property name="label">鏇存柊浜�</Property>
+      <Property name="readOnly">true</Property>
+    </PropertyDef>
+    <PropertyDef name="imgPath">
+      <Property></Property>
+      <Property name="label">鍥捐矾寰�</Property>
+    </PropertyDef>
+    <PropertyDef name="imgName">
+      <Property></Property>
+      <Property name="label">楦熺灠鍥�</Property>
+    </PropertyDef>
+  </DataType>
+  <DataType name="dtSysUser">
+    <Property name="creationType">com.ruoyi.common.core.domain.entity.SysUser</Property>
+    <PropertyDef name="companyId">
+      <Property></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></Property>
+    </PropertyDef>
+    <PropertyDef name="userName">
+      <Property></Property>
+    </PropertyDef>
+    <PropertyDef name="userType">
+      <Property></Property>
+    </PropertyDef>
+  </DataType>
 </Model>

--
Gitblit v1.9.3