From 775687893d6a7d496025338f6ebbeab7de063c23 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 13 七月 2023 17:53:24 +0800
Subject: [PATCH] 优化出入库--手动补录化验结果自动判断

---
 igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml |  113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 109 insertions(+), 4 deletions(-)

diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index 3e27763..fe07c39 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -108,6 +108,34 @@
         <Property></Property>
         <Property name="label">杩愮畻绗﹀彿</Property>
       </PropertyDef>
+      <PropertyDef name="operaSymbolValue">
+        <Property></Property>
+      </PropertyDef>
+      <PropertyDef name="addNum">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧為噸</Property>
+      </PropertyDef>
+      <PropertyDef name="deNum">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｉ噸</Property>
+      </PropertyDef>
+      <PropertyDef name="addPrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧炰环</Property>
+      </PropertyDef>
+      <PropertyDef name="dePrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵ｄ环</Property>
+      </PropertyDef>
+      <PropertyDef name="result">
+        <Property></Property>
+        <Property name="label">妫�楠岀粨鏋�</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerResult&quot;).getResult()}</Property>
+        </Property>
+      </PropertyDef>
     </DataType>
   </Model>
   <View layout="padding:5;regionPadding:5">
@@ -556,8 +584,61 @@
               <Property name="label">璐ㄦ鏃堕棿</Property>
               <Editor/>
             </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">sampleUser</Property>
+              <Property name="property">sampleUser</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">sampleTime</Property>
+              <Property name="property">sampleTime</Property>
+              <Editor/>
+            </AutoFormElement>
+            <AutoFormElement>
+              <Property name="name">sampleType</Property>
+              <Property name="property">sampleType</Property>
+              <Property name="editorType">RadioGroup</Property>
+              <Editor/>
+            </AutoFormElement>
           </AutoForm>
           <DataGrid id="dataGridCheckItem" layoutConstraint="padding:10">
+            <ClientEvent name="onCellValueEdit">var data = arg.entity;&#xD;
+//鏍规嵁濉啓鍖栭獙鏁版嵁,缁欏嚭鎻愰啋鏄惁鍚堟牸&#xD;
+if(data){&#xD;
+    //濉啓鐨勬暟鎹��&#xD;
+    var newValue = data.get(&quot;value&quot;);&#xD;
+&#xD;
+    //鏍囧噯鍊�&#xD;
+    var limit = data.get(&quot;upperLimit&quot;);&#xD;
+&#xD;
+    //杩愮畻绗�&#xD;
+    var symbol = data.get(&quot;operaSymbol&quot;);&#xD;
+&#xD;
+    if (symbol &amp;&amp; limit) {&#xD;
+        if (&quot;>=&quot; == symbol) {&#xD;
+            if (newValue &lt; limit) {&#xD;
+				data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
+               &#xD;
+            } else {&#xD;
+				data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
+            }&#xD;
+        }&#xD;
+        if (&quot;&lt;=&quot; == symbol) {&#xD;
+            if (newValue > limit) {&#xD;
+                data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
+            } else {&#xD;
+                data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
+            }&#xD;
+        }&#xD;
+        if (&quot;==&quot; == symbol) {&#xD;
+            if (newValue != limit) {&#xD;
+                data.set(&quot;result&quot;, &quot;0&quot;);&#xD;
+            } else {&#xD;
+                data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
+            }&#xD;
+        }&#xD;
+    }&#xD;
+}</ClientEvent>
             <Property name="dataSet">dsMain</Property>
             <Property name="dataPath">#.checkItems</Property>
             <Property name="highlightCurrentRow">false</Property>
@@ -579,14 +660,38 @@
               <Property name="property">unit</Property>
               <Property name="width">80</Property>
               <Property name="readOnly">true</Property>
-            </DataColumn>
-            <DataColumn name="standardValue">
-              <Property name="property">standardValue</Property>
-              <Property name="readOnly">true</Property>
               <Property name="align">center</Property>
+            </DataColumn>
+            <DataColumn name="operaSymbolValue">
+              <Property name="property">operaSymbolValue</Property>
+              <Property name="align">center</Property>
+              <Property name="caption">鏍囧噯鍊�</Property>
+              <Property name="readOnly">true</Property>
+            </DataColumn>
+            <DataColumn name="deNum">
+              <Property name="property">deNum</Property>
+              <Property name="align">center</Property>
+            </DataColumn>
+            <DataColumn name="addNum">
+              <Property name="property">addNum</Property>
+              <Property name="align">center</Property>
+            </DataColumn>
+            <DataColumn name="dePrice">
+              <Property name="property">dePrice</Property>
+              <Property name="align">center</Property>
+            </DataColumn>
+            <DataColumn name="addPrice">
+              <Property name="property">addPrice</Property>
+              <Property name="align">center</Property>
+            </DataColumn>
+            <DataColumn name="result">
+              <Property name="property">result</Property>
+              <Property name="align">center</Property>
+              <Property name="readOnly">true</Property>
             </DataColumn>
             <DataColumn name="remarks">
               <Property name="property">remarks</Property>
+              <Property name="align">center</Property>
             </DataColumn>
           </DataGrid>
         </Container>

--
Gitblit v1.9.3