From 69cd9f59a0fabf12f8c9147fcba7f69817a870b3 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 06 十一月 2023 23:40:59 +0800
Subject: [PATCH] 更新仓内抓拍2

---
 igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml |  471 +++++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 346 insertions(+), 125 deletions(-)

diff --git a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
index c697be5..3359796 100644
--- a/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
+++ b/igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml
@@ -8,8 +8,8 @@
 	autoByDepot(arg.newValue);&#xD;
 }&#xD;
 if(arg.property ==&quot;foodVariety&quot;){&#xD;
-    checkByFood(arg.newValue);&#xD;
-}</ClientEvent>
+	checkByFood(arg.newValue);&#xD;
+}       </ClientEvent>
       <Property name="creationType">com.ld.igds.models.MQuality</Property>
       <PropertyDef name="id">
         <Property name="label">ID</Property>
@@ -21,13 +21,13 @@
         <Property name="label">搴撳尯缂栫爜</Property>
       </PropertyDef>
       <PropertyDef name="depotId">
-        <Property name="mapping">
-          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
-          <Property name="keyProperty">id</Property>
-          <Property name="valueProperty">name</Property>
-        </Property>
         <Property name="label">妫�娴嬩粨搴�</Property>
         <Property name="required">true</Property>
+        <Property name="mapping">
+          <Property name="keyProperty">id</Property>
+          <Property name="valueProperty">name</Property>
+          <Property name="mapValues">${dorado.getDataProvider(&quot;depotPR#getAllCache&quot;).getResult()}</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="foodVariety">
         <Property name="mapping">
@@ -91,20 +91,27 @@
       <PropertyDef name="checkUser">
         <Property name="label">鎵︽牱浜�</Property>
       </PropertyDef>
-      <PropertyDef name="checkNum">
+      <PropertyDef name="ypsl">
         <Property name="label">鏍峰搧鏁伴噺</Property>
-        <Property name="displayFormat">0.0%</Property>
         <Property name="dataType">Double</Property>
+        <Property name="displayFormat">0.## KG</Property>
       </PropertyDef>
       <PropertyDef name="checkTime">
         <Property name="label">鎵︽牱鏃堕棿</Property>
         <Property name="dataType">Date</Property>
       </PropertyDef>
-      <PropertyDef name="checkRepresent">
-        <Property name="label">鏍峰搧浠h〃</Property>
+      <PropertyDef name="dbsl">
+        <Property name="label">鏍峰搧浠h〃鏁伴噺</Property>
+        <Property name="dataType">Double</Property>
+        <Property name="displayFormat">0.## KG</Property>
       </PropertyDef>
-      <PropertyDef name="checkLevel">
+      <PropertyDef name="ypdj">
         <Property name="label">鏍峰搧绛夌骇</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;dicTriggerPR#dicTrigger&quot;).getResult(&quot;FOOD_LEVEL_&quot;)}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
       </PropertyDef>
       <PropertyDef name="normalYear">
         <Property name="label">姝e父瀛樺偍骞撮檺</Property>
@@ -128,8 +135,48 @@
       <PropertyDef name="remark">
         <Property name="label">澶囨敞淇℃伅</Property>
       </PropertyDef>
+      <PropertyDef name="storeDate">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鍏ュ簱鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="unit">
+        <Property></Property>
+        <Property name="label">妫�楠屽崟浣�</Property>
+      </PropertyDef>
+      <PropertyDef name="zblb">
+        <Property></Property>
+        <Property name="label">鎸囨爣绫诲埆</Property>
+      </PropertyDef>
+      <PropertyDef name="qfrq">
+        <Property name="dataType">Date</Property>
+        <Property name="label">绛惧彂鏃ユ湡</Property>
+      </PropertyDef>
+      <PropertyDef name="bgcjsj">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鎶ュ憡鍑哄叿鏃堕棿</Property>
+      </PropertyDef>
+      <PropertyDef name="shrxm">
+        <Property></Property>
+        <Property name="label">瀹℃牳浜哄鍚�</Property>
+      </PropertyDef>
+      <PropertyDef name="qydbh">
+        <Property></Property>
+        <Property name="label">鎵︽牱鍗曠紪鍙�</Property>
+      </PropertyDef>
+      <PropertyDef name="jdrxm">
+        <Property></Property>
+        <Property name="label">鐩戠潱浜哄鍚�</Property>
+      </PropertyDef>
+      <PropertyDef name="ypbh">
+        <Property></Property>
+        <Property name="label">鏍峰搧缂栧彿</Property>
+      </PropertyDef>
+      <PropertyDef name="updateTime">
+        <Property name="dataType">Date</Property>
+        <Property name="label">鏁版嵁鏇存柊鏃堕棿</Property>
+      </PropertyDef>
       <Reference name="checkItems">
-        <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
+        <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
         <Property name="dataType">[dtCheckItems]</Property>
         <Property name="parameter">
           <Entity>
@@ -203,6 +250,62 @@
       <PropertyDef name="remarks">
         <Property name="label">鍖栭獙缁撴灉</Property>
       </PropertyDef>
+      <PropertyDef name="operaSymbolValue">
+        <Property></Property>
+      </PropertyDef>
+      <PropertyDef name="operaSymbol">
+        <Property></Property>
+        <Property name="label">杩愮畻绗﹀彿</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleNum">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵i噸绯绘暟</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleAdd">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧為噸%</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleAddEnd">
+        <Property name="dataType">Double</Property>
+        <Property name="label">澧為噸涓婇檺%</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleReduce">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵i噸鍊�%</Property>
+      </PropertyDef>
+      <PropertyDef name="rulePrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵h垂绯绘暟</Property>
+      </PropertyDef>
+      <PropertyDef name="ruleReducePrice">
+        <Property name="dataType">Double</Property>
+        <Property name="label">鎵h垂</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">鎵i噸</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">鎵d环</Property>
+      </PropertyDef>
+      <PropertyDef name="result">
+        <Property></Property>
+        <Property name="label">妫�楠岀粨鏋�</Property>
+        <Property name="mapping">
+          <Property name="mapValues">${dorado.getDataProvider(&quot;inoutDataPR#triggerResult&quot;).getResult()}</Property>
+          <Property name="keyProperty">code</Property>
+          <Property name="valueProperty">name</Property>
+        </Property>
+      </PropertyDef>
     </DataType>
     <DataType name="dataTypeUser">
       <Property name="creationType">com.bstek.bdf2.core.model.DefaultUser</Property>
@@ -215,8 +318,9 @@
         </Validator>
         <Validator type="custom">
           <ClientEvent name="onValidate">if (arg.entity.get(&quot;confirmPassword&quot;)){
-	arg.entity.validate(&quot;confirmPassword&quot;);
-}</ClientEvent>
+                        arg.entity.validate(&quot;confirmPassword&quot;);
+                        }
+                    </ClientEvent>
         </Validator>
       </PropertyDef>
       <PropertyDef name="confirmPassword">
@@ -225,12 +329,13 @@
         <Property name="required">true</Property>
         <Validator type="custom">
           <ClientEvent name="onValidate">var confirm = arg.data;&#xD;
-var password = arg.entity.get(&quot;password&quot;);&#xD;
-if (confirm ==password) {&#xD;
-	arg.result = { state:&quot;ok&quot;}&#xD;
-} else {&#xD;
-	arg.result = { state:&quot;error&quot;, text: &quot;涓ゆ瀵嗙爜涓嶄竴鑷�&quot;};	&#xD;
-}</ClientEvent>
+                        var password = arg.entity.get(&quot;password&quot;);&#xD;
+                        if (confirm ==password) {&#xD;
+                        arg.result = { state:&quot;ok&quot;}&#xD;
+                        } else {&#xD;
+                        arg.result = { state:&quot;error&quot;, text: &quot;涓ゆ瀵嗙爜涓嶄竴鑷�&quot;}; &#xD;
+                        }
+                    </ClientEvent>
         </Validator>
       </PropertyDef>
       <PropertyDef name="salt">
@@ -319,7 +424,8 @@
         <Property name="required">true</Property>
         <Validator type="regExp">
           <Property name="resultMessage">閭鏍煎紡杈撳叆閿欒</Property>
-          <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$</Property>
+          <Property name="whiteRegExp">^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$
+                    </Property>
           <Property name="validateMode">whiteBlack</Property>
         </Validator>
         <Validator type="length">
@@ -330,32 +436,38 @@
         <Property name="dataType">String</Property>
       </PropertyDef>
     </DataType>
+    <DataType name="dtMetrics">
+      <PropertyDef name="code"/>
+      <PropertyDef name="name"/>
+    </DataType>
+    <DataType name="dtResult">
+      <PropertyDef name="name"/>
+    </DataType>
   </Model>
   <View layout="padding:5;regionPadding:5">
     <ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�&#xD;
 &#xD;
 //鏍规嵁浠撳簱鑷姩鍥炲~绮鍝佺锛岀櫥璁帮紝浜у湴鏂�&#xD;
 autoByDepot = function(depotId){&#xD;
-	view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
-		if(result){&#xD;
-			var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-			data.set(&quot;foodLocation&quot;,result.foodLocation);&#xD;
-			data.set(&quot;foodLevel&quot;,result.foodLevel);&#xD;
-			data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
-			data.set(&quot;foodType&quot;,result.foodType);&#xD;
-		}&#xD;
-	});&#xD;
+   view.get(&quot;#ajaxGetDepot&quot;).set(&quot;parameter&quot;,depotId).execute(function(result){&#xD;
+     if(result){&#xD;
+     var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+     data.set(&quot;foodLocation&quot;,result.foodLocation);&#xD;
+     data.set(&quot;foodLevel&quot;,result.foodLevel);&#xD;
+     data.set(&quot;foodVariety&quot;,result.foodVariety);&#xD;
+     data.set(&quot;foodType&quot;,result.foodType);&#xD;
+	}&#xD;
+});&#xD;
 };&#xD;
-&#xD;
 //鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉&#xD;
 checkByFood = function(foodVariety){&#xD;
-	view.get(&quot;#ajaxGetCheck&quot;).set(&quot;parameter&quot;,{foodVariety:foodVariety,deptId:deptId}).execute(function(result){&#xD;
-    	if(result){&#xD;
-        	var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-        	data.set(&quot;checkItems&quot;,result);&#xD;
-        }&#xD;
-	}); &#xD;
-};</ClientEvent>
+view.get(&quot;#ajaxGetCheck&quot;).set(&quot;parameter&quot;,{foodVariety:foodVariety,deptId:deptId}).execute(function(result){&#xD;
+if(result){&#xD;
+ var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
+ data.set(&quot;checkItems&quot;,result);&#xD;
+	}&#xD;
+  }); &#xD;
+};      </ClientEvent>
     <Property name="packages">font-awesome,css-common</Property>
     <DataSet id="dsMain">
       <Property name="loadMode">lazy</Property>
@@ -372,6 +484,38 @@
       <Property name="pageSize">100</Property>
       <Property name="dataProvider">bdf2.userMaintain#loadUsers</Property>
     </DataSet>
+    <DataSet id="dsMetrics">
+      <ClientEvent name="onCreate">var data = [ {&#xD;
+	name : &quot;1:璐ㄩ噺鎸囨爣妫�楠�&quot;&#xD;
+}, {&#xD;
+	name : &quot;2:鍌ㄥ瓨鍝佽川妫�楠�&quot;&#xD;
+}, {&#xD;
+	name : &quot;3:椋熷搧瀹夊叏妫�楠�&quot;&#xD;
+}]&#xD;
+self.setData(data);&#xD;
+</ClientEvent>
+      <Property name="dataType">[dtMetrics]</Property>
+    </DataSet>
+    <DataSet id="dsResult">
+      <ClientEvent name="onCreate">var data = [ {&#xD;
+	name : &quot;杈炬爣&quot;&#xD;
+}, {&#xD;
+	name : &quot;涓嶈揪鏍�&quot;&#xD;
+}, {&#xD;
+	name : &quot;瀹滃瓨&quot;&#xD;
+},{&#xD;
+	name : &quot;杞诲害涓嶅疁瀛�&quot;&#xD;
+},{&#xD;
+	name : &quot;閲嶅害涓嶅疁瀛�&quot;&#xD;
+}, {&#xD;
+	name : &quot;鍚堟牸&quot;&#xD;
+}, {&#xD;
+	name : &quot;涓嶅悎鏍�&quot;&#xD;
+}]&#xD;
+self.setData(data);&#xD;
+</ClientEvent>
+      <Property name="dataType">[dtResult]</Property>
+    </DataSet>
     <Container layout="regionPadding:10" layoutConstraint="top">
       <Property name="exClassName">bg-color</Property>
       <Property name="contentOverflow">hidden</Property>
@@ -381,40 +525,42 @@
       </Label>
       <Button layoutConstraint="left">
         <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).insert();&#xD;
-view.get(&quot;#dialogMain&quot;).show();</ClientEvent>
+view.get(&quot;#dialogMain&quot;).show();              </ClientEvent>
         <Property name="caption">鏂板</Property>
         <Property name="exClassName">btn-default</Property>
         <Property name="iconClass">fa fa-plus</Property>
       </Button>
       <Button layoutConstraint="left">
         <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-if(data){&#xD;
-	view.get(&quot;#dialogMain&quot;).show();&#xD;
-}</ClientEvent>
+                    if(data){&#xD;
+                    view.get(&quot;#dialogMain&quot;).show();&#xD;
+                    }
+                </ClientEvent>
         <Property name="caption">淇敼</Property>
         <Property name="exClassName">btn-warm</Property>
         <Property name="iconClass">fa fa-pencil</Property>
       </Button>
       <Button layoutConstraint="left">
         <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-if(!data){&#xD;
-	return;&#xD;
-}&#xD;
-view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
-	if(result){&#xD;
-		$alert(result);&#xD;
-		return;&#xD;
-	}else{&#xD;
-		data.remove();&#xD;
-	}&#xD;
-});</ClientEvent>
+                    if(!data){&#xD;
+                    return;&#xD;
+                    }&#xD;
+                    view.get(&quot;#ajaxDel&quot;).set(&quot;parameter&quot;,data).execute(function(result){&#xD;
+                    if(result){&#xD;
+                    $alert(result);&#xD;
+                    return;&#xD;
+                    }else{&#xD;
+                    data.remove();&#xD;
+                    }&#xD;
+                    });
+                </ClientEvent>
         <Property name="caption">鍒犻櫎</Property>
         <Property name="exClassName">btn-warn</Property>
         <Property name="iconClass">fa fa-minus</Property>
       </Button>
       <Button layoutConstraint="left">
         <ClientEvent name="onClick">view.get(&quot;#dsMain&quot;).flushAsync();&#xD;
-</ClientEvent>
+                </ClientEvent>
         <Property name="caption">鍒锋柊</Property>
         <Property name="exClassName">btn-default</Property>
         <Property name="iconClass">fa fa-refresh</Property>
@@ -451,7 +597,8 @@
         <Container layout="hbox regionPadding:15">
           <Button layoutConstraint="left">
             <ClientEvent name="onClick">var param = view.get(&quot;#dsParam.data&quot;);&#xD;
-view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();</ClientEvent>
+                            view.get(&quot;#dsMain&quot;).set(&quot;parameter&quot;,param.toJSON()).flushAsync();
+                        </ClientEvent>
             <Property name="caption">鏌ヨ</Property>
             <Property name="exClassName">btn-default</Property>
             <Property name="iconClass">fa fa-refresh</Property>
@@ -467,8 +614,8 @@
       <DataGrid layoutConstraint="center padding:5px">
         <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
 if(data){&#xD;
-	view.get(&quot;#dialogMain&quot;).show();&#xD;
-}</ClientEvent>
+    view.get(&quot;#dialogMain&quot;).show();&#xD;
+}              </ClientEvent>
         <Property name="dataSet">dsMain</Property>
         <Property name="readOnly">true</Property>
         <RowNumColumn/>
@@ -486,11 +633,6 @@
           <Property name="property">foodVariety</Property>
           <Property name="align">center</Property>
           <Property name="name">foodVariety</Property>
-        </DataColumn>
-        <DataColumn>
-          <Property name="property">foodType</Property>
-          <Property name="align">center</Property>
-          <Property name="name">foodType</Property>
         </DataColumn>
         <DataColumn>
           <Property name="property">foodLevel</Property>
@@ -532,6 +674,18 @@
       </DataPilot>
     </Container>
     <Dialog id="dialogMain">
+      <ClientEvent name="beforeShow">var data = view.get(&quot;#dsMain.data:#&quot;)&#xD;
+var metricsBefore = data.get(&quot;zblb&quot;)&#xD;
+if(metricsBefore){&#xD;
+	var list = metricsBefore.split(&quot;#&quot;);&#xD;
+	var metrics =&quot;&quot; ;&#xD;
+	list.forEach(item=>{&#xD;
+		if(item == 1)metrics+=&quot;1:璐ㄩ噺鎸囨爣妫�楠�#&quot;;&#xD;
+		if(item == 2)metrics+=&quot;2:鍌ㄥ瓨鍝佽川妫�楠�#&quot;;&#xD;
+		if(item == 3)metrics+=&quot;3:椋熷搧瀹夊叏妫�楠�#&quot;;	&#xD;
+	});&#xD;
+	data.set(&quot;zblb&quot;, metrics.substring(0,metrics.length-1));&#xD;
+}</ClientEvent>
       <Property name="visible">false</Property>
       <Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
       <Property name="width">80%</Property>
@@ -540,20 +694,22 @@
       <Buttons>
         <Button>
           <ClientEvent name="onClick">var data = view.get(&quot;#dsMain.data:#&quot;);&#xD;
-if(data.validate() != 'ok'){&#xD;
-	$notify(&quot;鏁版嵁鏍¢獙澶辫触锛侊紒&quot;);&#xD;
-	return;&#xD;
-}&#xD;
-view.get(&quot;#uaAction&quot;).set(&quot;parameter&quot;,data).execute(function(){&#xD;
-	self.get(&quot;parent&quot;).hide();&#xD;
-});</ClientEvent>
+                        if(data.validate() != 'ok'){&#xD;
+                        $notify(&quot;鏁版嵁鏍¢獙澶辫触锛侊紒&quot;);&#xD;
+                        return;&#xD;
+                        }&#xD;
+                        view.get(&quot;#uaAction&quot;).set(&quot;parameter&quot;,data).execute(function(){&#xD;
+                        self.get(&quot;parent&quot;).hide();&#xD;
+                        });
+                    </ClientEvent>
           <Property name="caption">淇濆瓨</Property>
           <Property name="iconClass">fa fa-check</Property>
           <Property name="exClassName">btn-normal</Property>
         </Button>
         <Button>
           <ClientEvent name="onClick">view.get(&quot;#dsMain.data:#&quot;).cancel();&#xD;
-self.get(&quot;parent&quot;).hide();</ClientEvent>
+                        self.get(&quot;parent&quot;).hide();
+                    </ClientEvent>
           <Property name="caption">鍙栨秷</Property>
           <Property name="iconClass">fa fa-times</Property>
           <Property name="exClassName">btn-warn</Property>
@@ -567,7 +723,7 @@
             <AutoForm>
               <Property name="dataSet">dsMain</Property>
               <Property name="readOnly">false</Property>
-              <Property name="labelSeparator"> : </Property>
+              <Property name="labelSeparator">:</Property>
               <Property name="labelAlign">right</Property>
               <Property name="cols">*,*,*</Property>
               <Property name="labelWidth">120</Property>
@@ -603,8 +759,8 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">foodType</Property>
-                <Property name="property">foodType</Property>
+                <Property name="name">foodLevel</Property>
+                <Property name="property">foodLevel</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -614,13 +770,13 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">checkNum</Property>
-                <Property name="property">checkNum</Property>
+                <Property name="name">ypsl</Property>
+                <Property name="property">ypsl</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">foodLevel</Property>
-                <Property name="property">foodLevel</Property>
+                <Property name="name">unit</Property>
+                <Property name="property">unit</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -634,19 +790,18 @@
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">foodLocation</Property>
-                <Property name="property">foodLocation</Property>
-                <Property name="trigger">ddFoodOrigin</Property>
+                <Property name="name">shrxm</Property>
+                <Property name="property">shrxm</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">checkRepresent</Property>
-                <Property name="property">checkRepresent</Property>
+                <Property name="name">dbsl</Property>
+                <Property name="property">dbsl</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
-                <Property name="name">checkLevel</Property>
-                <Property name="property">checkLevel</Property>
+                <Property name="name">ypdj</Property>
+                <Property name="property">ypdj</Property>
                 <Editor/>
               </AutoFormElement>
               <AutoFormElement>
@@ -666,10 +821,33 @@
                 </Editor>
               </AutoFormElement>
               <AutoFormElement layoutConstraint="colSpan:2">
+                <Property name="name">zblb</Property>
+                <Property name="property">zblb</Property>
+                <Editor>
+                  <TagEditor>
+                    <Property name="textSeperator">#</Property>
+                    <Property name="availableTagsDataSet">dsMetrics</Property>
+                    <Property name="availableTagsDataPath">.name</Property>
+                  </TagEditor>
+                </Editor>
+              </AutoFormElement>
+              <AutoFormElement layoutConstraint="colSpan:1">
                 <Property name="name">result</Property>
                 <Property name="property">result</Property>
-                <Editor/>
+                <Editor>
+                  <TagEditor>
+                    <Property name="availableTagsDataPath">.name</Property>
+                    <Property name="availableTagsDataSet">dsResult</Property>
+                    <Property name="textSeperator">#</Property>
+                  </TagEditor>
+                </Editor>
               </AutoFormElement>
+              <Label layoutConstraint="colSpan:2">
+                <Property name="text">璇存槑锛氬椤规寚鏍囨椂鎸夌収1:璐ㄩ噺鎸囨爣妫�楠�(杈炬爣,涓嶈揪鏍�)銆�2:鍌ㄥ瓨鍝佽川妫�楠�(瀹滃瓨,涓嶅疁瀛�)銆�3:椋熷搧瀹夊叏妫�楠�(鍚堟牸,涓嶅悎鏍�)杩欎釜椤哄簭濉啓妫�楠岀粨璁�</Property>
+                <Property name="style">
+                  <Property name="color">blue</Property>
+                </Property>
+              </Label>
               <AutoFormElement layoutConstraint="colSpan:3">
                 <Property name="name">remark</Property>
                 <Property name="property">remark</Property>
@@ -686,51 +864,90 @@
           <Buttons/>
           <Children>
             <DataGrid id="dataGridCheckItem">
+              <ClientEvent name="onCellValueEdit">var data = arg.entity&#xD;
+if (data) {&#xD;
+	//濉啓鐨勬暟鎹��;&#xD;
+	var newValue = data.get(&quot;value&quot;);&#xD;
+	//鏍囧噯鍊�;&#xD;
+	var limit = data.get(&quot;upperLimit&quot;);&#xD;
+	//杩愮畻绗�;&#xD;
+	var symbol = data.get(&quot;operaSymbol&quot;);&#xD;
+	if (symbol &amp;&amp; limit &amp;&amp; newValue) {&#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;
+			}&#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;
+			}&#xD;
+			else {&#xD;
+				data.set(&quot;result&quot;, &quot;1&quot;);&#xD;
+			}&#xD;
+		}&#xD;
+	}&#xD;
+}</ClientEvent>
               <Property name="dataPath">#.checkItems</Property>
               <Property name="dataSet">dsMain</Property>
               <Property name="hideMode">display</Property>
               <Property name="highlightCurrentRow">false</Property>
               <Property name="visible">true</Property>
               <RowNumColumn/>
-              <DataColumn>
-                <Property name="name">standardName</Property>
+              <DataColumn name="standardName">
                 <Property name="property">standardName</Property>
                 <Property name="align">center</Property>
-                <Property name="readOnly">true</Property>
-                <Editor/>
               </DataColumn>
-              <DataColumn>
-                <Property name="name">value</Property>
+              <DataColumn name="value">
                 <Property name="property">value</Property>
                 <Property name="align">center</Property>
-                <Editor/>
               </DataColumn>
-              <DataColumn>
-                <Property name="name">upperLimit</Property>
-                <Property name="property">upperLimit</Property>
-                <Property name="align">center</Property>
-                <Property name="readOnly">true</Property>
-                <Editor/>
-              </DataColumn>
-              <DataColumn>
-                <Property name="name">lowerLimit</Property>
-                <Property name="property">lowerLimit</Property>
-                <Property name="align">center</Property>
-                <Property name="readOnly">true</Property>
-                <Editor/>
-              </DataColumn>
-              <DataColumn>
-                <Property name="name">unit</Property>
+              <DataColumn name="unit">
                 <Property name="property">unit</Property>
                 <Property name="align">center</Property>
                 <Property name="readOnly">true</Property>
-                <Editor/>
               </DataColumn>
-              <DataColumn>
-                <Property name="name">remarks</Property>
+              <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>
-                <Editor/>
               </DataColumn>
             </DataGrid>
           </Children>
@@ -753,7 +970,7 @@
       <Property name="service">depotPR#getDepot</Property>
     </AjaxAction>
     <AjaxAction id="ajaxGetCheck">
-      <Property name="service">checkStandardPR#listCheckItemsByFoodVariety</Property>
+      <Property name="service">checkStandardPR#listCheckItemsByParam</Property>
     </AjaxAction>
     <CustomDropDown id="ddFoodOrigin">
       <Property name="minHeight">480</Property>
@@ -761,36 +978,39 @@
       <Property name="minWidth">360</Property>
       <Container layout="regionPadding:5">
         <DataSet id="dsFoodOrigin">
-          <Property name="dataProvider">dicTriggerPR#pagFoodLocationData</Property>
-          <Property name="dataType">[dtFoodOrigin]</Property>
+          <Property name="dataProvider">dicAreaPR#pageList</Property>
+          <Property name="dataType">[dtArea]</Property>
           <Property name="parameter"></Property>
           <Property name="pageSize">30</Property>
         </DataSet>
         <Container layout="hbox regionPadding:5">
           <TextEditor id="key2">
-            <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+            <Property name="blankText">-- 缂栫爜鎴栬�呭悕绉� --</Property>
             <Property name="width">200</Property>
           </TextEditor>
           <Button>
             <ClientEvent name="onClick">var key = view.get(&quot;#key2.value&quot;);&#xD;
-view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();</ClientEvent>
+                            view.get(&quot;#dsFoodOrigin&quot;).set(&quot;parameter&quot;,{key:key}).flushAsync();
+                        </ClientEvent>
             <Property name="caption">鏌ヨ</Property>
             <Property name="iconClass">fa fa-search</Property>
           </Button>
           <Button>
             <ClientEvent name="onClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
-if(data){&#xD;
-	view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
-}</ClientEvent>
+                            if(data){&#xD;
+                            view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
+                            }
+                        </ClientEvent>
             <Property name="iconClass">fa fa-check</Property>
             <Property name="caption">纭畾</Property>
           </Button>
         </Container>
         <DataGrid>
           <ClientEvent name="onDataRowDoubleClick">var data = view.get(&quot;#dsFoodOrigin.data:#&quot;);&#xD;
-if(data){&#xD;
-	view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
-}</ClientEvent>
+                        if(data){&#xD;
+                        view.get(&quot;#ddFoodOrigin&quot;).close(data.toJSON());&#xD;
+                        }
+                    </ClientEvent>
           <Property name="dataSet">dsFoodOrigin</Property>
           <Property name="readOnly">true</Property>
           <DataColumn name="code">
@@ -800,7 +1020,8 @@
           </DataColumn>
           <DataColumn name="name">
             <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = &quot;bold&quot;;&#xD;
-arg.processDefault = true;</ClientEvent>
+                            arg.processDefault = true;
+                        </ClientEvent>
             <Property name="property">name</Property>
             <Property name="readOnly">true</Property>
             <Property name="align">center</Property>

--
Gitblit v1.9.3