From be175fe739e687cd1d45da58f2cb7dd0c36d001f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 11 八月 2023 11:48:10 +0800
Subject: [PATCH] 调整Pressure的接口包位置到COre中，然后增加modBus-TCP协议通讯报道

---
 igds-inout/src/main/java/com/ld/igds/m/view/VarietyChange.view.xml |   29 +++++++++++++----------------
 1 files changed, 13 insertions(+), 16 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 c670b3c..55e88e2 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
@@ -41,8 +41,8 @@
       </PropertyDef>
       <PropertyDef name="foodVariety">
         <Property></Property>
-        <Property name="label">鍙樻洿鍓嶅搧绉�</Property>
-        <Property name="required">false</Property>
+        <Property name="label">绮鍝佺</Property>
+        <Property name="required">true</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_VARIETY_&quot;)}</Property>
           <Property name="keyProperty">code</Property>
@@ -52,7 +52,7 @@
       <PropertyDef name="foodType">
         <Property></Property>
         <Property name="label">鍙樻洿鍓嶆�ц川</Property>
-        <Property name="required">false</Property>
+        <Property name="required">true</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
           <Property name="keyProperty">code</Property>
@@ -62,7 +62,7 @@
       <PropertyDef name="newFoodType">
         <Property></Property>
         <Property name="label">鍙樻洿鍚庢�ц川</Property>
-        <Property name="required">false</Property>
+        <Property name="required">true</Property>
         <Property name="mapping">
           <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_TYPE_&quot;)}</Property>
           <Property name="keyProperty">code</Property>
@@ -74,12 +74,14 @@
         <Property name="label">绮鏁伴噺</Property>
         <Property name="dataType">Double</Property>
         <Property name="displayFormat">#,##0.00 KG</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="changeNumber">
         <Property></Property>
         <Property name="label">鍒掕浆鏁伴噺</Property>
         <Property name="dataType">Double</Property>
         <Property name="displayFormat">#,##0.00 KG</Property>
+        <Property name="required">true</Property>
       </PropertyDef>
       <PropertyDef name="changeTime">
         <Property name="dataType">Date</Property>
@@ -336,7 +338,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>
@@ -440,11 +442,6 @@
                 <Property name="readOnly">true</Property>
                 <Editor/>
               </AutoFormElement>
-              <AutoFormElement>
-                <Property name="name">czbz</Property>
-                <Property name="property">czbz</Property>
-                <Editor/>
-              </AutoFormElement>
             </AutoForm>
           </Children>
         </FieldSet>
@@ -461,7 +458,7 @@
                   <Property name="dataSet">dsMain</Property>
                   <Property name="labelAlign">right</Property>
                   <Property name="labelSeparator">:</Property>
-                  <Property name="labelWidth">120</Property>
+                  <Property name="labelWidth">100</Property>
                   <AutoFormElement>
                     <Property name="name">ccshr</Property>
                     <Property name="property">ccshr</Property>
@@ -489,7 +486,7 @@
                   <Property name="dataSet">dsMain</Property>
                   <Property name="labelAlign">right</Property>
                   <Property name="labelSeparator">:</Property>
-                  <Property name="labelWidth">120</Property>
+                  <Property name="labelWidth">100</Property>
                   <AutoFormElement>
                     <Property name="name">zjshr</Property>
                     <Property name="property">zjshr</Property>
@@ -515,7 +512,7 @@
                 <AutoForm>
                   <Property name="cols">*,*</Property>
                   <Property name="dataSet">dsMain</Property>
-                  <Property name="labelWidth">120</Property>
+                  <Property name="labelWidth">100</Property>
                   <Property name="labelSeparator">:</Property>
                   <Property name="labelAlign">right</Property>
                   <AutoFormElement>
@@ -545,7 +542,7 @@
                   <Property name="dataSet">dsMain</Property>
                   <Property name="labelAlign">right</Property>
                   <Property name="labelSeparator">:</Property>
-                  <Property name="labelWidth">120</Property>
+                  <Property name="labelWidth">100</Property>
                   <AutoFormElement>
                     <Property name="name">kjshr</Property>
                     <Property name="property">kjshr</Property>
@@ -573,7 +570,7 @@
                   <Property name="dataSet">dsMain</Property>
                   <Property name="labelAlign">right</Property>
                   <Property name="labelSeparator">:</Property>
-                  <Property name="labelWidth">140</Property>
+                  <Property name="labelWidth">100</Property>
                   <AutoFormElement>
                     <Property name="name">ldshr</Property>
                     <Property name="property">ldshr</Property>
@@ -603,7 +600,7 @@
               <Property name="dataSet">dsMain</Property>
               <Property name="labelAlign">right</Property>
               <Property name="labelSeparator">:</Property>
-              <Property name="labelWidth">120</Property>
+              <Property name="labelWidth">100</Property>
               <AutoFormElement layoutConstraint="colSpan:2">
                 <Property name="name">remark</Property>
                 <Property name="property">remark</Property>

--
Gitblit v1.9.3