From 94b83fc6cab9abf3a5991103580a0161344be6df Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期二, 24 十月 2023 19:39:39 +0800
Subject: [PATCH] 监控表增加手机地址，调整手机接口播放方式
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml | 230 +++++++++++++++++++++------------------------------------
1 files changed, 85 insertions(+), 145 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
index be037e4..74a5668 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutList.view.xml
@@ -56,9 +56,9 @@
</PropertyDef>
<PropertyDef name="recordStatus">
<Property></Property>
- <Property name="label">鏁版嵁鐘舵��</Property>
+ <Property name="label">鍗曟嵁鐘舵��</Property>
<Property name="mapping">
- <Property name="mapValues">${dorado.getDataProvider("dicTriggerPR#dicTrigger").getResult("RECORD_STATUS")}</Property>
+ <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerRecordStatus1").getResult()}</Property>
<Property name="keyProperty">code</Property>
<Property name="valueProperty">name</Property>
</Property>
@@ -183,11 +183,11 @@
<Property name="label">鎵ｄ环</Property>
</PropertyDef>
<PropertyDef name="result">
- <Property/>
+ <Property></Property>
<Property name="label">妫�楠岀粨鏋�</Property>
</PropertyDef>
<PropertyDef name="operaSymbolValue">
- <Property/>
+ <Property></Property>
</PropertyDef>
</DataType>
</Model>
@@ -206,6 +206,7 @@
//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
type:TYPE,
+ recordStatus:'NORMAL',
deptId:deptId
});

@@ -221,7 +222,6 @@
edit = function(){
var data = view.get("#dataGridMain.currentEntity");
if(!data) return;
- 
if ("RECORD" == data.get("progress")) {
view.get("#btnOK").set("visible",true);
}else{
@@ -333,110 +333,6 @@
});
};
</ClientEvent>
- <ClientEvent name="onCreate">
-/**
- * 鑷姩璁＄畻锛屽綋鍓嶉〉闈笉鑷姩鍏宠仈鎵︽牱璁板綍锛屽叏閮ㄧ敱鎵嬪姩涓哄噯
- * 
- * 1.鍑�閲� = 姣涢噸 - 鐨噸
- * 2.鎬绘墸閲� = 鐜板満鎵ｉ噸 + 鍏朵粬鎵ｉ噸 + 鎵ｆ按鏉傝川
- * 3.缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堝惈姘存潅澧為噸锛�
- * 4.鍑�/鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� 锛堜笉鍚按鏉傚閲嶏級
- * 
- * 5.鍏ュ簱鏃讹細鎵ｆ按鏉� 姝ｆ暟 = 鎵ｉ噸锛岃礋鏁� = 澧為噸
- * 6.鍑哄簱鏃讹細姘村垎澧為噸锛屾鏁�=澧為噸锛岃礋鏁�=鎵ｉ噸
- */
-deAutoByWeight = function(name){
- 
- if(null == name) name = "1";
- 
- var curData = view.get("#dsMain.data:#");
- var fullWeight = curData.get("fullWeight");
- var emptyWeight = curData.get("emptyWeight");
- 
- if(fullWeight == 0 || emptyWeight == 0){
- return;
- }
- // 鍑�閲�
- var netWeight = Number(fullWeight) - Number(emptyWeight);
- 
- if (netWeight <= 0){
- $notify("鍑�閲嶅皬浜�0锛屽綋鍓嶇О閲嶅瓨鍦ㄩ�昏緫闂");
- return;
- }
- 
- //姹囨�荤粨鏋�
- var deSum = 0, addSum = 0, settleWeight = 0, recordWeight = 0;
- //鎵ｆ按鏉�
- var deWet = 0;
- 
- var impurity = 0;
- 
- 
- var deBase = 0, multiple = 0;
- var checkItems = curData.get("checkItems");
-
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- deSum = Number(curData.get("deOther")) + Number(curData.get("deHandle"));
- 
- //鍑哄簱
- if ("OUT" == curData.get("type")) {
- if (Number(deWet) > 0) {//澧為噸
- addSum = addSum + Number(deWet);
- } else {
- deSum = deSum + Number(deWet);
- }
-
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
- }else{
- if (Number(deWet) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deWet);
- } else {
- addSum = addSum + Number(deWet);
- }
- if (Number(deImpurity) > 0) {//鎵ｉ噸
- deSum = deSum + Number(deImpurity);
- } else {
- addSum = addSum + Number(deImpurity);
- }
- }
- 
- deSum = deSum.toFixed(0);
- /** 澧為噸杞鏁帮紝渚夸簬璁＄畻 */
- addSum = Math.abs(addSum).toFixed(0);
- 
- /** 鍏ュ簱閲嶉噺 = 鍑�閲� - 鎬绘墸閲� */
- recordWeight = Number(netWeight) - Number(deSum);
- 
- /** 缁撶畻閲嶉噺 = 鍑�閲� - 鎬绘墸閲� + 澧為噸 */
- settleWeight = Number(netWeight) - Number(deSum) + Number(addSum);
- 
- curData.set("netWeight",netWeight);
- curData.set("settleWeight",settleWeight);
- curData.set("recordWeight",recordWeight);
-};
-
-/**
- * 鏍规嵁鍖栭獙椤瑰拰浼犻�掕繃鏉ョ殑鍙傛暟鑾峰彇褰撳墠鍙傛暟鐨勯厤缃俊鎭�
- * @param checkItems
- * @param code1 绯荤粺鍙傛暟ID
- * @param code2 鍥芥爣鍙傛暟ID
- * @returns {undefined}
- */
-function getCheckItem(checkItems, code1, code2) {
- if (!checkItems) return null;
- $.each(checkItems, function (index, checkItem) {
- if (checkItem.get("standardId") == code1 || checkItem.get("standardId") == code2) {
- if (checkItem.get("ruleNum") && checkItem.get("upperLimit") > 0.0) {
- return checkItem;
- }
- }
- });
- return null;
-}</ClientEvent>
<Property name="packages">font-awesome,css-common</Property>
<Property name="javaScriptFile">./static/plugins/lodop/LodopFuncs.js</Property>
<DataSet id="dsMain">
@@ -522,15 +418,6 @@
</Editor>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">userId</Property>
- <Property name="property">userId</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText">-- 鏀寔妯＄硦 --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">depotId</Property>
<Property name="property">depotId</Property>
<Property name="trigger">autoMappingDropDown2</Property>
@@ -546,6 +433,11 @@
<Property name="name">orderTag</Property>
<Property name="property">orderTag</Property>
<Property name="trigger">autoMappingDropDown1</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">recordStatus</Property>
+ <Property name="property">recordStatus</Property>
<Editor/>
</AutoFormElement>
<Container layout="hbox regionPadding:15">
@@ -712,7 +604,7 @@
</Button>
<Button id="btnFlushCheck" layoutConstraint="left">
<ClientEvent name="onClick">flushCheckList();</ClientEvent>
- <Property name="caption">鑾峰彇璐ㄦ椤�</Property>
+ <Property name="caption">閲嶆柊鑾峰彇璐ㄦ椤�</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-gavel</Property>
<Property name="visible">false</Property>
@@ -823,7 +715,7 @@
<AutoFormElement>
<Property name="name">foodLocation</Property>
<Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
+ <Property name="trigger">ddDicArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -864,7 +756,7 @@
var id = self.getDom().id;
var prop = id.substring(2,id.length);
deAutoByWeight(prop);
- </ClientEvent>
+</ClientEvent>
<Property name="name">fullWeight</Property>
<Property name="property">fullWeight</Property>
<Editor/>
@@ -905,11 +797,19 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+var id = self.getDom().id;
+var prop = id.substring(2,id.length);
+deAutoByWeight(prop);</ClientEvent>
<Property name="name">deCheck</Property>
<Property name="property">deCheck</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
+ <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
+var id = self.getDom().id;
+var prop = id.substring(2,id.length);
+deAutoByWeight(prop);</ClientEvent>
<Property name="name">addCheck</Property>
<Property name="property">addCheck</Property>
<Editor/>
@@ -1078,6 +978,22 @@
<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">
<Property name="dataSet">dsMain</Property>
@@ -1101,14 +1017,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>
@@ -1222,53 +1162,53 @@
<Property name="titleName">鍗曟嵁鍒楄〃</Property>
<Property name="dataScope">currentPage</Property>
</Export2ReportAction>
- <CustomDropDown id="ddFoodOrigin">
+ <CustomDropDown id="ddDicArea">
<Property name="minHeight">500</Property>
- <Property name="assignmentMap">foodLocation=name</Property>
<Property name="minWidth">500</Property>
+ <Property name="assignmentMap">foodLocation=name,foodLocationId=code</Property>
<Container layout="regionPadding:5">
- <DataSet id="dsFoodOrigin">
- <Property name="dataProvider"></Property>
- <Property name="dataType">[dtFoodOrigin]</Property>
+ <DataSet id="dsDicArea">
+ <Property name="dataProvider">dicAreaPR#pageList</Property>
<Property name="parameter"></Property>
- <Property name="pageSize">30</Property>
+ <Property name="dataType">[dtArea]</Property>
+ <Property name="pageSize">1000</Property>
</DataSet>
<Container layout="hbox regionPadding:5">
<TextEditor id="key2">
- <Property name="blankText"> -- 缂栫爜鎴栬�呭悕绉� --</Property>
+ <Property name="blankText"> -鍚嶇О鎴栫畝鎷硷紝鍖椾含甯� bjs -</Property>
<Property name="width">200</Property>
</TextEditor>
<Button>
<ClientEvent name="onClick">var key = view.get("#key2.value");
-view.get("#dsFoodOrigin").set("parameter",{key:key}).flushAsync();</ClientEvent>
+view.get("#dsDicArea").set("parameter",{key:key}).flushAsync();</ClientEvent>
<Property name="caption">鏌ヨ</Property>
<Property name="iconClass">fa fa-search</Property>
</Button>
<Button>
- <ClientEvent name="onClick">var data = view.get("#dsFoodOrigin.data:#");
+ <ClientEvent name="onClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").close(data.toJSON());
}</ClientEvent>
<Property name="iconClass">fa fa-check</Property>
<Property name="caption">纭畾</Property>
</Button>
</Container>
<DataGrid>
- <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsFoodOrigin.data:#");
+ <ClientEvent name="onDataRowDoubleClick">var data = view.get("#dsDicArea.data:#");
if(data){
- view.get("#ddFoodOrigin").close(data.toJSON());
+ view.get("#ddDicArea").close(data.toJSON());
}</ClientEvent>
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</Property>
<Property name="readOnly">true</Property>
- <DataColumn name="code">
- <Property name="property">code</Property>
- <Property name="readOnly">true</Property>
- <Property name="align">center</Property>
- </DataColumn>
<DataColumn name="name">
<ClientEvent name="onRenderCell">arg.dom.style.fontWeight = "bold";
arg.processDefault = true;</ClientEvent>
<Property name="property">name</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="code">
+ <Property name="property">code</Property>
<Property name="readOnly">true</Property>
<Property name="align">center</Property>
</DataColumn>
@@ -1279,13 +1219,13 @@
</DataColumn>
</DataGrid>
<DataPilot layoutConstraint="bottom">
- <Property name="dataSet">dsFoodOrigin</Property>
+ <Property name="dataSet">dsDicArea</Property>
</DataPilot>
</Container>
</CustomDropDown>
<CustomDropDown id="ddNotice">
<Property name="minHeight">400</Property>
- <Property name="assignmentMap">noticeId=id,customerId=customerId,customerName=customerName</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
<Property name="minWidth">500</Property>
<Property name="autoOpen">true</Property>
<Container layout="regionPadding:5">
--
Gitblit v1.9.3