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 |   57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 52 insertions(+), 5 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 9d53628..f1e741b 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -1128,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>
@@ -1169,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">
@@ -1865,14 +1914,12 @@
       <Property name="label">宸￠�讳汉</Property>
     </PropertyDef>
     <PropertyDef name="start">
-      <Property name="dataType">DateTime</Property>
+      <Property name="dataType">Time</Property>
       <Property name="label">鐝璧峰鏃堕棿</Property>
-      <Property name="displayFormat">H:i:s</Property>
     </PropertyDef>
     <PropertyDef name="end">
-      <Property name="dataType">DateTime</Property>
+      <Property name="dataType">Time</Property>
       <Property name="label">鐝鎴鏃堕棿</Property>
-      <Property name="displayFormat">H:i:s</Property>
     </PropertyDef>
     <PropertyDef name="remark">
       <Property></Property>

--
Gitblit v1.9.3