From 65af56af565a47e191aa76ede4a62ab3fd91e789 Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期一, 24 七月 2023 09:10:28 +0800
Subject: [PATCH] 质量巡检添添加优化
---
igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 242 ++++++++++++++++++++++++++++++++++--------------
1 files changed, 170 insertions(+), 72 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 711df16..1da57df 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
@@ -5,12 +5,11 @@
<Model>
<DataType name="dtMain">
<ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
- }
- if(arg.property =="foodVariety"){
- checkByFood(arg.newValue);
- }
- </ClientEvent>
+ autoByDepot(arg.newValue);
+}
+if(arg.property =="foodVariety"){
+ checkByFood(arg.newValue);
+} </ClientEvent>
<Property name="creationType">com.ld.igds.models.MQuality</Property>
<PropertyDef name="id">
<Property name="label">ID</Property>
@@ -92,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">鏍峰搧浠ｈ〃</Property>
+ <PropertyDef name="dbsl">
+ <Property name="label">鏍峰搧浠ｈ〃鏁伴噺</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("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
<PropertyDef name="normalYear">
<Property name="label">姝ｅ父瀛樺偍骞撮檺</Property>
@@ -203,6 +209,62 @@
</PropertyDef>
<PropertyDef name="remarks">
<Property name="label">鍖栭獙缁撴灉</Property>
+ </PropertyDef>
+ <PropertyDef name="operaSymbolValue">
+ <Property/>
+ </PropertyDef>
+ <PropertyDef name="operaSymbol">
+ <Property/>
+ <Property name="label">杩愮畻绗﹀彿</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleNum">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｉ噸绯绘暟</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">鎵ｉ噸鍊�%</Property>
+ </PropertyDef>
+ <PropertyDef name="rulePrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｈ垂绯绘暟</Property>
+ </PropertyDef>
+ <PropertyDef name="ruleReducePrice">
+ <Property name="dataType">Double</Property>
+ <Property name="label">鎵ｈ垂</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 name="label">妫�楠岀粨鏋�</Property>
+ <Property name="mapping">
+ <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerResult").getResult()}</Property>
+ <Property name="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ </Property>
</PropertyDef>
</DataType>
<DataType name="dataTypeUser">
@@ -337,30 +399,28 @@
</Model>
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">var deptId = window.parent.DEPT_ID;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
- 
- //鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
- autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
- if(result){
- var data = view.get("#dsMain.data:#");
- data.set("foodLocation",result.foodLocation);
- data.set("foodLevel",result.foodLevel);
- data.set("foodVariety",result.foodVariety);
- data.set("foodType",result.foodType);
- }
- });
- };
- 
- //鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
- checkByFood = function(foodVariety){
- view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
- if(result){
- var data = view.get("#dsMain.data:#");
- data.set("checkItems",result);
- }
- }); 
- };
- </ClientEvent>
+
+//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
+autoByDepot = function(depotId){
+ view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
+ if(result){
+ var data = view.get("#dsMain.data:#");
+ data.set("foodLocation",result.foodLocation);
+ data.set("foodLevel",result.foodLevel);
+ data.set("foodVariety",result.foodVariety);
+ data.set("foodType",result.foodType);
+ }
+});
+};
+//鏍规嵁绮鍝佺鏌ヨ鍖栭獙椤瑰苟鍥炴樉
+checkByFood = function(foodVariety){
+view.get("#ajaxGetCheck").set("parameter",{foodVariety:foodVariety,deptId:deptId}).execute(function(result){
+if(result){
+ var data = view.get("#dsMain.data:#");
+ data.set("checkItems",result);
+ }
+ }); 
+}; </ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="loadMode">lazy</Property>
@@ -474,10 +534,9 @@
</AutoForm>
<DataGrid layoutConstraint="center padding:5px">
<ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsMain.data:#");
- if(data){
- view.get("#dialogMain").show();
- }
- </ClientEvent>
+if(data){
+ view.get("#dialogMain").show();
+} </ClientEvent>
<Property name="dataSet">dsMain</Property>
<Property name="readOnly">true</Property>
<RowNumColumn/>
@@ -625,8 +684,8 @@
<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>
@@ -651,13 +710,13 @@
<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>
@@ -697,51 +756,90 @@
<Buttons/>
<Children>
<DataGrid id="dataGridCheckItem">
+ <ClientEvent name="onCellValueEdit">var data = arg.entity
+if (data) {
+ //濉啓鐨勬暟鎹��;
+ var newValue = data.get("value");
+ //鏍囧噯鍊�;
+ var limit = data.get("upperLimit");
+ //杩愮畻绗�;
+ var symbol = data.get("operaSymbol");
+ if (symbol && limit && newValue) {
+ if (">=" == symbol) {
+ if (newValue < limit) {
+ data.set("result", "0");
+ }
+ else {
+ data.set("result", "1");
+ }
+ }
+ if ("<=" == symbol) {
+ if (newValue > limit) {
+ data.set("result", "0");
+ }
+ else {
+ data.set("result", "1");
+ }
+ }
+ if ("==" == symbol) {
+ if (newValue != limit) {
+ data.set("result", "0");
+ }
+ else {
+ data.set("result", "1");
+ }
+ }
+ }
+}</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>
--
Gitblit v1.9.3