From 08000305684ec0c758090fbb5cbd85132218fcef Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期五, 27 十月 2023 16:30:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 igds-inout/src/main/java/com/ld/igds/m/view/StockChange.view.xml |   64 ++++++++++++++++++++++++++++---
 1 files changed, 57 insertions(+), 7 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 71dc161..f12dc0e 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
@@ -7,11 +7,13 @@
       <Property name="creationType">com.ld.igds.models.InoutStockChange</Property>
       <PropertyDef name="id">
         <Property></Property>
-        <Property name="label">ID</Property>
+        <Property name="label">鍊掍粨鍗曞彿</Property>
+        <Property name="readOnly">true</Property>
       </PropertyDef>
       <PropertyDef name="companyId">
         <Property></Property>
         <Property name="label">缁勭粐缂栫爜</Property>
+        <Property name="readOnly">true</Property>
       </PropertyDef>
       <PropertyDef name="deptId">
         <Property></Property>
@@ -47,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>
@@ -71,19 +74,38 @@
       <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">#.00KG</Property>
+        <Property name="displayFormat">#,##0.00 KG</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="updateTime">
         <Property name="dataType">Date</Property>
-        <Property name="label">鏇存柊鏃堕棿</Property>
+        <Property name="label">鏈�鍚庢洿鏂版椂闂�</Property>
       </PropertyDef>
       <PropertyDef name="updateUser">
         <Property></Property>
         <Property name="label">鏇存柊浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="bzw">
+        <Property></Property>
+        <Property name="label">鍖呰鐗�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;stockChangePR#triggerBzw&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
+      <PropertyDef name="bzbjs">
+        <Property name="dataType">Integer</Property>
+        <Property name="label">鏍囧噯鍖呬欢鏁�</Property>
+      </PropertyDef>
+      <PropertyDef name="zxzydw">
+        <Property></Property>
+        <Property name="label">瑁呭嵏浣滀笟鍗曚綅</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam">
@@ -146,6 +168,8 @@
         <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
 if(data){&#xD;
 	view.get(&quot;#dialogMain&quot;).show();&#xD;
+}else{&#xD;
+	$alert(&quot;璇峰嬀閫夐渶瑕佷慨鏀圭殑鏁版嵁锛�&quot;);&#xD;
 }</ClientEvent>
         <Property name="caption">璋冩暣</Property>
         <Property name="exClassName">btn-warm</Property>
@@ -174,6 +198,7 @@
         <Property name="caption">鍒锋柊</Property>
         <Property name="exClassName">btn-default</Property>
         <Property name="iconClass">fa fa-refresh</Property>
+        <Property name="visible">false</Property>
       </Button>
     </Container>
     <Container layout="regionPadding:10" layoutConstraint="center">
@@ -273,7 +298,7 @@
       </DataPilot>
     </Container>
     <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
-      <Property name="width">60%</Property>
+      <Property name="width">70%</Property>
       <Property name="caption">璇︾粏淇℃伅</Property>
       <Property name="iconClass">fa fa-flag-o</Property>
       <Property name="closeable">false</Property>
@@ -306,6 +331,16 @@
           <Property name="labelWidth">120</Property>
           <Property name="labelAlign">right</Property>
           <Property name="labelSeparator">锛�</Property>
+          <AutoFormElement>
+            <Property name="name">id</Property>
+            <Property name="property">id</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">deptId</Property>
+            <Property name="property">deptId</Property>
+            <Editor/>
+          </AutoFormElement>
           <AutoFormElement>
             <Property name="name">depotIdIn</Property>
             <Property name="property">depotIdIn</Property>
@@ -347,9 +382,18 @@
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
-            <Property name="name">updateTime</Property>
-            <Property name="property">updateTime</Property>
-            <Property name="readOnly">true</Property>
+            <Property name="name">bzw</Property>
+            <Property name="property">bzw</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">bzbjs</Property>
+            <Property name="property">bzbjs</Property>
+            <Editor/>
+          </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">zxzydw</Property>
+            <Property name="property">zxzydw</Property>
             <Editor/>
           </AutoFormElement>
           <AutoFormElement>
@@ -358,6 +402,12 @@
             <Property name="readOnly">true</Property>
             <Editor/>
           </AutoFormElement>
+          <AutoFormElement>
+            <Property name="name">updateTime</Property>
+            <Property name="property">updateTime</Property>
+            <Property name="readOnly">true</Property>
+            <Editor/>
+          </AutoFormElement>
         </AutoForm>
       </Children>
       <Tools/>

--
Gitblit v1.9.3