From 85e10b2ee171c9391fce2d353d396a9c9b771e1c Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期五, 19 十二月 2025 11:17:04 +0800
Subject: [PATCH] 添加入库报表、入库明细报表
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java | 9 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 223 +++++++++++++++++++++++++++++++++++++++++++------------
2 files changed, 181 insertions(+), 51 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
similarity index 77%
rename from fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetail.view.xml
rename to fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 87b6efd..84cac83 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.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>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetailPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
similarity index 94%
rename from fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetailPR.java
rename to fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
index 8285130..6567db1 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutDetailPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.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("鍗冨厠锛圞G锛�");
@@ -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);
--
Gitblit v1.9.3