From c1082c999e7cb35395ace980f2c521c1e8b0998e Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 19 十二月 2025 11:27:31 +0800
Subject: [PATCH] 添加出库报表、出库明细报表
---
fzzy-igdss-view/src/main/java/models/core.model.xml | 498 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 471 insertions(+), 27 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 acf4bd5..9b2565b 100644
--- a/fzzy-igdss-view/src/main/java/models/core.model.xml
+++ b/fzzy-igdss-view/src/main/java/models/core.model.xml
@@ -66,7 +66,12 @@
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
- <Property name="label">缁勭粐缂栫爜</Property>
+ <Property name="label">鏀跺偍鍏徃</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("companyPR#getData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">dwmc</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
@@ -79,6 +84,12 @@
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
+ <Property name="label">浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
</DataType>
<DataType name="dtArea">
@@ -937,10 +948,11 @@
</PropertyDef>
<PropertyDef name="deptId">
<Property></Property>
+ <Property name="label">鎵�灞炲簱鍖�</Property>
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
- <Property name="label">瑁呭嵏浠撳簱</Property>
+ <Property name="label">鎵ц浠撳簱</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
<Property name="keyProperty">id</Property>
@@ -971,6 +983,7 @@
</PropertyDef>
<PropertyDef name="year">
<Property></Property>
+ <Property name="label">鎵�灞炲勾浠�</Property>
</PropertyDef>
<PropertyDef name="type">
<Property></Property>
@@ -1021,19 +1034,39 @@
</PropertyDef>
<PropertyDef name="contractNo">
<Property></Property>
- <Property name="label">鍚堝悓缂栧彿</Property>
+ <Property name="label">鍘熷鍚堝悓缂栧彿</Property>
</PropertyDef>
<PropertyDef name="contractName">
<Property></Property>
- <Property name="label">鍚堝悓鍚嶇О</Property>
+ <Property name="label">鍘熷鍚堝悓鍚嶇О</Property>
+ <Validator type="length">
+ <Property name="name">lenVal2</Property>
+ <Property name="maxLength">50</Property>
+ </Validator>
</PropertyDef>
<PropertyDef name="contractAmount">
<Property name="dataType">Double</Property>
<Property name="label">鍚堝悓閲戦</Property>
+ <Property name="displayFormat">#.00 鍏�</Property>
+ </PropertyDef>
+ <PropertyDef name="repaidAmount">
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#.00 鍏�</Property>
+ <Property name="label">宸茶繕閲戦</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">璐ㄦ娂鍚堢害鍚嶇О</Property>
+ <Property name="required">true</Property>
+ <Validator type="length">
+ <Property name="name">lenVal3</Property>
+ <Property name="maxLength">50</Property>
+ <Property name="minLength">1</Property>
+ </Validator>
</PropertyDef>
<PropertyDef name="pledgeBank">
<Property></Property>
- <Property name="label">璐ㄦ娂閾惰</Property>
+ <Property name="label">鎵�灞為摱琛�</Property>
<Property name="mapping">
<Property name="mapValues">${dorado.getDataProvider("bankPR#listAll").getResult()}</Property>
<Property name="keyProperty">id</Property>
@@ -1048,26 +1081,17 @@
<Property name="keyProperty">id</Property>
<Property name="valueProperty">dwmc</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="name">
- <Property></Property>
- <Property name="label">璐ㄦ娂鍚嶇О</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="status">
<Property></Property>
<Property name="label">璐ㄦ娂鐘舵��</Property>
- </PropertyDef>
- <PropertyDef name="signTime">
- <Property name="dataType">Date</Property>
- <Property name="label">绛捐鏃堕棿</Property>
- </PropertyDef>
- <PropertyDef name="pledgeStart">
- <Property name="dataType">Date</Property>
- <Property name="label">寮�濮嬫椂闂�</Property>
- </PropertyDef>
- <PropertyDef name="pledgeEnd">
- <Property name="dataType">Date</Property>
- <Property name="label">缁撴潫鏃堕棿</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("pledgeContractPR#status").getResult()}</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ <Property name="keyProperty">dictValue</Property>
+ </Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="pledgeDept">
<Property></Property>
@@ -1077,10 +1101,27 @@
<Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
<Property name="valueProperty">kqmc</Property>
</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="signTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍚堢害绛捐鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="pledgeStart">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鐢熸晥寮�濮嬫椂闂�</Property>
+ </PropertyDef>
+ <PropertyDef name="pledgeEnd">
+ <Property name="dataType">Date</Property>
+ <Property name="label">璐ㄦ娂鎴鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="remark">
<Property></Property>
<Property name="label">澶囨敞璇存槑</Property>
+ <Validator type="length">
+ <Property name="name">lenVal1</Property>
+ <Property name="maxLength">150</Property>
+ </Validator>
</PropertyDef>
<PropertyDef name="companyId">
<Property></Property>
@@ -1088,11 +1129,11 @@
</PropertyDef>
<PropertyDef name="createBy">
<Property></Property>
- <Property name="label">鍒涘缓浜�</Property>
+ <Property name="label">鍒跺崟浜�</Property>
</PropertyDef>
<PropertyDef name="createTime">
- <Property name="dataType">Date</Property>
- <Property name="label">鍒涘缓鏃堕棿</Property>
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鍒跺崟鏃堕棿</Property>
</PropertyDef>
<PropertyDef name="updateBy">
<Property></Property>
@@ -1195,18 +1236,26 @@
<PropertyDef name="cameraId">
<Property></Property>
<Property name="label">鎶撴媿鐩戞帶</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("secCameraPR#listCamera").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">鎵ц鏃堕棿1</Property>
+ <Property name="label">绗竴娆�</Property>
+ <Property name="displayFormat"># 鐐�</Property>
</PropertyDef>
<PropertyDef name="actHour2">
<Property name="dataType">int</Property>
- <Property name="label">鎵ц鏃堕棿2</Property>
+ <Property name="label">绗簩娆�</Property>
+ <Property name="displayFormat"># 鐐�</Property>
</PropertyDef>
<PropertyDef name="actHour3">
<Property name="dataType">int</Property>
- <Property name="label">鎵ц鏃堕棿3</Property>
+ <Property name="label">绗笁娆�</Property>
+ <Property name="displayFormat"># 鐐�</Property>
</PropertyDef>
</DataType>
<DataType name="dtNoticeDto">
@@ -1409,4 +1458,399 @@
<Property name="readOnly">true</Property>
</PropertyDef>
</DataType>
+ <DataType name="dtNoticeIn">
+ <Property name="creationType">com.fzzy.igds.domain.InoutNoticeIn</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">鍗曟嵁鍙�</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍗曟嵁鍚嶇О</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">鍗曟嵁绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">搴撳尯閫氱煡鍗�</Property>
+ <Property name="code">10</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鐩戠閫氱煡鍗�</Property>
+ <Property name="code">20</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="contract">
+ <Property></Property>
+ <Property name="label">鍏宠仈鍚堝悓</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鍏ュ簱浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="customerName">
+ <Property></Property>
+ <Property name="label">鍙戣揣瀹㈡埛</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="unitName">
+ <Property></Property>
+ <Property name="label">鏀惰揣鍗曚綅</Property>
+ <Property name="required">false</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <Property></Property>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="year">
+ <Property></Property>
+ <Property name="label">骞翠唤</Property>
+ </PropertyDef>
+ <PropertyDef name="targetNumber">
+ <Property name="dataType">Double</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
+ <Property name="required">true</Property>
+ <Property name="label">璁″垝鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="completeNumber">
+ <Property name="dataType">Double</Property>
+ <Property name="label">瀹屾垚鏁伴噺</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="auditStatus">
+ <Property></Property>
+ <Property name="label">瀹℃牳鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStatusType").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="auditUser">
+ <Property></Property>
+ <Property name="label">瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditDate">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">瀹℃壒鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="completeStatus">
+ <Property></Property>
+ <Property name="label">瀹屾垚鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鏈畬鎴�</Property>
+ <Property name="code">NONE</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">宸插畬鎴�</Property>
+ <Property name="code">COMPLETE</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="completeTime">
+ <Property name="dataType">Date</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>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒跺崟浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtNoticeOut">
+ <Property name="creationType">com.fzzy.igds.domain.InoutNoticeOut</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">閫氱煡鍗曞彿</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="deptId">
+ <Property></Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍗曟嵁鍚嶇О</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="type">
+ <Property></Property>
+ <Property name="label">鍗曟嵁绫诲瀷</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">搴撳尯閫氱煡鍗�</Property>
+ <Property name="code">10</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">鐩戠閫氱煡鍗�</Property>
+ <Property name="code">20</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="contract">
+ <Property></Property>
+ <Property name="label">鍏宠仈鍚堝悓</Property>
+ <Property name="required">false</Property>
+ </PropertyDef>
+ <PropertyDef name="depotId">
+ <Property></Property>
+ <Property name="label">鍑哄簱浠撳簱</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="customerName">
+ <Property></Property>
+ <Property name="label">鏀惰揣瀹㈡埛</Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="unitName">
+ <Property></Property>
+ <Property name="label">鍙戣揣鍗曚綅</Property>
+ <Property name="required">false</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">kqmc</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="foodVariety">
+ <Property></Property>
+ <Property name="label">绮鍝佺</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#sysDictData").getResult("FOOD_VARIETY_")}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ <Property name="required">true</Property>
+ </PropertyDef>
+ <PropertyDef name="year">
+ <Property></Property>
+ <Property name="label">骞翠唤</Property>
+ </PropertyDef>
+ <PropertyDef name="targetNumber">
+ <Property name="dataType">double</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
+ <Property name="required">true</Property>
+ <Property name="label">璁″垝鏁伴噺</Property>
+ </PropertyDef>
+ <PropertyDef name="completeNumber">
+ <Property name="dataType">double</Property>
+ <Property name="label">瀹屾垚鏁伴噺</Property>
+ <Property name="displayFormat">#0.0 KG</Property>
+ </PropertyDef>
+ <PropertyDef name="auditStatus">
+ <Property></Property>
+ <Property name="label">瀹℃牳鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("dicPR#triggerStatusType").getResult()}</Property>
+ <Property name="keyProperty">dictValue</Property>
+ <Property name="valueProperty">dictLabel</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="auditUser">
+ <Property></Property>
+ <Property name="label">瀹℃牳浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="auditDate">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">瀹℃壒鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="completeStatus">
+ <Property></Property>
+ <Property name="label">瀹屾垚鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="name">鏈畬鎴�</Property>
+ <Property name="code">NONE</Property>
+ </Entity>
+ <Entity>
+ <Property name="name">宸插畬鎴�</Property>
+ <Property name="code">COMPLETE</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="completeTime">
+ <Property name="dataType">Date</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>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒跺崟浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">DateTime</Property>
+ <Property name="label">鏇存柊鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">鏇存柊浜�</Property>
+ </PropertyDef>
+ </DataType>
+ <DataType name="dtSlogan">
+ <Property name="creationType">com.fzzy.igds.domain.Slogan</Property>
+ <PropertyDef name="id">
+ <Property></Property>
+ <Property name="label">缂栧彿</Property>
+ </PropertyDef>
+ <PropertyDef name="companyId">
+ <Property></Property>
+ <Property name="label">缁勭粐缂栫爜</Property>
+ </PropertyDef>
+ <PropertyDef name="name">
+ <Property></Property>
+ <Property name="label">鍚嶇О</Property>
+ </PropertyDef>
+ <PropertyDef name="content">
+ <Property></Property>
+ <Property name="label">鏍囪鍐呭</Property>
+ </PropertyDef>
+ <PropertyDef name="status">
+ <Property></Property>
+ <Property name="label">鐘舵��</Property>
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">N</Property>
+ <Property name="value">鏈娇鐢�</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">Y</Property>
+ <Property name="value">姝ｅ湪浣跨敤</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ </Property>
+ </PropertyDef>
+ <PropertyDef name="color">
+ <Property name="mapping">
+ <Property name="mapValues">
+ <Collection>
+ <Entity>
+ <Property name="key">default</Property>
+ <Property name="value">榛樿</Property>
+ </Entity>
+ <Entity>
+ <Property name="key">red</Property>
+ <Property name="value">绾㈣壊</Property>
+ </Entity>
+ </Collection>
+ </Property>
+ <Property name="keyProperty">key</Property>
+ <Property name="valueProperty">value</Property>
+ </Property>
+ <Property name="label">棰滆壊</Property>
+ </PropertyDef>
+ <PropertyDef name="pushUser">
+ <Property></Property>
+ <Property name="label">鎺ㄩ�佷汉</Property>
+ </PropertyDef>
+ <PropertyDef name="pushTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍙戝竷鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">鍒涘缓鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="createBy">
+ <Property></Property>
+ <Property name="label">鍒涘缓浜�</Property>
+ </PropertyDef>
+ <PropertyDef name="updateTime">
+ <Property name="dataType">Date</Property>
+ <Property name="label">淇敼鏃堕棿</Property>
+ </PropertyDef>
+ <PropertyDef name="updateBy">
+ <Property></Property>
+ <Property name="label">淇敼浜�</Property>
+ </PropertyDef>
+ </DataType>
</Model>
--
Gitblit v1.9.3