From 43ce77a85d8297a53dc25430fff10ead57296167 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 04 十一月 2023 15:43:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml | 80 ++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 43 deletions(-)
diff --git a/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml b/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
index 8d01c9e..a6417dc 100644
--- a/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/view/DepotBookStore.view.xml
@@ -12,13 +12,29 @@
<Property></Property>
<Property name="label">缁勭粐缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="kqdm">
+ <PropertyDef name="deptId">
<Property></Property>
- <Property name="label">搴撳尯浠ｇ爜</Property>
+ <Property name="label">鎵�灞炲垎搴�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("deptPR#loadParents").getResult()}</Property>
+ <Property name="keyProperty">id</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
+ <Property name="required">true</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="lspzdm">
<Property></Property>
- <Property name="label">绮鍝佺浠ｇ爜</Property>
+ <Property name="label">绮鍝佺</Property>
<Property name="required">true</Property>
<Property name="mapping">
<Property name="keyProperty">code</Property>
@@ -44,24 +60,25 @@
<Property name="dataType">Double</Property>
<Property name="label">鏈熷垵鏁伴噺</Property>
<Property name="required">true</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="bqsrsl">
<Property name="dataType">Double</Property>
<Property name="label">鏈湡鏀跺叆鏁伴噺</Property>
<Property name="required">true</Property>
- <Property name="displayFormat">#0.000KG</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="bqzcsl">
<Property name="dataType">Double</Property>
<Property name="label">鏈湡鏀嚭鏁伴噺</Property>
<Property name="required">true</Property>
- <Property name="displayFormat">#0.000KG</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="qmye">
<Property name="dataType">Double</Property>
<Property name="label">鏈熸湯鏁伴噺</Property>
<Property name="required">true</Property>
- <Property name="displayFormat">#0.000KG</Property>
+ <Property name="displayFormat">#,##0 KG</Property>
</PropertyDef>
<PropertyDef name="yjbz">
<Property name="dataType">Integer</Property>
@@ -88,30 +105,6 @@
<Property name="dataType">Date</Property>
<Property name="label">涓氬姟鏃ユ湡</Property>
<Property name="required">true</Property>
- </PropertyDef>
- <PropertyDef name="czbz">
- <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">i</Property>
- <Property name="value">鏂板鏁版嵁</Property>
- </Entity>
- <Entity>
- <Property name="key">u</Property>
- <Property name="value">淇敼鏁版嵁</Property>
- </Entity>
- <Entity>
- <Property name="key">d</Property>
- <Property name="value">鍒犻櫎鏁版嵁</Property>
- </Entity>
- </Collection>
- </Property>
- </Property>
</PropertyDef>
<PropertyDef name="zhgxsj">
<Property name="dataType">DateTime</Property>
@@ -220,6 +213,10 @@
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
<DataColumn name="lspzdm">
<Property name="property">lspzdm</Property>
<Property name="align">center</Property>
@@ -250,14 +247,6 @@
</DataColumn>
<DataColumn name="yjbz">
<Property name="property">yjbz</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="ywrq">
- <Property name="property">ywrq</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="czbz">
- <Property name="property">czbz</Property>
<Property name="align">center</Property>
</DataColumn>
<DataColumn name="zhgxsj">
@@ -308,6 +297,16 @@
<Property name="cols">*,*</Property>
<Property name="labelWidth">120</Property>
<AutoFormElement>
+ <Property name="name">depotId</Property>
+ <Property name="property">depotId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
<Property name="name">lspzdm</Property>
<Property name="property">lspzdm</Property>
<Editor/>
@@ -352,11 +351,6 @@
<AutoFormElement>
<Property name="name">ywrq</Property>
<Property name="property">ywrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
--
Gitblit v1.9.3