From e17db1a57b9788ab16c805e44b54a0324fea7da0 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期三, 21 六月 2023 17:54:20 +0800
Subject: [PATCH] 倒仓和粮食性质变更

---
 igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml |  416 ++++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 323 insertions(+), 93 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
index 38d7c30..83fcfa6 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml
@@ -7,11 +7,13 @@
       <Property name="creationType">com.ld.igds.models.InoutVarietyChange</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="approvalId">
         <Property></Property>
@@ -46,16 +48,6 @@
           <Property name="keyProperty">code</Property>
           <Property name="valueProperty">name</Property>
         </Property>
-      </PropertyDef>
-      <PropertyDef name="newFoodVariety">
-        <Property></Property>
-        <Property name="label">鍙樻洿鍚庡搧绉�</Property>
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
-          <Property name="keyProperty">code</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
-        <Property name="required">false</Property>
       </PropertyDef>
       <PropertyDef name="foodType">
         <Property></Property>
@@ -98,13 +90,77 @@
         <Property name="dataType">DateTime</Property>
         <Property name="label">鏇存柊鏃堕棿</Property>
       </PropertyDef>
-      <PropertyDef name="updateUser">
-        <Property></Property>
-        <Property name="label">鏇存柊浜�</Property>
-      </PropertyDef>
       <PropertyDef name="remark">
         <Property></Property>
         <Property name="label">澶囨敞</Property>
+      </PropertyDef>
+      <PropertyDef name="hwdm">
+        <Property/>
+        <Property name="label">璐т綅浠g爜</Property>
+      </PropertyDef>
+      <PropertyDef name="ccshr">
+        <Property/>
+        <Property name="label">浠撳偍瀹℃牳浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="auditCcsh">
+        <Property/>
+        <Property name="label">瀹℃壒鐘舵��</Property>
+      </PropertyDef>
+      <PropertyDef name="InfoCcsh">
+        <Property/>
+        <Property name="label">瀹℃牳璇存槑</Property>
+      </PropertyDef>
+      <PropertyDef name="zjshr">
+        <Property/>
+        <Property name="label">璐ㄦ瀹℃牳浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="auditZjsh">
+        <Property/>
+        <Property name="label">瀹℃壒鐘舵��</Property>
+      </PropertyDef>
+      <PropertyDef name="infoZjsh">
+        <Property/>
+        <Property name="label">瀹℃牳璇存槑</Property>
+      </PropertyDef>
+      <PropertyDef name="tjshr">
+        <Property/>
+        <Property name="label">缁熻瀹℃牳浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="auditTjsh">
+        <Property/>
+        <Property name="label">瀹℃壒鐘舵��</Property>
+      </PropertyDef>
+      <PropertyDef name="infoTjsh">
+        <Property/>
+        <Property name="label">瀹℃牳璇存槑</Property>
+      </PropertyDef>
+      <PropertyDef name="kjshr">
+        <Property/>
+        <Property name="label">浼氳瀹℃牳浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="auditKjsh">
+        <Property/>
+        <Property name="label">瀹℃壒鐘舵��</Property>
+      </PropertyDef>
+      <PropertyDef name="infoKjsh">
+        <Property/>
+        <Property name="label">瀹℃牳璇存槑</Property>
+      </PropertyDef>
+      <PropertyDef name="ldshr">
+        <Property/>
+        <Property name="label">棰嗗瀹℃牳浜�</Property>
+      </PropertyDef>
+      <PropertyDef name="auditLdsh">
+        <Property/>
+        <Property name="label">瀹℃壒鐘舵��</Property>
+      </PropertyDef>
+      <PropertyDef name="infoLdsh">
+        <Property/>
+        <Property name="label">瀹℃牳璇存槑</Property>
+      </PropertyDef>
+      <PropertyDef name="czbz">
+        <Property/>
+        <Property name="label">鎿嶄綔鏍囧織</Property>
       </PropertyDef>
     </DataType>
     <DataType name="dtParam">
@@ -204,6 +260,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">
@@ -250,20 +307,12 @@
           <Property name="property">foodVariety</Property>
           <Property name="align">center</Property>
         </DataColumn>
-        <DataColumn name="newFoodVariety">
-          <Property name="property">newFoodVariety</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
         <DataColumn name="changeTime">
           <Property name="property">changeTime</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="updateTime">
           <Property name="property">updateTime</Property>
-          <Property name="align">center</Property>
-        </DataColumn>
-        <DataColumn name="updateUser">
-          <Property name="property">updateUser</Property>
           <Property name="align">center</Property>
         </DataColumn>
         <DataColumn name="remark">
@@ -279,10 +328,11 @@
       </DataPilot>
     </Container>
     <Dialog id="dialogMain" layout="padding:5;regionPadding:10">
-      <Property name="width">800</Property>
+      <Property name="width">60%</Property>
       <Property name="caption">绮鍝佺鍙樻洿淇℃伅</Property>
       <Property name="iconClass">fa fa-flag-o</Property>
       <Property name="closeable">false</Property>
+      <Property name="height">80%</Property>
       <Buttons>
         <Button>
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
@@ -306,75 +356,255 @@
         </Button>
       </Buttons>
       <Children>
-        <AutoForm>
-          <Property name="dataSet">dsMain</Property>
-          <Property name="cols">*,*</Property>
-          <Property name="labelWidth">120</Property>
-          <Property name="labelAlign">right</Property>
-          <Property name="labelSeparator">锛�</Property>
-          <AutoFormElement>
-            <Property name="name">depotId</Property>
-            <Property name="property">depotId</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">approvalId</Property>
-            <Property name="property">approvalId</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">foodVariety</Property>
-            <Property name="property">foodVariety</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">newFoodVariety</Property>
-            <Property name="property">newFoodVariety</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">foodType</Property>
-            <Property name="property">foodType</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">newFoodType</Property>
-            <Property name="property">newFoodType</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">number</Property>
-            <Property name="property">number</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">changeNumber</Property>
-            <Property name="property">changeNumber</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">changeTime</Property>
-            <Property name="property">changeTime</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">updateUser</Property>
-            <Property name="property">updateUser</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement layoutConstraint="colSpan:2">
-            <Property name="name">remark</Property>
-            <Property name="property">remark</Property>
-            <Property name="editorType">TextArea</Property>
-            <Editor/>
-          </AutoFormElement>
-          <AutoFormElement>
-            <Property name="name">updateTime</Property>
-            <Property name="property">updateTime</Property>
-            <Property name="readOnly">true</Property>
-            <Editor/>
-          </AutoFormElement>
-        </AutoForm>
+        <FieldSet>
+          <Property name="caption">鍩烘湰淇℃伅</Property>
+          <Buttons/>
+          <Children>
+            <AutoForm>
+              <Property name="dataSet">dsMain</Property>
+              <Property name="cols">*,*</Property>
+              <Property name="labelWidth">140</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">depotId</Property>
+                <Property name="property">depotId</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">companyId</Property>
+                <Property name="property">companyId</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">approvalId</Property>
+                <Property name="property">approvalId</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">hwdm</Property>
+                <Property name="property">hwdm</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">foodVariety</Property>
+                <Property name="property">foodVariety</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">foodType</Property>
+                <Property name="property">foodType</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">newFoodType</Property>
+                <Property name="property">newFoodType</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">number</Property>
+                <Property name="property">number</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">changeNumber</Property>
+                <Property name="property">changeNumber</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">changeTime</Property>
+                <Property name="property">changeTime</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">updateTime</Property>
+                <Property name="property">updateTime</Property>
+                <Property name="readOnly">true</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">czbz</Property>
+                <Property name="property">czbz</Property>
+                <Editor/>
+              </AutoFormElement>
+              <AutoFormElement>
+                <Property name="name">deptId</Property>
+                <Property name="property">deptId</Property>
+                <Editor/>
+              </AutoFormElement>
+            </AutoForm>
+          </Children>
+        </FieldSet>
+        <FieldSet>
+          <Property name="caption">瀹℃壒淇℃伅</Property>
+          <Buttons/>
+          <Children>
+            <FieldSet>
+              <Property name="caption">浠撳偍瀹℃壒</Property>
+              <Buttons/>
+              <Children>
+                <AutoForm>
+                  <Property name="cols">*,*</Property>
+                  <Property name="dataSet">dsMain</Property>
+                  <Property name="labelAlign">right</Property>
+                  <Property name="labelSeparator">:</Property>
+                  <Property name="labelWidth">120</Property>
+                  <AutoFormElement>
+                    <Property name="name">ccshr</Property>
+                    <Property name="property">ccshr</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">auditCcsh</Property>
+                    <Property name="property">auditCcsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+                    <Property name="name">InfoCcsh</Property>
+                    <Property name="property">InfoCcsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                </AutoForm>
+              </Children>
+            </FieldSet>
+            <FieldSet>
+              <Property name="caption">璐ㄦ瀹℃壒</Property>
+              <Buttons/>
+              <Children>
+                <AutoForm>
+                  <Property name="cols">*,*</Property>
+                  <Property name="dataSet">dsMain</Property>
+                  <Property name="labelAlign">right</Property>
+                  <Property name="labelSeparator">:</Property>
+                  <Property name="labelWidth">120</Property>
+                  <AutoFormElement>
+                    <Property name="name">zjshr</Property>
+                    <Property name="property">zjshr</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">auditZjsh</Property>
+                    <Property name="property">auditZjsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+                    <Property name="name">infoZjsh</Property>
+                    <Property name="property">infoZjsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                </AutoForm>
+              </Children>
+            </FieldSet>
+            <FieldSet>
+              <Property name="caption">缁熻瀹℃壒</Property>
+              <Buttons/>
+              <Children>
+                <AutoForm>
+                  <Property name="cols">*,*</Property>
+                  <Property name="dataSet">dsMain</Property>
+                  <Property name="labelWidth">120</Property>
+                  <Property name="labelSeparator">:</Property>
+                  <Property name="labelAlign">right</Property>
+                  <AutoFormElement>
+                    <Property name="name">tjshr</Property>
+                    <Property name="property">tjshr</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">auditTjsh</Property>
+                    <Property name="property">auditTjsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement layoutConstraint="colSpan:2;rowSpan:2">
+                    <Property name="name">infoTjsh</Property>
+                    <Property name="property">infoTjsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                </AutoForm>
+              </Children>
+            </FieldSet>
+            <FieldSet>
+              <Property name="caption">浼氳瀹℃壒</Property>
+              <Buttons/>
+              <Children>
+                <AutoForm>
+                  <Property name="cols">*,*</Property>
+                  <Property name="dataSet">dsMain</Property>
+                  <Property name="labelAlign">right</Property>
+                  <Property name="labelSeparator">:</Property>
+                  <Property name="labelWidth">120</Property>
+                  <AutoFormElement>
+                    <Property name="name">kjshr</Property>
+                    <Property name="property">kjshr</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">auditKjsh</Property>
+                    <Property name="property">auditKjsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+                    <Property name="name">infoKjsh</Property>
+                    <Property name="property">infoKjsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                </AutoForm>
+              </Children>
+            </FieldSet>
+            <FieldSet>
+              <Property name="caption">棰嗗瀹℃壒</Property>
+              <Buttons/>
+              <Children>
+                <AutoForm>
+                  <Property name="cols">*,*</Property>
+                  <Property name="dataSet">dsMain</Property>
+                  <Property name="labelAlign">right</Property>
+                  <Property name="labelSeparator">:</Property>
+                  <Property name="labelWidth">140</Property>
+                  <AutoFormElement>
+                    <Property name="name">ldshr</Property>
+                    <Property name="property">ldshr</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement>
+                    <Property name="name">auditLdsh</Property>
+                    <Property name="property">auditLdsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                  <AutoFormElement layoutConstraint="rowSpan:2;colSpan:2">
+                    <Property name="name">infoLdsh</Property>
+                    <Property name="property">infoLdsh</Property>
+                    <Editor/>
+                  </AutoFormElement>
+                </AutoForm>
+              </Children>
+            </FieldSet>
+          </Children>
+        </FieldSet>
+        <FieldSet>
+          <Property name="caption">澶囨敞淇℃伅</Property>
+          <Buttons/>
+          <Children>
+            <AutoForm>
+              <Property name="cols">*,*</Property>
+              <Property name="dataSet">dsMain</Property>
+              <Property name="labelAlign">right</Property>
+              <Property name="labelSeparator">:</Property>
+              <Property name="labelWidth">120</Property>
+              <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">remark</Property>
+                <Property name="property">remark</Property>
+                <Property name="editorType">TextArea</Property>
+                <Editor/>
+              </AutoFormElement>
+            </AutoForm>
+          </Children>
+        </FieldSet>
       </Children>
       <Tools/>
     </Dialog>

--
Gitblit v1.9.3