From d62cbd8da3bd2422de2923a6e7d999822730d632 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 16 九月 2023 11:55:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml | 43 ++++++-------------------------------------
1 files changed, 6 insertions(+), 37 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
index ab7e9dc..feb02bb 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml
@@ -49,6 +49,7 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="depotIdIn">
<Property></Property>
@@ -73,11 +74,13 @@
<PropertyDef name="changeDate">
<Property name="dataType">Date</Property>
<Property name="label">鍊掍粨鏃ユ湡</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="number">
<Property name="dataType">Double</Property>
<Property name="label">鍊掍粨鏁伴噺</Property>
- <Property name="displayFormat">#.00 KG</Property>
+ <Property name="displayFormat">#,##0.00 KG</Property>
+ <Property name="required">true</Property>
</PropertyDef>
<PropertyDef name="updateTime">
<Property name="dataType">Date</Property>
@@ -87,14 +90,6 @@
<Property></Property>
<Property name="label">鏇存柊浜�</Property>
</PropertyDef>
- <PropertyDef name="dchwdm">
- <Property></Property>
- <Property name="label">鍊掑嚭璐т綅浠ｇ爜</Property>
- </PropertyDef>
- <PropertyDef name="drhwdm">
- <Property></Property>
- <Property name="label">鍊掑叆璐т綅浠ｇ爜</Property>
- </PropertyDef>
<PropertyDef name="bzw">
<Property></Property>
<Property name="label">鍖呰鐗�</Property>
@@ -103,11 +98,6 @@
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
- </PropertyDef>
- <PropertyDef name="czbz">
- <Property></Property>
- <Property name="label">鎿嶄綔鏍囧織</Property>
- <Property name="readOnly">true</Property>
</PropertyDef>
<PropertyDef name="bzbjs">
<Property name="dataType">Integer</Property>
@@ -345,8 +335,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">companyId</Property>
- <Property name="property">companyId</Property>
+ <Property name="name">deptId</Property>
+ <Property name="property">deptId</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -360,29 +350,8 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">deptId</Property>
- <Property name="property">deptId</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czbz</Property>
- <Property name="property">czbz</Property>
- <Property name="readOnly">true</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">type</Property>
<Property name="property">type</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dchwdm</Property>
- <Property name="property">dchwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">drhwdm</Property>
- <Property name="property">drhwdm</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
--
Gitblit v1.9.3