From 10373a585e3d1d04a7eddb2e3297eeeb2c729e71 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 28 八月 2023 09:29:51 +0800
Subject: [PATCH] 更新MODBUS-TCP协议，调整配置
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml | 829 ++++++++++++++++++++++++++++++++++-------------------------
1 files changed, 477 insertions(+), 352 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
index 0292986..dd23a2f 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutHand.view.xml
@@ -4,11 +4,7 @@
<Context/>
<Model>
<DataType name="dtMain" parent="dtInoutRecord">
- <ClientEvent name="onDataChange">if(arg.property =="depotId"){
- autoByDepot(arg.newValue);
-}
-
-if(arg.property =="foodVariety"){
+ <ClientEvent name="onDataChange">if(arg.property =="foodVariety"){
var entity = arg.entity;
entity.reset("checkItems");
}</ClientEvent>
@@ -32,11 +28,16 @@
<Entity>
<Property name="checkId">$${this.checkId}</Property>
<Property name="foodVariety">$${this.foodVariety}</Property>
- <Property name="deptId">$${this.deptId}</Property>
+ <Property name="type">$${this.type}</Property>
</Entity>
</Property>
- <Property name="dataProvider">checkStandardPR#listCheckItemsByCheckId</Property>
+ <Property name="dataProvider">checkStandardPR#listCheckItemsByParam</Property>
<Property name="dataType">[dtCheckItems]</Property>
+ </Reference>
+ <Reference name="files">
+ <Property name="dataProvider">sys.fileManager#listFile</Property>
+ <Property name="dataType">[dtFileData]</Property>
+ <Property name="parameter">$${this.id}</Property>
</Reference>
</DataType>
<DataType name="dtCheckItems">
@@ -112,23 +113,40 @@
<Property></Property>
<Property name="label">杩愮畻绗﹀彿</Property>
</PropertyDef>
+ <PropertyDef name="operaSymbolValue">
+ <Property></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="keyProperty">code</Property>
+ <Property name="valueProperty">name</Property>
+ <Property name="mapValues">${dorado.getDataProvider("inoutDataPR#triggerResult").getResult()}</Property>
+ </Property>
+ </PropertyDef>
</DataType>
</Model>
<View layout="padding:5;regionPadding:5">
<ClientEvent name="onReady">var TYPE = "${request.getParameter('type')}";

-//绫诲瀷鍒囨崲
-if("OUT" == TYPE){
- view.get("#columnDeSum").set("visible",false);
- //view.get("#label1").set("text","娉細鍑哄簱姘村垎澧為噸璁板叆缁撶畻閲嶉噺");
- 
- view.get("#dataGridCheckItem").set("visible",false);
- 
- view.get("#deWet").set("label","姘村垎澧為噸");
-}else{
- view.get("#deWet").set("label","姘村垎鎵ｉ噸");
- view.get("#dataGridCheckItem").set("visible",true);
-}
+var PROGRESS = "WEIGHT_TAG";

/**
* 鍒锋柊椤甸潰
@@ -137,11 +155,8 @@
view.get("#btnSave").set("disabled",false);
view.get("#btnPrintWeigh").set("disabled",true);
view.get("#btnPrintCheck").set("disabled",true);
- 
view.get("#dsMain").set("parameter",TYPE).flushAsync();
};
-
-
flush();

/**
@@ -158,7 +173,6 @@
$alert("鏁版嵁楠岃瘉澶辫触锛屻�愬熀纭�淇℃伅銆�-缁撶畻閲嶉噺蹇呴』澶т簬0锛�");
return;
}
- 
view.get("#uaSave").execute(function(result){
if(result){
$alert("淇濆瓨澶辫触锛�"+result);
@@ -167,193 +181,26 @@
view.get("#btnPrintWeigh").set("disabled",false);
view.get("#btnPrintCheck").set("disabled",false);
$alert("淇濆瓨鎴愬姛锛屽彲浠ヨ繘琛屾墦鍗板拰閲嶆柊鎻愭柊琛ㄥ崟锛�");
+ flush();
+
}
});
}

-/**
- * 鎵撳嵃鍑哄簱杩囩鍗�
- */
-printBill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1,2100,1400, "A4");
- //LODOP.SET_PRINT_PAGESIZE(1, 0, '90mm', "A4");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
-};
-
-print5016Bill = function(htmlStr) {
- var LODOP = CLODOP;
- LODOP.PRINT_INIT("绉伴噸鍗�");
- LODOP.SET_PRINT_PAGESIZE(1, 1050, 1400, "");
- LODOP.ADD_PRINT_HTM(0, 0, "100%", "100%", htmlStr);
- LODOP.PREVIEW();
-};
-
-//鎵撳嵃鎵︽牱鍗�
-printCheck = function(){
- $alert("鎵撳嵃妯＄増鏈畾涔夆�︹��");
-};
-
-//鎵撳嵃绉伴噸鍗�
-printWeight = function(){
- var data = view.get("#dsMain.data");
- if(!data) return;
- var companyId = data.get("companyId");
- console.log(companyId);
- view.get("#ajaxPrint").set("parameter",data).execute(function(result){
- if(companyId && companyId == "5016"){
- print5016Bill(result);
- }else {
- printBill(result);
- }
- });
-};
-
-//鏍规嵁浠撳簱鑷姩鍥炲～绮鍝佺锛岀櫥璁帮紝浜у湴鏂�
-autoByDepot = function(depotId){
- view.get("#ajaxGetDepot").set("parameter",depotId).execute(function(result){
+//鍒犻櫎闄勪欢
+delFile = function(){
+ var entity = view.get("#dgFiles").getCurrentItem();
+ view.get("#ajaxDelFile").set("parameter",{
+ fileName:entity.get("fileName"),
+ createTime:entity.get("createTime")
+ }).execute(function(result){
if(result){
- //console.log(result);
- var data = view.get("#dsMain.data:#");
- data.set("foodLocation",result.foodLocation);
- data.set("foodLevel",result.foodLevel);
- data.set("foodVariety",result.foodVariety);
- data.set("foodYear",result.foodYear);
+ $alert(result);
+ }else{
+ entity.remove();
+ $alert("鍒犻櫎鎴愬姛锛�");
}
});
-};</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 = curData.get("deWet"), deImpurity = curData.get("deImpurity");
- 
- var impurity = curData.get("impurity"), wet = curData.get("wet");
- 
- 
- var deBase = 0, multiple = 0;
- var checkItems = curData.get("checkItems");
- //姘村垎鏉傝川锛屾洿鏀规瘮渚嬪苟涓旀按鍒嗘墸閲嶈繕娌¤绠楁儏鍐典笅
- if ("wet" == name) {
- var checkItem = this.getCheckItem(checkItems,"C01", "C020101");
- if (checkItem) {
- deBase = Number(wet) - Number(checkItem.get("upperLimit"));
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.get("ruleNum"));//鍊嶆暟
- deWet = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }
- 
- //鏉傝川
- if ("impurity" == name) {
- checkItem = this.getCheckItem(recordData.checkItems, "C02","C01010301");
- if (checkItem) {
- deBase = Number(impurity) - Number(checkItem.get("upperLimit"));
- if (deBase == 0) return;
- multiple = parseInt(deBase / checkItem.get("ruleNum"));
- deImpurity = (netWeight * multiple * checkItem.get("ruleReduce") / 100.00).toFixed(0);
- }
- }
-
- /** 鎬绘墸閲嶏紝涓嶅惈澧為噸*/
- 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("impurity",impurity);
- curData.set("wet",wet);
- curData.set("deImpurity",deImpurity);
- curData.set("deWet",deWet);
- curData.set("deSum",deSum);
- 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>
@@ -372,12 +219,12 @@
<Button id="btnSave" layoutConstraint="left">
<ClientEvent name="onClick">save();</ClientEvent>
<Property name="caption">鏁版嵁鎻愪氦</Property>
- <Property name="exClassName">btn-default</Property>
+ <Property name="exClassName">btn-normal</Property>
<Property name="iconClass">fa fa-plus</Property>
</Button>
<Button id="btnPrintCheck" layoutConstraint="left">
<ClientEvent name="onClick">printCheck();</ClientEvent>
- <Property name="caption">鎵撳嵃鎶芥牱鍗�</Property>
+ <Property name="caption">鎵撳嵃璐ㄦ鍗�</Property>
<Property name="exClassName">btn-default</Property>
<Property name="iconClass">fa fa-print</Property>
<Property name="tip">淇濆瓨鏁版嵁鍚庡彲鐢�</Property>
@@ -397,7 +244,7 @@
<Property name="iconClass">fa fa-minus</Property>
</Button>
</Container>
- <TabControl id="tabControlMain">
+ <TabControl id="tabControlMain" layoutConstraint="left ">
<Property name="width">1300</Property>
<ControlTab>
<Property name="caption">鍩虹淇℃伅</Property>
@@ -405,7 +252,7 @@
<Property name="width">150</Property>
<Property name="name">tabCommon</Property>
<Container>
- <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
+ <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
<Property name="caption">鍩烘湰淇℃伅</Property>
<Buttons/>
<Children>
@@ -434,6 +281,13 @@
<Property name="name">userContact</Property>
<Property name="property">userContact</Property>
<Property name="label">鑱旂郴鐢佃瘽</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="label">瀹㈡埛鍚嶇О</Property>
+ <Property name="property">customerName</Property>
+ <Property name="editable">false</Property>
+ <Property name="trigger">ddNotice</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
@@ -472,12 +326,6 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">foodLocation</Property>
- <Property name="property">foodLocation</Property>
- <Property name="trigger">ddFoodOrigin</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
<Property name="name">foodLevel</Property>
<Property name="property">foodLevel</Property>
<Editor/>
@@ -489,28 +337,26 @@
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">noticeName</Property>
- <Property name="property">noticeName</Property>
- <Property name="trigger">ddNotice</Property>
- <Property name="editable">false</Property>
- <Property name="label">鍏ュ簱閫氱煡鍗�</Property>
+ <Property name="name">registerTime</Property>
+ <Property name="property">registerTime</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement>
- <Property name="name">registerTime</Property>
- <Property name="property">registerTime</Property>
+ <Property name="name">foodLocation</Property>
+ <Property name="property">foodLocation</Property>
+ <Property name="trigger">ddDicArea</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
</Children>
</FieldSet>
- <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
+ <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
<Property name="caption">绉伴噸淇℃伅锛堝崟浣嶏細KG锛�</Property>
<Buttons/>
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*,*,*</Property>
+ <Property name="cols">*,50,*,50,*,50</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -524,6 +370,17 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">emptyWeightTime</Property>
+ <Property name="property">emptyWeightTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">fullWeightUser</Property>
+ <Property name="property">fullWeightUser</Property>
+ <Property name="label">绉伴噸浜�</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);
@@ -534,50 +391,14 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">netWeight</Property>
- <Property name="property">netWeight</Property>
- <Property name="readOnly">true</Property>
+ <Property name="name">fullWeightTime</Property>
+ <Property name="property">fullWeightTime</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement>
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deImpurity</Property>
- <Property name="property">deImpurity</Property>
- <Property name="showHint">false</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">completeTime</Property>
+ <Property name="property">completeTime</Property>
<Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">impurity</Property>
- <Property name="property">impurity</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
- </AutoFormElement>
- <AutoFormElement id="deWet">
- <ClientEvent name="onBlur">//id 瑙勫垯 d_prop
-var id = self.getDom().id;
-var prop = id.substring(2,id.length);
-deAutoByWeight(prop);</ClientEvent>
- <Property name="name">deWet</Property>
- <Property name="property">deWet</Property>
- <Property name="showHint">false</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wet</Property>
- <Property name="property">wet</Property>
- <Property name="showLabel">false</Property>
- <Editor>
- <TextEditor>
- <Property name="blankText"> -- % --</Property>
- </TextEditor>
- </Editor>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
<ClientEvent name="onBlur">//id 瑙勫垯 d_prop
@@ -586,6 +407,7 @@
deAutoByWeight(prop);</ClientEvent>
<Property name="name">deHandle</Property>
<Property name="property">deHandle</Property>
+ <Property name="label">鐜板満鎵ｉ噸</Property>
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
@@ -598,8 +420,39 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">deSum</Property>
- <Property name="property">deSum</Property>
+ <Property name="name">deOtherInfo</Property>
+ <Property name="property">deOtherInfo</Property>
+ <Property name="label">鍏朵粬鍘熷洜</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">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/>
+ </AutoFormElement>
+ <Label layoutConstraint="colSpan:2">
+ <Property name="style">
+ <Property name="color">blue</Property>
+ <Property name="padding-left">80px</Property>
+ </Property>
+ <Property name="text">璇存槑锛氳川妫�澧炴墸閲嶈鏌ョ湅璐ㄦ淇℃伅鏍忎綅璇︾粏</Property>
+ </Label>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">netWeight</Property>
+ <Property name="property">netWeight</Property>
<Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
@@ -610,45 +463,88 @@
<Editor/>
</AutoFormElement>
<AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">completeTime</Property>
- <Property name="property">completeTime</Property>
+ <Property name="name">recordWeight</Property>
+ <Property name="property">recordWeight</Property>
+ <Property name="readOnly">true</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">fullWeightTime</Property>
- <Property name="property">fullWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">emptyWeightTime</Property>
- <Property name="property">emptyWeightTime</Property>
- <Editor/>
- </AutoFormElement>
- <Label layoutConstraint="colSpan:6">
- <Property name="style">
- <Property name="color">blue</Property>
- <Property name="padding-left">80px</Property>
- </Property>
- <Property name="text">璇存槑锛氱粨绠楅噸閲� = 鍑�閲� - 鎵ｉ噸 + 澧為噸锛涙墸姘存潅锛氭鏁�=鎵ｉ噸锛岃礋鏁�=澧為噸</Property>
- </Label>
</AutoForm>
</Children>
</FieldSet>
- <FieldSet layout="regionPadding:10" layoutConstraint="padding:10">
- <Property name="caption">澶囨敞璇存槑</Property>
+ <FieldSet layout="regionPadding:5" layoutConstraint="padding:10">
+ <Property name="caption">鍏朵粬闇�瑕佽ˉ鍏呬俊鎭�</Property>
<Buttons/>
<Children>
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelSeparator">锛�</Property>
<Property name="labelWidth">100</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
+ <Property name="name">jjlx</Property>
+ <Property name="property">jjlx</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">绉伴噸鍏ュ簱</Property>
+ <Property name="value">0</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="value">1</Property>
+ <Property name="text">鏍囧噯鍖呭叆搴�</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzw</Property>
+ <Property name="property">bzw</Property>
+ <Editor>
+ <RadioGroup>
+ <RadioButton>
+ <Property name="text">楹昏</Property>
+ <Property name="value">1</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">缂栫粐琚�</Property>
+ <Property name="value">2</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="text">鏁ｈ</Property>
+ <Property name="value">3</Property>
+ </RadioButton>
+ <RadioButton>
+ <Property name="value">9</Property>
+ <Property name="text">鍏朵粬</Property>
+ </RadioButton>
+ </RadioGroup>
+ </Editor>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dbz</Property>
+ <Property name="property">dbz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bzbjs</Property>
+ <Property name="property">bzbjs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dePackage</Property>
+ <Property name="property">dePackage</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">price</Property>
+ <Property name="property">price</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:3">
<Property name="name">remarks</Property>
<Property name="property">remarks</Property>
<Property name="editorType">TextArea</Property>
- <Property name="showLabel">false</Property>
<Editor/>
</AutoFormElement>
</AutoForm>
@@ -657,14 +553,14 @@
</Container>
</ControlTab>
<ControlTab id="tabCheck">
- <Property name="caption">鎵︽牱鍖栭獙</Property>
+ <Property name="caption">璐ㄦ淇℃伅</Property>
<Property name="iconClass">fa fa-gavel</Property>
<Property name="width">150</Property>
<Property name="name">tabCheck</Property>
<Container layout="padding:10">
<AutoForm>
<Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*,*</Property>
+ <Property name="cols">*,*,*</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
<Property name="labelSeparator">锛�</Property>
@@ -705,18 +601,64 @@
<Property name="label">鍖栭獙缁撴灉</Property>
<Editor/>
</AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">checkTime</Property>
+ <Property name="property">checkTime</Property>
+ <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">
- <ClientEvent name="onCellValueEdit">//瀹炵幇鍖栭獙椤圭洰璋冩暣锛屾洿鏂颁富琛ㄤ腑鍊�
-var entity = arg.entity;
-var inoutData = view.get("#dsMain.data:#");
-
-if(entity.get("standardId") =="C01"){//姘村垎
- inoutData.set("wet",entity.get("value"));
-}
-
-if(entity.get("standardId") =="C02"){//闆滃織
- inoutData.set("impurity",entity.get("value"));
+ <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="dataSet">dsMain</Property>
<Property name="dataPath">#.checkItems</Property>
@@ -739,66 +681,170 @@
<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>
</ControlTab>
</TabControl>
- <CustomDropDown id="ddFoodOrigin">
+ <TabControl id="tabControlImage" layoutConstraint="left">
+ <Property name="width">370</Property>
+ <ControlTab id="tabImage">
+ <Property name="name">tabImage</Property>
+ <Property name="caption">鍑哄叆搴撹繃绋嬭褰�</Property>
+ <FieldSet layout="regionPadding:5" layoutConstraint="top padding:10">
+ <Buttons>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.PROGRESS = "WEIGHT_EMPTY";
+</ClientEvent>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-cloud-upload</Property>
+ <Property name="action">uploadImg</Property>
+ <Property name="caption">绌鸿溅绉�</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.PROGRESS = "WEIGHT_FULL";
+</ClientEvent>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-cloud-upload</Property>
+ <Property name="action">uploadImg1</Property>
+ <Property name="caption">婊¤溅绉�</Property>
+ </Button>
+ <Button layoutConstraint="left">
+ <ClientEvent name="onClick">view.PROGRESS = "HANDLE";</ClientEvent>
+ <Property name="caption">鍊间粨</Property>
+ <Property name="exClassName">btn-default</Property>
+ <Property name="iconClass">fa fa-cloud-upload</Property>
+ <Property name="action">uploadImg2</Property>
+ </Button>
+ </Buttons>
+ <Children>
+ <DataGrid id="dgFiles">
+ <Property name="dataSet">dsMain</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="selectionMode">singleRow</Property>
+ <Property name="dataPath">#.files</Property>
+ <RowNumColumn/>
+ <DataColumn name="bizTag">
+ <Property name="property">bizTag</Property>
+ <Property name="visible">false</Property>
+ </DataColumn>
+ <DataColumn name="fileName">
+ <Property name="property">fileName</Property>
+ </DataColumn>
+ <DataColumn>
+ <ClientEvent name="onRenderCell">arg.dom.innerHTML = "<a href='javascript:;' onClick='delFile()'>鍒犻櫎</a>";
+</ClientEvent>
+ <Property name="property">fileId</Property>
+ <Property name="name">fileId</Property>
+ <Property name="align">center</Property>
+ <Property name="caption">鎿嶄綔</Property>
+ <Property name="readOnly">true</Property>
+ <Property name="width">80</Property>
+ </DataColumn>
+ </DataGrid>
+ </Children>
+ </FieldSet>
+ </ControlTab>
+ </TabControl>
+ <YearDropDown id="yearDropDown"/>
+ <UpdateAction id="uaSave">
+ <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
+ <Property name="confirmMessage">纭畾瑕佹彁浜や箞锛�</Property>
+ <UpdateItem>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="dataPath">[#current]</Property>
+ <Property name="validateData">false</Property>
+ </UpdateItem>
+ </UpdateAction>
+ <AjaxAction id="ajaxPrint">
+ <Property name="service">inoutDataPR#printWeightBill</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
+ <Property name="async">false</Property>
+ </AjaxAction>
+ <AjaxAction id="ajaxPrintCheckBill">
+ <Property name="async">false</Property>
+ <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
+ <Property name="service">inoutDataPR#printShipBill</Property>
+ </AjaxAction>
+ <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">dicTriggerPR#pagFoodLocationData</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>
@@ -809,14 +855,14 @@
</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,noticeName=name,customerId=customerId,customerName=customerName</Property>
- <Property name="minWidth">500</Property>
+ <Property name="assignmentMap">noticeId=id,customerName=customerName</Property>
+ <Property name="minWidth">1000</Property>
<Property name="autoOpen">true</Property>
<Container layout="regionPadding:5">
<DataSet id="dsNotice">
@@ -836,18 +882,14 @@
<Button>
<ClientEvent name="onClick">var key = view.get("#key3.value");
var type = "${request.getParameter('type')}";
-//var customerId = view.get("#dataGridMain.currentEntity").get("customerId");
-//var depotId = view.get("#dataGridMain.currentEntity").get("depotId");
-//var foodVariety = view.get("#dataGridMain.currentEntity").get("foodVariety");
-//view.get("#dsNotice").set("parameter",{key:key,type:type,customerId:customerId,depotId:depotId,foodVariety:foodVariety}).flushAsync();
view.get("#dsNotice").set("parameter",{key: key,type: type}).flushAsync();</ClientEvent>
<Property name="caption">鏌ヨ</Property>
<Property name="iconClass">fa fa-search</Property>
</Button>
<Button>
- <ClientEvent name="onClick">var data = view.get("#dsCustomer.data:#");
+ <ClientEvent name="onClick">var data = view.get("#dsNotice.data:#");
if(data){
- view.get("#ddCustomer").close(data.toJSON());
+ view.get("#ddNotice").close(data.toJSON());
}</ClientEvent>
<Property name="iconClass">fa fa-check</Property>
<Property name="caption">纭畾</Property>
@@ -862,37 +904,120 @@
<Property name="readOnly">true</Property>
<DataColumn name="name">
<Property name="property">name</Property>
+ <Property name="align">center</Property>
+ <Property name="width">100</Property>
</DataColumn>
<DataColumn>
<Property name="property">customerName</Property>
<Property name="align">center</Property>
<Property name="name">customerName</Property>
+ <Property name="width">240</Property>
</DataColumn>
- <DataColumn name="id">
- <Property name="property">id</Property>
+ <DataColumn name="foodVariety">
+ <Property name="property">foodVariety</Property>
<Property name="align">center</Property>
- <Property name="visible">false</Property>
+ </DataColumn>
+ <DataColumn name="year">
+ <Property name="property">year</Property>
+ <Property name="align">center</Property>
+ </DataColumn>
+ <DataColumn name="depotId">
+ <Property name="property">depotId</Property>
+ <Property name="align">center</Property>
+ <Property name="width">180</Property>
+ </DataColumn>
+ <DataColumn name="contractName">
+ <Property name="property">contractName</Property>
+ <Property name="align">center</Property>
+ <Property name="width">300</Property>
</DataColumn>
</DataGrid>
</Container>
</CustomDropDown>
- <YearDropDown id="yearDropDown"/>
- <UpdateAction id="uaSave">
- <Property name="dataResolver">inoutDataPR#saveInoutData</Property>
- <Property name="confirmMessage">纭畾瑕佹彁浜や箞锛�</Property>
- <UpdateItem>
- <Property name="dataSet">dsMain</Property>
- <Property name="dataPath">[#current]</Property>
- <Property name="validateData">false</Property>
- </UpdateItem>
- </UpdateAction>
- <AjaxAction id="ajaxGetDepot">
- <Property name="service">depotPR#getDepot</Property>
- </AjaxAction>
- <AjaxAction id="ajaxPrint">
- <Property name="service">inoutDataPR#printWeightBill</Property>
- <Property name="executingMessage">姝ｅ湪鎵ц鎵撳嵃鈥︹��</Property>
- <Property name="async">false</Property>
+ <UploadAction id="uploadImg">
+ <ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
+var plateNum = data.get("plateNum");
+var bizTag = "EMPTY";
+self.set("parameter",{
+ bizTag: bizTag
+})</ClientEvent>
+ <ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�
+var mainData = view.get("#dsMain.data");
+var fileName = arg.returnValue;
+var files = mainData.get("files");
+files.insert({bizTag:view.PROGRESS,fileName:fileName,createTime:new Date()});</ClientEvent>
+ <ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
+if(data){
+ var plateNum = data.get("plateNum");
+ var bizTag = "EMPTY";
+ self.set("parameter",{
+ bizTag:bizTag
+ })
+}</ClientEvent>
+ <Property name="maxFileSize">20MB</Property>
+ <Property name="successMessage">涓婁紶鎴愬姛</Property>
+ <Property name="parameter"></Property>
+ <Property name="fileResolver">inoutDataPR#uploadImage</Property>
+ <Filters/>
+ </UploadAction>
+ <UploadAction id="uploadImg1">
+ <ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
+
+var plateNum = data.get("plateNum");
+var bizTag = "FULL";
+self.set("parameter",{
+ bizTag: bizTag
+})</ClientEvent>
+ <ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�
+var mainData = view.get("#dsMain.data");
+var fileName = arg.returnValue;
+var files = mainData.get("files");
+files.insert({bizTag:view.PROGRESS,fileName:fileName});</ClientEvent>
+ <ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
+if(data){
+ var plateNum = data.get("plateNum");
+ var bizTag = "FULL";
+ self.set("parameter",{
+ bizTag:bizTag
+ })
+}</ClientEvent>
+ <Property name="maxFileSize">20MB</Property>
+ <Property name="successMessage">涓婁紶鎴愬姛</Property>
+ <Property name="parameter"></Property>
+ <Property name="fileResolver">inoutDataPR#uploadImage</Property>
+ <Filters/>
+ </UploadAction>
+ <UploadAction id="uploadImg2">
+ <ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
+
+var plateNum = data.get("plateNum");
+var bizTag = "HANDLE";
+self.set("parameter",{
+ bizTag: bizTag
+})</ClientEvent>
+ <ClientEvent name="onFileUploaded">//闄勪欢涓婁紶瀹屾垚鍚庢坊鍔犱笟鍔℃暟鎹�
+var mainData = view.get("#dsMain.data");
+var fileName = arg.returnValue;
+var files = mainData.get("files");
+files.insert({bizTag:view.PROGRESS,fileName:fileName});</ClientEvent>
+ <ClientEvent name="beforeFileUploaded">var data = view.get("#dsMain.data:#")
+if(data){
+ var plateNum = data.get("plateNum");
+ var bizTag = "HANDLE";
+ self.set("parameter",{
+ bizTag:bizTag
+ })
+}</ClientEvent>
+ <Property name="maxFileSize">20MB</Property>
+ <Property name="successMessage">涓婁紶鎴愬姛</Property>
+ <Property name="parameter"></Property>
+ <Property name="fileResolver">inoutDataPR#uploadImage</Property>
+ <Filters/>
+ </UploadAction>
+ <AjaxAction id="ajaxDelFile">
+ <Property name="service">inoutDataPR#delImage</Property>
+ <Property name="async">true</Property>
+ <Property name="confirmMessage">纭畾瑕佸垹闄や箞锛�</Property>
</AjaxAction>
</View>
</ViewConfig>
--
Gitblit v1.9.3