From 2884bf1f32b51129a83125ecfc2cf8526f71154f Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 24 八月 2023 15:34:43 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 4
---
igds-core/src/main/java/com/ld/igds/m/view/QualityManager.view.xml | 398 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 297 insertions(+), 101 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 12c04ae..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
@@ -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>
@@ -41,9 +40,7 @@
</PropertyDef>
<PropertyDef name="foodLevel">
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
- ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}
- </Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_LEVEL_")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -52,8 +49,7 @@
<PropertyDef name="foodType">
<Property name="label">绮鎬ц川</Property>
<Property name="mapping">
- <Property name="mapValues"> ${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}
- </Property>
+ <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_TYPE_")}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -64,8 +60,7 @@
<PropertyDef name="type">
<Property name="label">妫�楠岀被鍒�</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
- </Property>
+ <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -75,9 +70,7 @@
<Property name="label">妫�楠屼緷鎹�</Property>
<Property name="required">true</Property>
<Property name="mapping">
- <Property name="mapValues">
- ${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}
- </Property>
+ <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerStandard").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -98,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>
@@ -134,6 +134,46 @@
</PropertyDef>
<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#listCheckItemsByParam</Property>
@@ -160,9 +200,7 @@
<PropertyDef name="type">
<Property name="label">妫�楠岀被鍒�</Property>
<Property name="mapping">
- <Property name="mapValues">
- ${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}
- </Property>
+ <Property name="mapValues">${dorado.getDataProvider("qualityManagerPR#triggerType").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -211,6 +249,62 @@
</PropertyDef>
<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">鎵ｉ噸绯绘暟</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>
+ <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">
@@ -342,33 +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;//鐖堕〉闈腑鐨勫垎搴撶紪鐮�
- 
- //鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
- 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>
@@ -385,6 +484,38 @@
<Property name="pageSize">100</Property>
<Property name="dataProvider">bdf2.userMaintain#loadUsers</Property>
</DataSet>
+ <DataSet id="dsMetrics">
+ <ClientEvent name="onCreate">var data = [ {
+ name : "1:璐ㄩ噺鎸囨爣妫�楠�"
+}, {
+ name : "2:鍌ㄥ瓨鍝佽川妫�楠�"
+}, {
+ name : "3:椋熷搧瀹夊叏妫�楠�"
+}]
+self.setData(data);
+</ClientEvent>
+ <Property name="dataType">[dtMetrics]</Property>
+ </DataSet>
+ <DataSet id="dsResult">
+ <ClientEvent name="onCreate">var data = [ {
+ name : "杈炬爣"
+}, {
+ name : "涓嶈揪鏍�"
+}, {
+ name : "瀹滃瓨"
+},{
+ name : "杞诲害涓嶅疁瀛�"
+},{
+ name : "閲嶅害涓嶅疁瀛�"
+}, {
+ name : "鍚堟牸"
+}, {
+ name : "涓嶅悎鏍�"
+}]
+self.setData(data);
+</ClientEvent>
+ <Property name="dataType">[dtResult]</Property>
+ </DataSet>
<Container layout="regionPadding:10" layoutConstraint="top">
<Property name="exClassName">bg-color</Property>
<Property name="contentOverflow">hidden</Property>
@@ -394,8 +525,7 @@
</Label>
<Button layoutConstraint="left">
<ClientEvent name="onClick">view.get("#dsMain").insert();
- view.get("#dialogMain").show();
- </ClientEvent>
+view.get("#dialogMain").show(); </ClientEvent>
<Property name="caption">鏂板</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-plus</Property>
@@ -483,10 +613,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/>
@@ -504,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>
@@ -550,6 +674,18 @@
</DataPilot>
</Container>
<Dialog id="dialogMain">
+ <ClientEvent name="beforeShow">var data = view.get("#dsMain.data:#")
+var metricsBefore = data.get("zblb")
+if(metricsBefore){
+ var list = metricsBefore.split("#");
+ var metrics ="" ;
+ list.forEach(item=>{
+ if(item == 1)metrics+="1:璐ㄩ噺鎸囨爣妫�楠�#";
+ if(item == 2)metrics+="2:鍌ㄥ瓨鍝佽川妫�楠�#";
+ if(item == 3)metrics+="3:椋熷搧瀹夊叏妫�楠�#"; 
+ });
+ data.set("zblb", metrics.substring(0,metrics.length-1));
+}</ClientEvent>
<Property name="visible">false</Property>
<Property name="caption">璐ㄩ噺宸℃淇℃伅</Property>
<Property name="width">80%</Property>
@@ -594,7 +730,6 @@
<AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
- <Property name="trigger">autoMappingDropDown2</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -624,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>
@@ -635,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>
@@ -655,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>
@@ -687,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>
@@ -707,51 +864,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