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/inout/view/InoutSettle.view.xml | 346 ++++++++++++---------------------------------------------
1 files changed, 74 insertions(+), 272 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettle.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettle.view.xml
index 615c485..85b9d82 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettle.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettle.view.xml
@@ -3,23 +3,7 @@
<Arguments/>
<Context/>
<Model>
- <DataType name="dtInoutRecord" parent="global:dtInoutRecord">
- <PropertyDef name="settleTag">
- <Property></Property>
- <Property name="label">缁撶畻鐘舵��</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("inoutSettlePR#triggerSettleTag").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="price">
- <Property></Property>
- <Property name="label">鍒濇瀹氫环</Property>
- <Property name="dataType">Double</Property>
- <Property name="displayFormat">0.000 鍏�/鍏枻</Property>
- </PropertyDef>
- </DataType>
+ <DataType name="dtInoutRecord" parent="global:dtInoutRecord"/>
<DataType name="dtQuery">
<Property name="creationType">com.ld.igds.inout.dto.InoutParam</Property>
<PropertyDef name="deptId">
@@ -29,19 +13,13 @@
<PropertyDef name="id">
<Property name="label">鍗曟嵁鍙�</Property>
</PropertyDef>
- <PropertyDef name="type">
- <Property name="label">鍑哄叆搴撶被鍨�</Property>
- </PropertyDef>
- <PropertyDef name="plateNum">
- <Property name="label">杞︾墝鍙�</Property>
- </PropertyDef>
- <PropertyDef name="customerId">
+ <PropertyDef name="contractId">
<Property></Property>
- <Property name="label">寰�鏉ュ崟浣�</Property>
+ <Property name="label">鍚堝悓缂栫爜</Property>
</PropertyDef>
- <PropertyDef name="customerName">
+ <PropertyDef name="contractName">
<Property></Property>
- <Property name="label">寰�鏉ュ崟浣�</Property>
+ <Property name="label">鍚堝悓鍚嶇О</Property>
</PropertyDef>
<PropertyDef name="depotId">
<Property></Property>
@@ -52,24 +30,6 @@
<Property name="valueProperty">name</Property>
</Property>
</PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="settleTag">
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("inoutSettlePR#triggerSettleTag").getResult()}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- <Property name="label">缁撶畻鐘舵��</Property>
- <Property name="defaultValue">N</Property>
- </PropertyDef>
<PropertyDef name="start">
<Property name="label">寮�濮嬫椂闂�</Property>
<Property name="dataType">Date</Property>
@@ -79,66 +39,10 @@
<Property name="dataType">Date</Property>
</PropertyDef>
</DataType>
- <DataType name="dtInoutSettle" parent="global:dtInoutSettle">
- <ClientEvent name="onDataChange">if(arg.property =="payPrice"){
- checkCount(arg.newValue);
-}
-if(arg.property =="otherSum"){
- checkCount(arg.newValue);
-}</ClientEvent>
- <PropertyDef name="depotId">
- <Property></Property>
- <Property name="label">鎵�灞炰粨搴�</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("depotPR#getAllCache").getResult()}</Property>
- <Property name="keyProperty">id</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="deptId">
- <Property></Property>
- </PropertyDef>
- <PropertyDef name="userName">
- <Property></Property>
- <Property name="label">鎵胯繍浜�</Property>
- </PropertyDef>
- <PropertyDef name="plateNum">
- <Property></Property>
- <Property name="label">杞︾墝鍙�</Property>
- </PropertyDef>
- <PropertyDef name="foodVariety">
- <Property></Property>
- <Property name="label">绮鍝佺</Property>
- <Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("FOOD_VARIETY_")}</Property>
- <Property name="keyProperty">code</Property>
- <Property name="valueProperty">name</Property>
- </Property>
- </PropertyDef>
- <PropertyDef name="foodLevel">
- <Property></Property>
- <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="completeTime">
- <Property></Property>
- <Property name="label">瀹屾垚鏃堕棿</Property>
- <Property name="dataType">DateTime</Property>
- </PropertyDef>
- </DataType>
+ <DataType name="dtInoutSettle" parent="global:dtInoutSettle"/>
</Model>
<View layout="padding:5;regionPadding:10">
- <ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";
- 
-//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
-view.get("#dsQuery").insert({
- type: TYPE
-});
- 
+ <ClientEvent name="onReady">
//鏌ヨ
query = function(){
var data = view.get("#dsQuery.data");
@@ -150,7 +54,6 @@
view.get("#dsSettleData").set("parameter",data).flushAsync();
}
};
-query();

//缁撶畻
settle = function(){
@@ -190,6 +93,7 @@
<Property name="packages">font-awesome,css-common</Property>
<Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
<DataSet id="dsQuery">
+ <ClientEvent name="onReady">self.insert();</ClientEvent>
<Property name="dataType">dtQuery</Property>
</DataSet>
<ToolBar layoutConstraint="top">
@@ -220,17 +124,8 @@
</Editor>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">plateNum</Property>
- <Property name="property">plateNum</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">customerName</Property>
- <Property name="property">customerName</Property>
+ <Property name="name">contractName</Property>
+ <Property name="property">contractName</Property>
<Property name="trigger">ddCustomer</Property>
<Property name="editable">false</Property>
<Editor/>
@@ -281,29 +176,18 @@
</AutoForm>
<TabControl id="tabControl1">
<ControlTab>
- <ClientEvent name="onClick">view.get("#btnExcel").set("visible",false);</ClientEvent>
- <Property name="caption">鏈粨绠�</Property>
+ <Property name="caption">鍚堝悓缁撶畻</Property>
<Property name="iconClass">fa fa-th-list</Property>
<Property name="width">150</Property>
<Container layout="regionPadding:10" layoutConstraint="center">
<Property name="exClassName">bg-color</Property>
- <DataSet id="dsInoutRecord">
+ <DataSet id="dsSettle1">
+ <Property name="dataType">[dtInoutSettle]</Property>
+ <Property name="dataProvider">inoutSettlePR#pageSettleIn1</Property>
<Property name="pageSize">20</Property>
- <Property name="dataProvider">inoutSettlePR#pageInoutRecord</Property>
- <Property name="loadMode">manual</Property>
- <Property name="dataType">[dtInoutRecord]</Property>
</DataSet>
- <DataSet id="dsSettle">
- <Property name="dataType">dtInoutSettle</Property>
- <Property name="loadMode">manual</Property>
- <Property name="dataProvider">inoutSettlePR#getSettleByInoutData</Property>
- </DataSet>
- <DataGrid id="dataGridMain" layoutConstraint="center">
- <ClientEvent name="onDataRowDoubleClick">settle();</ClientEvent>
- <ClientEvent name="onDataRowClick">//瀹炵幇鐐瑰嚮鍗抽�変腑
- //self.set("selection",arg.data);
- </ClientEvent>
- <Property name="dataSet">dsInoutRecord</Property>
+ <DataGrid id="dataGridMain1" layoutConstraint="center">
+ <Property name="dataSet">dsSettle1</Property>
<Property name="readOnly">true</Property>
<Property name="dynaRowHeight">false</Property>
<Property name="selectionMode">multiRows</Property>
@@ -313,89 +197,52 @@
<RowNumColumn/>
<DataColumn name="id">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
- arg.dom.style.color = "#f67d06";
- arg.processDefault = true;</ClientEvent>
+arg.dom.style.color = "#f67d06";
+arg.processDefault = true;</ClientEvent>
<Property name="property">id</Property>
<Property name="align">center</Property>
<Property name="width">150</Property>
</DataColumn>
- <DataColumn name="plateNum">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
- arg.processDefault = true;</ClientEvent>
- <Property name="property">plateNum</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="customerName">
- <Property name="property">customerName</Property>
- <Property name="align">center</Property>
- <Property name="width">200</Property>
- </DataColumn>
- <DataColumn name="userName">
- <Property name="property">userName</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="foodVariety">
- <Property name="property">foodVariety</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
<DataColumn name="depotId">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
- arg.processDefault = true;</ClientEvent>
<Property name="property">depotId</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
</DataColumn>
- <DataColumn name="fullWeight">
- <Property name="property">fullWeight</Property>
- <Property name="caption">姣涢噸</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="emptyWeight">
- <Property name="property">emptyWeight</Property>
- <Property name="caption">鐨噸</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="netWeight">
- <Property name="property">netWeight</Property>
- <Property name="align">center</Property>
- <Property name="caption">鍑�閲�</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">deSum</Property>
- <Property name="align">center</Property>
- <Property name="caption">鎬绘墸閲�</Property>
- <Property name="name">deSum</Property>
- <Property name="width">120</Property>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
</DataColumn>
<DataColumn name="settleWeight">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
- arg.processDefault = true;</ClientEvent>
<Property name="property">settleWeight</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
+ </DataColumn>
+ <DataColumn name="payPrice">
+ <Property name="property">payPrice</Property>
</DataColumn>
<DataColumn>
- <Property name="property">price</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- <Property name="name">price</Property>
+ <Property name="property">payMoney</Property>
+ <Property name="name">payMoney</Property>
</DataColumn>
- <DataColumn name="completeTime">
- <Property name="property">completeTime</Property>
- <Property name="width">150</Property>
+ <DataColumn name="payTime">
+ <Property name="property">payTime</Property>
+ </DataColumn>
+ <DataColumn name="payType">
+ <Property name="property">payType</Property>
+ </DataColumn>
+ <DataColumn name="payee">
+ <Property name="property">payee</Property>
+ </DataColumn>
+ <DataColumn name="bank">
+ <Property name="property">bank</Property>
+ </DataColumn>
+ <DataColumn name="bizType">
+ <Property name="property">bizType</Property>
+ </DataColumn>
+ <DataColumn name="payUser">
+ <Property name="property">payUser</Property>
</DataColumn>
</DataGrid>
<ToolBar layoutConstraint="bottom ">
<Fill/>
<DataPilot layoutConstraint="right">
<Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsInoutRecord</Property>
+ <Property name="dataSet">dsSettle1</Property>
</DataPilot>
</ToolBar>
<Dialog id="dialogMain">
@@ -404,6 +251,7 @@
<Property name="width">75%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Property name="showCaptionBar">true</Property>
+ <Property name="ignored">true</Property>
<Buttons>
<Button>
<ClientEvent name="onClick">var data = view.get("#dsInoutRecord.data:#");
@@ -693,22 +541,21 @@
</ControlTab>
<ControlTab>
<ClientEvent name="onClick">view.get("#btnExcel").set("visible",true);</ClientEvent>
- <Property name="caption">宸茬粨绠�</Property>
+ <Property name="caption">鍗曡溅缁撶畻</Property>
<Property name="iconClass">fa fa-jpy</Property>
<Property name="width">150</Property>
<Container layout="regionPadding:10" layoutConstraint="center">
<Property name="exClassName">bg-color</Property>
- <DataSet id="dsSettleData">
+ <DataSet id="dsSettle2">
<Property name="pageSize">20</Property>
- <Property name="dataProvider">inoutSettlePR#pageSettleData</Property>
+ <Property name="dataProvider">inoutSettlePR#pageSettleIn0</Property>
<Property name="dataType">[dtInoutSettle]</Property>
</DataSet>
<DataGrid id="dataGridMain2" layoutConstraint="center">
- <ClientEvent name="onDataRowDoubleClick">settle2();</ClientEvent>
- <ClientEvent name="onDataRowClick"> </ClientEvent>
- <Property name="dataSet">dsSettleData</Property>
+ <Property name="dataSet">dsSettle2</Property>
<Property name="readOnly">true</Property>
<Property name="dynaRowHeight">false</Property>
+ <Property name="selectionMode">multiRows</Property>
<Property name="highlightSelectedRow">true</Property>
<Property name="highlightCurrentRow">true</Property>
<Property name="highlightHoverRow">true</Property>
@@ -721,91 +568,46 @@
<Property name="align">center</Property>
<Property name="width">150</Property>
</DataColumn>
- <DataColumn name="plateNum">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">plateNum</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
- </DataColumn>
- <DataColumn name="customerName">
- <Property name="property">customerName</Property>
- <Property name="align">center</Property>
- <Property name="width">200</Property>
- </DataColumn>
- <DataColumn name="userName">
- <Property name="property">userName</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="foodVariety">
- <Property name="property">foodVariety</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
<DataColumn name="depotId">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
- arg.processDefault = true;</ClientEvent>
<Property name="property">depotId</Property>
- <Property name="align">center</Property>
- <Property name="width">150</Property>
</DataColumn>
- <DataColumn name="paySum">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
-arg.dom.style.color = "#f67d06";
-arg.processDefault = true;</ClientEvent>
- <Property name="property">paySum</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="payTime">
- <Property name="property">payTime</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
- </DataColumn>
- <DataColumn name="fullWeight">
- <Property name="property">fullWeight</Property>
- <Property name="caption">姣涢噸</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="emptyWeight">
- <Property name="property">emptyWeight</Property>
- <Property name="caption">鐨噸</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn name="netWeight">
- <Property name="property">netWeight</Property>
- <Property name="align">center</Property>
- <Property name="caption">鍑�閲�</Property>
- <Property name="width">120</Property>
- </DataColumn>
- <DataColumn>
- <Property name="property">deSum</Property>
- <Property name="align">center</Property>
- <Property name="caption">鎬绘墸閲�</Property>
- <Property name="name">deSum</Property>
- <Property name="width">120</Property>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
</DataColumn>
<DataColumn name="settleWeight">
- <ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
- arg.processDefault = true;</ClientEvent>
<Property name="property">settleWeight</Property>
- <Property name="align">center</Property>
- <Property name="width">120</Property>
</DataColumn>
<DataColumn name="payPrice">
<Property name="property">payPrice</Property>
- <Property name="width">150</Property>
- <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn>
+ <Property name="property">payMoney</Property>
+ <Property name="name">payMoney</Property>
+ </DataColumn>
+ <DataColumn name="payTime">
+ <Property name="property">payTime</Property>
+ </DataColumn>
+ <DataColumn name="payType">
+ <Property name="property">payType</Property>
+ </DataColumn>
+ <DataColumn name="payee">
+ <Property name="property">payee</Property>
+ </DataColumn>
+ <DataColumn name="bank">
+ <Property name="property">bank</Property>
+ </DataColumn>
+ <DataColumn name="bizType">
+ <Property name="property">bizType</Property>
+ </DataColumn>
+ <DataColumn name="payUser">
+ <Property name="property">payUser</Property>
</DataColumn>
</DataGrid>
<ToolBar layoutConstraint="bottom ">
<Fill/>
<DataPilot layoutConstraint="right">
<Property name="itemCodes">pageSize,pages</Property>
- <Property name="dataSet">dsSettleData</Property>
+ <Property name="dataSet">dsSettle2</Property>
</DataPilot>
</ToolBar>
<Dialog id="dialogMain2">
--
Gitblit v1.9.3