fzzy-igdss.git - Gitblit

ÎÄ¼þÃû´Ó fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetail.view.xml ÐÞ¸Ä
			@@ -305,6 +305,11 @@
			<PropertyDef name="deptId">
			<Property></Property>
			<Property name="label">æå±ååº</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("deptPR#getAllData").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">kqmc</Property>
			</Property>
			</PropertyDef>
			<PropertyDef name="depotId">
			<Property></Property>
			@@ -356,6 +361,11 @@
			<PropertyDef name="customerName">
			<Property></Property>
			<Property name="label">åä½</Property>
			<Property name="mapping">
			<Property name="mapValues">${dorado.getDataProvider("companyPR#getData").getResult()}</Property>
			<Property name="keyProperty">id</Property>
			<Property name="valueProperty">dwmc</Property>
			</Property>
			</PropertyDef>
			<PropertyDef name="unit">
			<Property></Property>
			@@ -375,6 +385,20 @@
			</Model>
			<View layout="padding:5;regionPadding:5">
			<ClientEvent name="onReady">//var TYPE = "INOUT_DETAIL";
			//é¡µé¢å±ç¤ºç±»åï¼1 æ£å¸¸æ¥è¡¨é¡µé¢ï¼2 çç®¡å±ç¤ºé¡µé¢
			var ViewType = "${request.getParameter('viewType')}";

			if(ViewType==1){
			view.get("#form1").set("visible",true);
			view.get("#dataGridMain1").set("visible",true);
			}

			if(ViewType==2){
			view.get("#form2").set("visible",true);
			view.get("#dataGridMain2").set("visible",true);

			}

			var deptId = window.parent.DEPT_ID;//ç¶é¡µé¢ä¸çååºç¼ç


			@@ -391,32 +415,23 @@
			<Property name="packages">font-awesome,css-common</Property>
			<DataSet id="dsMain">
			<Property name="dataType">[dtMain]</Property>
			<Property name="dataProvider">reportInoutDetailPR#listRecord</Property>
			<Property name="dataProvider">reportInDetailPR#listRecord</Property>
			<Property name="loadMode">manual</Property>
			</DataSet>
			<DataSet id="dsQuery">
			<Property name="dataType">dtQuery</Property>
			<Property name="dataProvider">reportInoutDetailPR#getQuery</Property>
			<Property name="dataProvider">reportInDetailPR#getQuery</Property>
			<Property></Property>
			<Property name="loadMode">manual</Property>
			</DataSet>
			<AutoForm layoutConstraint="top">
			<AutoForm id="form1" layoutConstraint="top">
			<Property name="cols">,,,</Property>
			<Property name="dataSet">dsQuery</Property>
			<Property name="exClassName">bg-color</Property>
			<Property name="labelWidth">100</Property>
			<Property name="labelAlign">right</Property>
			<AutoFormElement>
			<Property name="name">type</Property>
			<Property name="property">type</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">customerName</Property>
			<Property name="property">customerName</Property>
			<Property name="editable">true</Property>
			<Editor/>
			</AutoFormElement>
			<Property name="hideMode">display</Property>
			<Property name="visible">false</Property>
			<AutoFormElement>
			<Property name="name">depotId</Property>
			<Property name="property">depotId</Property>
			@@ -425,6 +440,60 @@
			<AutoFormElement>
			<Property name="name">foodVariety</Property>
			<Property name="property">foodVariety</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">start</Property>
			<Property name="property">start</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">end</Property>
			<Property name="property">end</Property>
			<Editor/>
			</AutoFormElement>
			<Container layout="hbox regionPadding:15">
			<Button>
			<ClientEvent name="onClick"> var data = view.get("#dsQuery.data");
			view.get("#dsMain").set("parameter",data).flushAsync();</ClientEvent>
			<Property name="caption">æ¥è¯¢</Property>
			<Property name="exClassName">btn1</Property>
			<Property name="iconClass">fa fa-search</Property>
			</Button>
			<Button>
			<ClientEvent name="onClick">view.get("#dsQuery").flushAsync();</ClientEvent>
			<Property name="exClassName">btn2</Property>
			<Property name="iconClass">fa fa-refresh</Property>
			<Property name="caption">éç½®</Property>
			</Button>
			<Button layoutConstraint="left">
			<Property name="caption">å¯¼åºEXCEL</Property>
			<Property name="exClassName">btn4</Property>
			<Property name="iconClass">fa fa-file-excel-o</Property>
			<Property name="menu">menuExport</Property>
			<Property name="action">exportExcel</Property>
			</Button>
			</Container>
			</AutoForm>
			<AutoForm id="form2" layoutConstraint="top">
			<Property name="cols">,,,</Property>
			<Property name="dataSet">dsQuery</Property>
			<Property name="exClassName">bg-color</Property>
			<Property name="labelWidth">100</Property>
			<Property name="labelAlign">right</Property>
			<Property name="hideMode">display</Property>
			<Property name="visible">false</Property>
			<AutoFormElement>
			<Property name="name">customerName</Property>
			<Property name="property">customerName</Property>
			<Property name="label">æ¶å¨å¬å¸</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			<Property name="name">deptId</Property>
			<Property name="property">deptId</Property>
			<Property name="label">æå±åºåº</Property>
			<Property name="hideMode">visibility</Property>
			<Editor/>
			</AutoFormElement>
			<AutoFormElement>
			@@ -519,7 +588,7 @@
			<Editor/>
			</AutoFormElement>
			</AutoForm>
			<DataGrid id="dataGridMain" layoutConstraint="center">
			<DataGrid id="dataGridMain1" layoutConstraint="center">
			<ClientEvent name="onRenderRow">if(arg.data.get('id') == 'åè®¡'){
			//arg.dom.style.background = "#fcc5c5";
			arg.dom.style.fontWeight = "bold";
			@@ -528,50 +597,27 @@
			<Property name="dataSet">dsMain</Property>
			<Property name="readOnly">true</Property>
			<Property name="highlightCurrentRow">false</Property>
			<DataColumn>
			<Property name="property">remarks</Property>
			<Property name="width">50</Property>
			<Property name="align">center</Property>
			<Property name="name">remarks</Property>
			<Property name="caption">åºå·</Property>
			</DataColumn>
			<Property name="hideMode">display</Property>
			<Property name="visible">true</Property>
			<RowNumColumn/>
			<DataColumn name="id">
			<Property name="property">id</Property>
			<Property name="width">130</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">registerTime</Property>
			<Property name="caption">ç»è®°æ¶é´</Property>
			<Property name="width">140</Property>
			<Property name="align">center</Property>
			<Property name="name">registerTime</Property>
			</DataColumn>
			<DataColumn name="plateNum">
			<Property name="property">plateNum</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="customerName">
			<Property name="property">customerName</Property>
			<Property name="width">180</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="type">
			<Property name="property">type</Property>
			<Property name="caption">ç±»å</Property>
			<Property name="width">80</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="foodVariety">
			<Property name="property">foodVariety</Property>
			<Property name="caption">åç§</Property>
			<Property name="width">100</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="depotId">
			<Property name="property">depotId</Property>
			<Property name="caption">ä»åº</Property>
			<Property name="width">80</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn>
			<Property name="name">foodVariety</Property>
			<Property name="property">foodVariety</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="fullWeight">
			@@ -588,20 +634,101 @@
			<Property name="property">netWeight</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn>
			<Property name="name">deOther</Property>
			<Property name="property">deOther</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="settleWeight">
			<Property name="property">settleWeight</Property>
			<Property name="caption">ç»ç®éé</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">recordWeight</Property>
			<Property name="align">center</Property>
			<Property name="name">recordWeight</Property>
			<Property name="caption">å¥åºéé</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">completeTime</Property>
			<Property name="align">center</Property>
			<Property name="name">completeTime</Property>
			<Property name="caption">ç¦»åºæ¶é´</Property>
			</DataColumn>
			</DataGrid>
			<DataGrid id="dataGridMain2" layoutConstraint="center">
			<ClientEvent name="onRenderRow">if(arg.data.get('id') == 'åè®¡'){
			//arg.dom.style.background = "#fcc5c5";
			arg.dom.style.fontWeight = "bold";
			//arg.processDefault = false;
			}</ClientEvent>
			<Property name="dataSet">dsMain</Property>
			<Property name="readOnly">true</Property>
			<Property name="highlightCurrentRow">false</Property>
			<Property name="visible">false</Property>
			<Property name="hideMode">display</Property>
			<RowNumColumn>
			<Property name="caption">åºå·</Property>
			</RowNumColumn>
			<DataColumn>
			<Property name="property">customerName</Property>
			<Property name="caption">æ¶å¨å¬å¸</Property>
			<Property name="width">80</Property>
			<Property name="align">center</Property>
			<Property name="name">customerName</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">noticeId</Property>
			<Property name="property">deptId</Property>
			<Property name="caption">åºåºåç§°</Property>
			<Property name="width">80</Property>
			<Property name="align">center</Property>
			<Property name="name">noticeId</Property>
			<Property name="name">deptId</Property>
			</DataColumn>
			<DataColumn name="id">
			<Property name="property">id</Property>
			<Property name="width">130</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="plateNum">
			<Property name="property">plateNum</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="depotId">
			<Property name="property">depotId</Property>
			<Property name="caption">ä»åº</Property>
			<Property name="width">80</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn>
			<Property name="name">foodVariety</Property>
			<Property name="property">foodVariety</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn name="settleWeight">
			<Property name="property">settleWeight</Property>
			<Property name="caption">ç»ç®éé</Property>
			<Property name="align">center</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">recordWeight</Property>
			<Property name="align">center</Property>
			<Property name="name">recordWeight</Property>
			<Property name="caption">å¥åºéé</Property>
			</DataColumn>
			<DataColumn>
			<Property name="property">completeTime</Property>
			<Property name="align">center</Property>
			<Property name="name">completeTime</Property>
			<Property name="caption">ç¦»åºæ¶é´</Property>
			</DataColumn>
			<DataColumn>
			<ClientEvent name="onRenderCell">//arg.dom.innerHTML = "<a href='javascript:;' onClick='detail()' class='a-btn1'>æ¥çè¯¦æ</a>";</ClientEvent>
			<Property name="width">160</Property>
			<Property name="caption">æä½</Property>
			<Property name="align">center</Property>
			<Property name="width">120</Property>
			<Editor/>
			</DataColumn>
			</DataGrid>
			</Container>

	fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml	223 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

ÎÄ¼þÃû´Ó fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetailPR.java ÐÞ¸Ä
			@@ -1,6 +1,7 @@
			package com.fzzy.igds;

			import com.bstek.dorado.annotation.DataProvider;
			import com.fzzy.igds.constant.Constant;
			import com.fzzy.igds.data.InoutParam;
			import com.fzzy.igds.domain.InoutRecord;
			import com.fzzy.igds.service.InoutRecordService;
			@@ -18,7 +19,7 @@
			import java.util.List;

			@Component
			public class ReportInoutDetailPR {
			public class ReportInDetailPR {

			@Resource
			private InoutRecordService inoutReportService;
			@@ -42,9 +43,9 @@
			if (null != subDept) {
			deptName = subDept.getDeptName();
			}
			result.setTitle("åºå¥åºæç»æ±æ»");
			result.setTitle("å¥åºæç»æ±æ»");
			if (StringUtils.isNotEmpty(deptName)) {
			result.setTitle(deptName + "åºå¥åºæç»æ±æ»");
			result.setTitle(deptName + "å¥åºæç»æ±æ»");
			result.setDeptId(deptId);
			}
			result.setUnit("ååï¼KGï¼");
			@@ -71,6 +72,8 @@
			if (null == param) {
			param = new InoutParam();
			}
			//æ¥è¯¢å¥åºæ°æ®
			param.setType(Constant.TYPE_IN);
			//å¤åæ°åé¡µæ¥è¯¢
			com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
			inoutReportService.listPageInout(corePage, param);