From ac44ace07789c84c3a2612555417c58a3593a027 Mon Sep 17 00:00:00 2001
From: czt <czt18638530771@163.com>
Date: 星期一, 19 一月 2026 16:31:55 +0800
Subject: [PATCH] 细节调整3
---
/dev/null | 250 --------------
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java | 209 ++++++++++++
fzzy-igdss-view/src/main/java/com/fzzy/igds/FileUploadManage.java | 31 +
fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml | 290 ++++++++--------
fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml | 13
fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java | 166 ++++++++-
fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml | 2
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml | 6
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml | 13
10 files changed, 549 insertions(+), 433 deletions(-)
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
index 4cd8137..180fba2 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Company.view.xml
@@ -339,10 +339,10 @@
</DataColumn>
</DataGrid>
</Container>
- <Dialog id="dialogMain">
- <Property name="width">70%</Property>
- <Property name="caption">鏀跺偍鍏徃淇℃伅</Property>
+ <Dialog id="dialogMain" layout="regionPadding:8">
<Property name="closeable">false</Property>
+ <Property name="caption">鏀跺偍鍏徃淇℃伅</Property>
+ <Property name="width">80%</Property>
<Property name="iconClass">fa fa-tasks</Property>
<Property name="height">90%</Property>
<Buttons>
@@ -370,147 +370,149 @@
</Button>
</Buttons>
<Children>
- <AutoForm>
- <Property name="dataSet">dsMain</Property>
- <Property name="cols">*,*,*</Property>
- <Property name="labelAlign">right</Property>
- <Property name="labelSeparator"> : </Property>
- <Property name="labelWidth">120</Property>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">dwmc</Property>
- <Property name="property">dwmc</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">id</Property>
- <Property name="property">id</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwdm</Property>
- <Property name="property">dwdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwlx</Property>
- <Property name="property">dwlx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dwzt</Property>
- <Property name="property">dwzt</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zcrq</Property>
- <Property name="property">zcrq</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zczb</Property>
- <Property name="property">zczb</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">zcze</Property>
- <Property name="property">zcze</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">fddbr</Property>
- <Property name="property">fddbr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">frsfzh</Property>
- <Property name="property">frsfzh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">frlxfs</Property>
- <Property name="property">frlxfs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">qylxr</Property>
- <Property name="property">qylxr</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">bgdh</Property>
- <Property name="property">bgdh</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">dzyx</Property>
- <Property name="property">dzyx</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">zcdz</Property>
- <Property name="property">zcdz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">yzbm</Property>
- <Property name="property">yzbm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">qygfwzdz</Property>
- <Property name="property">qygfwzdz</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">czhm</Property>
- <Property name="property">czhm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhmc</Property>
- <Property name="property">xzqhmc</Property>
- <Property name="trigger">ddFoodOrigin</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">xzqhdm</Property>
- <Property name="property">xzqhdm</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">kqs</Property>
- <Property name="property">kqs</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">jd</Property>
- <Property name="property">jd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">wd</Property>
- <Property name="property">wd</Property>
- <Editor/>
- </AutoFormElement>
- <AutoFormElement>
- <Property name="name">updateTime</Property>
- <Property name="property">updateTime</Property>
- <Editor/>
- </AutoFormElement>
- <Link>
- <Property name="href">https://lbs.amap.com/tools/picker</Property>
- <Property name="target">_blank</Property>
- <Property name="style">
- <Property name="padding-left">150px</Property>
- </Property>
- <Property name="text">甯姪锛氱偣鍑诲潗鏍囦綅缃嬀鍙�</Property>
- </Link>
- <AutoFormElement layoutConstraint="colSpan:2">
- <Property name="name">remark</Property>
- <Property name="property">remark</Property>
- <Editor/>
- </AutoFormElement>
- </AutoForm>
+ <Container>
+ <AutoForm>
+ <Property name="dataSet">dsMain</Property>
+ <Property name="cols">*,*,*</Property>
+ <Property name="labelAlign">right</Property>
+ <Property name="labelSeparator"> : </Property>
+ <Property name="labelWidth">120</Property>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">dwmc</Property>
+ <Property name="property">dwmc</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">id</Property>
+ <Property name="property">id</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwdm</Property>
+ <Property name="property">dwdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwlx</Property>
+ <Property name="property">dwlx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dwzt</Property>
+ <Property name="property">dwzt</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcrq</Property>
+ <Property name="property">zcrq</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zczb</Property>
+ <Property name="property">zczb</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">zcze</Property>
+ <Property name="property">zcze</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">fddbr</Property>
+ <Property name="property">fddbr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">frsfzh</Property>
+ <Property name="property">frsfzh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">frlxfs</Property>
+ <Property name="property">frlxfs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">qylxr</Property>
+ <Property name="property">qylxr</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">bgdh</Property>
+ <Property name="property">bgdh</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">dzyx</Property>
+ <Property name="property">dzyx</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">zcdz</Property>
+ <Property name="property">zcdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">yzbm</Property>
+ <Property name="property">yzbm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">qygfwzdz</Property>
+ <Property name="property">qygfwzdz</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">czhm</Property>
+ <Property name="property">czhm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhmc</Property>
+ <Property name="property">xzqhmc</Property>
+ <Property name="trigger">ddFoodOrigin</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">xzqhdm</Property>
+ <Property name="property">xzqhdm</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">kqs</Property>
+ <Property name="property">kqs</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">jd</Property>
+ <Property name="property">jd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">wd</Property>
+ <Property name="property">wd</Property>
+ <Editor/>
+ </AutoFormElement>
+ <AutoFormElement>
+ <Property name="name">updateTime</Property>
+ <Property name="property">updateTime</Property>
+ <Editor/>
+ </AutoFormElement>
+ <Link>
+ <Property name="href">https://lbs.amap.com/tools/picker</Property>
+ <Property name="target">_blank</Property>
+ <Property name="style">
+ <Property name="padding-left">150px</Property>
+ </Property>
+ <Property name="text">甯姪锛氱偣鍑诲潗鏍囦綅缃嬀鍙�</Property>
+ </Link>
+ <AutoFormElement layoutConstraint="colSpan:2">
+ <Property name="name">remark</Property>
+ <Property name="property">remark</Property>
+ <Editor/>
+ </AutoFormElement>
+ </AutoForm>
+ </Container>
</Children>
<Tools/>
</Dialog>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/FileUploadManage.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/FileUploadManage.java
index a32b382..388a252 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/FileUploadManage.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/FileUploadManage.java
@@ -97,4 +97,35 @@
return newFileName;
}
+ /**
+ * 涓婁紶鍑哄叆搴撳鍏xcel妯℃澘
+ * fileUploadManage#uploadExcel
+ * @param file
+ * @param parameter
+ * @return
+ */
+ @FileResolver
+ public String uploadExcel(UploadFile file, Map<String, Object> parameter) {
+ String newFileName = null;
+ try {
+ String basePath = fileService.getFileSavePath("TEMP");
+
+ newFileName = DateFormatUtils.format(new Date(), "yyyyMMddHHmmss");
+ newFileName = "EXCEL" + "_" + newFileName;
+
+ // 鏂囦欢鍚庣紑鍚�
+ String suffixName = file.getFileName().substring(file.getFileName().lastIndexOf("."));
+
+ // 鍚堟垚鏂扮殑鏂囦欢鍚�
+ newFileName = newFileName + suffixName;
+ file.transferTo(new File(basePath + newFileName));
+
+ } catch (IllegalStateException e) {
+ e.printStackTrace();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ return newFileName;
+ }
}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
index 66a7909..f37b2ff 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/Patrol.view.xml
@@ -102,7 +102,7 @@
<Container>
<Property name="className">c-param</Property>
<AutoForm>
- <Property name="cols">*,*,*,*,90,90,120</Property>
+ <Property name="cols">*,*,280,280,90,90,120</Property>
<Property name="dataSet">dsParam</Property>
<Property name="labelAlign">right</Property>
<Property name="labelWidth">100</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
index dab6a1b..65e21b9 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/PledgeContract.view.xml
@@ -182,7 +182,7 @@
</Buttons>
<Children>
<Container>
- <AutoForm layoutConstraint="top ">
+ <AutoForm layoutConstraint="top">
<Property name="dataSet">dsMain</Property>
<Property name="showHint">false</Property>
<Property name="cols">210,*,210</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
index 62dd80c..61553d5 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetail.view.xml
@@ -418,7 +418,8 @@

//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
- deptId:deptId
+ deptId:deptId,
+ type:"IN"
});

query = function(){
@@ -438,7 +439,7 @@
var user = encodeURIComponent(select.get("userName"));
var plateNum = encodeURIComponent(select.get("plateNum"));

- view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
+ view.get("#iFrameImg").set("path", "/basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
view.get("#dialogImg").show();
}else{
$notify("璇烽�夋嫨鏁版嵁鈥︹��");
@@ -447,12 +448,12 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">reportInDetailPR#listRecord</Property>
+ <Property name="dataProvider">reportInoutPR#listRecord</Property>
<Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dsQuery">
<Property name="dataType">dtQuery</Property>
- <Property name="dataProvider">reportInDetailPR#getQuery</Property>
+ <Property name="dataProvider">reportInoutPR#getQueryInout</Property>
<Property></Property>
<Property name="loadMode">manual</Property>
</DataSet>
@@ -515,7 +516,7 @@
"start":data.get("start"),
"end":data.get("end")
}
-window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
@@ -585,7 +586,7 @@
"start":data.get("start"),
"end":data.get("end")
}
-window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍏ュ簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
deleted file mode 100644
index 4b88f92..0000000
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
+++ /dev/null
@@ -1,139 +0,0 @@
-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;
-import com.fzzy.igds.service.SysDeptService;
-import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.igds.utils.DateUtil;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.utils.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class ReportInDetailPR {
-
- @Resource
- private InoutRecordService inoutReportService;
- @Resource
- private SysDeptService sysDeptService;
-
- /**
- * reportInDetailPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
- *
- * @param
- * @return
- */
- @DataProvider
- public InoutParam getQuery(InoutParam param) {
- InoutParam result = new InoutParam();
- //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
- String deptId = param.getDeptId();
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
- result.setTitle("鍏ュ簱鏄庣粏姹囨��");
- if (StringUtils.isNotEmpty(deptName)) {
- result.setTitle(deptName + "鍏ュ簱鏄庣粏姹囨��");
- result.setDeptId(deptId);
- }
- result.setEnd(new Date());
- Date start = DateUtil.getNewByDay(new Date(), -30);
- result.setStart(start);
-
- result.setTimeDesc(
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
- + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
-
- result.setCreateUser(ContextUtil.getLoginUserName());
- result.setCreateTime(new Date());
- return result;
- }
-
- /**
- * 鍑哄叆搴撴眹鎬昏〃
- * reportInDetailPR#listRecord 鎶ヨ〃鏁版嵁锛屽彧鑾峰彇宸茬粡瀹屾垚鐨勶紝骞朵笖闈炲紓甯告暟鎹拰鍒犻櫎鏁版嵁
- *
- * @param param
- * @return
- */
- @DataProvider
- public List<InoutRecord> listRecord(InoutParam param) {
-
- if (null == param) {
- param = new InoutParam();
- }
- //鏌ヨ鍏ュ簱鏁版嵁
- param.setType(Constant.TYPE_IN);
- param.setProgress(Constant.PROGRESS_RECORD);
- param.setRecordStatus(Constant.RECORD_STATUS_NORMAL);
- //澶氬弬鏁板垎椤垫煡璇�
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
- //鏀跺偍鍏徃鏌ヨ澶勭悊
- if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
- String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
- if (!substring.equals(param.getCompanyId())){
- return new ArrayList<InoutRecord>();
- }
- }
- if(StringUtils.isEmpty(param.getDeptId())){
- param.setDeptId(param.getCompanyId());
- }
-
- param.setCompanyId(null);
- inoutReportService.listPageInout(corePage, param);
- //鑾峰彇鏌ヨ鍒板緱list鏁版嵁
- List<InoutRecord> result = corePage.getRecords();
- if (null == result || result.isEmpty()) {
- return result;
- }
-
- // 娣诲姞缁熻淇℃伅
- double emptyWeightSum = 0.0, fullWeightSum = 0.0, deCheck = 0.0, addCheck = 0.0, deWetSum = 0.0, deImpuritySum = 0.0, deHandleSum = 0.0, deOtherSum = 0.0, deSumSum = 0.0, netWeightSum = 0.0, settleWeightSum = 0.0;
- int index = 1;
- List<InoutRecord> list = new ArrayList<>();
- for (InoutRecord record : result) {
- if(StringUtils.isNotBlank(record.getDeptId())){
- record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
- }
- list.add(record);
- record.setRemarks(String.valueOf(index));
- emptyWeightSum += record.getEmptyWeight();
- fullWeightSum += record.getFullWeight();
- deOtherSum += record.getDeOther();
- netWeightSum += record.getNetWeight();
- settleWeightSum += record.getSettleWeight();
- index++;
- }
- InoutRecord sum = new InoutRecord();
- sum.setId("鍚堣");
- sum.setEmptyWeight(emptyWeightSum);
- sum.setFullWeight(fullWeightSum);
- sum.setDeOther(deOtherSum);
- sum.setNetWeight(netWeightSum);
- sum.setSettleWeight(settleWeightSum);
-
- if (sum.getNoticeId() == null) sum.setNoticeId("");
- if (sum.getDepotId() == null) sum.setDepotId("");
- if (sum.getProgress() == null) sum.setProgress("");
- if (sum.getUserName() == null) sum.setUserName("");
- if (sum.getPlateNum() == null) sum.setPlateNum("");
- if (sum.getFoodVariety() == null) sum.setFoodVariety("");
-
- list.add(sum);
-
- return list;
- }
-
-}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
new file mode 100644
index 0000000..ab5123b
--- /dev/null
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInoutPR.java
@@ -0,0 +1,209 @@
+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.data.SuperInventoryReportData;
+import com.fzzy.igds.data.SuperInventoryReportParam;
+import com.fzzy.igds.domain.InoutRecord;
+import com.fzzy.igds.service.InoutRecordService;
+import com.fzzy.igds.service.SuperInventoryReportService;
+import com.fzzy.igds.service.SysDeptService;
+import com.fzzy.igds.utils.ContextUtil;
+import com.fzzy.igds.utils.DateUtil;
+import com.ruoyi.common.core.domain.entity.SysDept;
+import com.ruoyi.common.utils.StringUtils;
+import org.apache.commons.lang3.time.DateFormatUtils;
+import org.springframework.stereotype.Component;
+import javax.annotation.Resource;
+import java.util.*;
+
+/**
+ * @Description 鍑哄叆搴撶浉鍏虫姤琛�
+ * @Author CZT
+ * @Date 2025/12/29 10:32
+ */
+@Component
+public class ReportInoutPR {
+
+ @Resource
+ private InoutRecordService inoutReportService;
+ @Resource
+ private SysDeptService sysDeptService;
+ @Resource
+ private SuperInventoryReportService superInventoryReportService;
+
+ /**
+ * reportInoutPR#getQueryInout
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public Map<String, Object> getQueryInout(InoutParam param) {
+ Map<String, Object> result = new HashMap<String, Object>();
+
+ //鑾峰彇鍙傛暟涓姤琛ㄧ被鍨�
+ String type = param.getType();
+
+ //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
+ String deptId = param.getDeptId();
+ result.put("deptId", deptId);
+
+ //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
+ String deptName = "";
+ SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
+ if (null != subDept) {
+ deptName = subDept.getDeptName();
+ }
+ String title = "姹囨�昏〃";
+ if ("IN".equals(type)) {
+ title= deptName + "鍏ュ簱鏄庣粏姹囨��";
+ }
+ if ("OUT".equals(type)) {
+ title= deptName + "鍑哄簱鏄庣粏姹囨��";
+ }
+ if ("STORE".equals(type)) {
+ title= deptName + "搴撳瓨姹囨�昏〃";
+ }
+
+ result.put("end", new Date());
+ Date start = DateUtil.getNewByDay(new Date(), -30);
+ result.put("start", start);
+ result.put("timeDesc",
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+
+ result.put("createUser", ContextUtil.getLoginUserName());
+ result.put("createTime", new Date());
+ result.put("title", title);
+
+
+ return result;
+ }
+
+ /**
+ * reportInoutPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
+ *
+ * @param
+ * @return
+ */
+ @DataProvider
+ public Map<String, Object> getQueryStore(SuperInventoryReportParam param) {
+ Map<String, Object> result = new HashMap<String, Object>();
+
+ //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
+ String deptId = param.getDeptId();
+ result.put("deptId", deptId);
+
+ //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
+ String deptName = "";
+ SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
+ if (null != subDept) {
+ deptName = subDept.getDeptName();
+ }
+ String title = deptName + "搴撳瓨姹囨�昏〃";
+
+ result.put("end", new Date());
+ Date start = DateUtil.getNewByDay(new Date(), -30);
+ result.put("start", start);
+ result.put("timeDesc",
+ DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
+ + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
+
+ result.put("createUser", ContextUtil.getLoginUserName());
+ result.put("createTime", new Date());
+ result.put("title", title);
+
+
+ return result;
+ }
+
+ /**
+ * 鍑哄叆搴撴眹鎬昏〃
+ * reportInoutPR#listRecord 鎶ヨ〃鏁版嵁锛屽彧鑾峰彇宸茬粡瀹屾垚鐨勶紝骞朵笖闈炲紓甯告暟鎹拰鍒犻櫎鏁版嵁
+ *
+ * @param param
+ * @return
+ */
+ @DataProvider
+ public List<InoutRecord> listRecord(InoutParam param) {
+
+ if (null == param) {
+ param = new InoutParam();
+ }
+ //鏌ヨ鍏ュ簱鏁版嵁
+ param.setProgress(Constant.PROGRESS_RECORD);
+ param.setRecordStatus(Constant.RECORD_STATUS_NORMAL);
+ //澶氬弬鏁板垎椤垫煡璇�
+ com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
+ //鏀跺偍鍏徃鏌ヨ澶勭悊
+ if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
+ String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
+ if (!substring.equals(param.getCompanyId())){
+ return new ArrayList<InoutRecord>();
+ }
+ }
+ if(StringUtils.isEmpty(param.getDeptId())){
+ param.setDeptId(param.getCompanyId());
+ }
+
+ param.setCompanyId(null);
+ inoutReportService.listPageInout(corePage, param);
+ //鑾峰彇鏌ヨ鍒板緱list鏁版嵁
+ List<InoutRecord> result = corePage.getRecords();
+ if (null == result || result.isEmpty()) {
+ return result;
+ }
+
+ // 娣诲姞缁熻淇℃伅
+ double emptyWeightSum = 0.0, fullWeightSum = 0.0, deCheck = 0.0, addCheck = 0.0, deWetSum = 0.0, deImpuritySum = 0.0, deHandleSum = 0.0, deOtherSum = 0.0, deSumSum = 0.0, netWeightSum = 0.0, settleWeightSum = 0.0;
+ int index = 1;
+ List<InoutRecord> list = new ArrayList<>();
+ for (InoutRecord record : result) {
+ if(StringUtils.isNotBlank(record.getDeptId())){
+ record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
+ }
+ list.add(record);
+ record.setRemarks(String.valueOf(index));
+ emptyWeightSum += record.getEmptyWeight();
+ fullWeightSum += record.getFullWeight();
+ deOtherSum += record.getDeOther();
+ netWeightSum += record.getNetWeight();
+ settleWeightSum += record.getSettleWeight();
+ index++;
+ }
+ InoutRecord sum = new InoutRecord();
+ sum.setId("鍚堣");
+ sum.setEmptyWeight(emptyWeightSum);
+ sum.setFullWeight(fullWeightSum);
+ sum.setDeOther(deOtherSum);
+ sum.setNetWeight(netWeightSum);
+ sum.setSettleWeight(settleWeightSum);
+
+ if (sum.getNoticeId() == null) sum.setNoticeId("");
+ if (sum.getDepotId() == null) sum.setDepotId("");
+ if (sum.getProgress() == null) sum.setProgress("");
+ if (sum.getUserName() == null) sum.setUserName("");
+ if (sum.getPlateNum() == null) sum.setPlateNum("");
+ if (sum.getFoodVariety() == null) sum.setFoodVariety("");
+
+ list.add(sum);
+
+ return list;
+ }
+
+ /**
+ * reportInoutPR#getStoreData
+ *
+ * @param param
+ */
+ @DataProvider
+ public List<SuperInventoryReportData> getStoreData(SuperInventoryReportParam param) {
+ if (null == param) {
+ param = new SuperInventoryReportParam();
+ }
+
+ return superInventoryReportService.listSuperInventoryReportData(param);
+ }
+}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
index 0b53918..8f441da 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetail.view.xml
@@ -417,7 +417,8 @@

//榛樿鏌ヨ鏌ヨ鎻愭潯浠�
view.get("#dsQuery").insert({
- deptId:deptId
+ deptId:deptId,
+ type:"OUT"
});

query = function(){
@@ -433,7 +434,7 @@
var user = encodeURIComponent(select.get("userName"));
var plateNum = encodeURIComponent(select.get("plateNum"));

- view.get("#iFrameImg").set("path", "./basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
+ view.get("#iFrameImg").set("path", "/basic/inout/inout-img?id=" + select.get("id")+"&plateNum="+plateNum+"&user="+user);
view.get("#dialogImg").show();
}else{
$notify("璇烽�夋嫨鏁版嵁鈥︹��");
@@ -442,12 +443,12 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">reportOutDetailPR#listRecord</Property>
+ <Property name="dataProvider">reportInoutPR#listRecord</Property>
<Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dsQuery">
<Property name="dataType">dtQuery</Property>
- <Property name="dataProvider">reportOutDetailPR#getQuery</Property>
+ <Property name="dataProvider">reportInoutPR#getQueryInout</Property>
<Property></Property>
<Property name="loadMode">manual</Property>
</DataSet>
@@ -509,7 +510,7 @@
"start":data.get("start"),
"end":data.get("end")
}
-window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
@@ -577,7 +578,7 @@
"start":data.get("start"),
"end":data.get("end")
}
-window.parent.$.table.exportExcelDorado("./export/inOutReport-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/inout-excel", "鍑哄簱鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
deleted file mode 100644
index cbee952..0000000
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
+++ /dev/null
@@ -1,139 +0,0 @@
-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;
-import com.fzzy.igds.service.SysDeptService;
-import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.igds.utils.DateUtil;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.utils.StringUtils;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-@Component
-public class ReportOutDetailPR {
-
- @Resource
- private InoutRecordService inoutReportService;
- @Resource
- private SysDeptService sysDeptService;
-
- /**
- * reportOutDetailPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
- *
- * @param
- * @return
- */
- @DataProvider
- public InoutParam getQuery(InoutParam param) {
- InoutParam result = new InoutParam();
- //鑾峰彇鍙傛暟涓垎搴撶紪鐮�
- String deptId = param.getDeptId();
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
- result.setTitle("鍑哄簱鏄庣粏姹囨��");
- if (StringUtils.isNotEmpty(deptName)) {
- result.setTitle(deptName + "鍑哄簱鏄庣粏姹囨��");
- result.setDeptId(deptId);
- }
- result.setEnd(new Date());
- Date start = DateUtil.getNewByDay(new Date(), -30);
- result.setStart(start);
-
- result.setTimeDesc(
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
- + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
-
- result.setCreateUser(ContextUtil.getLoginUserName());
- result.setCreateTime(new Date());
- return result;
- }
-
- /**
- * 鍑哄叆搴撴眹鎬昏〃
- * reportOutDetailPR#listRecord 鎶ヨ〃鏁版嵁锛屽彧鑾峰彇宸茬粡瀹屾垚鐨勶紝骞朵笖闈炲紓甯告暟鎹拰鍒犻櫎鏁版嵁
- *
- * @param param
- * @return
- */
- @DataProvider
- public List<InoutRecord> listRecord(InoutParam param) {
-
- if (null == param) {
- param = new InoutParam();
- }
- //鏌ヨ鍑哄簱鏁版嵁
- param.setType(Constant.TYPE_OUT);
- param.setProgress(Constant.PROGRESS_RECORD);
- param.setRecordStatus(Constant.RECORD_STATUS_NORMAL);
- //澶氬弬鏁板垎椤垫煡璇�
- com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
- //鏀跺偍鍏徃鏌ヨ澶勭悊
- if(StringUtils.isNotEmpty(param.getDeptId()) && StringUtils.isNotEmpty(param.getCompanyId())){
- String substring = param.getDeptId().substring(0, (param.getDeptId().length() - 3));
- if (!substring.equals(param.getCompanyId())){
- return new ArrayList<InoutRecord>();
- }
- }
- if(StringUtils.isEmpty(param.getDeptId())){
- param.setDeptId(param.getCompanyId());
- }
-
- param.setCompanyId(null);
- inoutReportService.listPageInout(corePage, param);
- //鑾峰彇鏌ヨ鍒板緱list鏁版嵁
- List<InoutRecord> result = corePage.getRecords();
- if (null == result || result.isEmpty()) {
- return result;
- }
-
- // 娣诲姞缁熻淇℃伅
- double emptyWeightSum = 0.0, fullWeightSum = 0.0, deCheck = 0.0, addCheck = 0.0, deWetSum = 0.0, deImpuritySum = 0.0, deHandleSum = 0.0, deOtherSum = 0.0, deSumSum = 0.0, netWeightSum = 0.0, settleWeightSum = 0.0;
- int index = 1;
- List<InoutRecord> list = new ArrayList<>();
- for (InoutRecord record : result) {
- if(StringUtils.isNotBlank(record.getDeptId())){
- record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
- }
- list.add(record);
- record.setRemarks(String.valueOf(index));
- emptyWeightSum += record.getEmptyWeight();
- fullWeightSum += record.getFullWeight();
- deOtherSum += record.getDeOther();
- netWeightSum += record.getNetWeight();
- settleWeightSum += record.getSettleWeight();
- index++;
- }
- InoutRecord sum = new InoutRecord();
- sum.setId("鍚堣");
- sum.setEmptyWeight(emptyWeightSum);
- sum.setFullWeight(fullWeightSum);
- sum.setDeOther(deOtherSum);
- sum.setNetWeight(netWeightSum);
- sum.setSettleWeight(settleWeightSum);
-
- if (sum.getNoticeId() == null) sum.setNoticeId("");
- if (sum.getDepotId() == null) sum.setDepotId("");
- if (sum.getProgress() == null) sum.setProgress("");
- if (sum.getUserName() == null) sum.setUserName("");
- if (sum.getPlateNum() == null) sum.setPlateNum("");
- if (sum.getFoodVariety() == null) sum.setFoodVariety("");
-
- list.add(sum);
-
- return list;
- }
-
-}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml
similarity index 97%
rename from fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
rename to fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml
index 91a8f2b..54459db 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.view.xml
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml
@@ -135,14 +135,14 @@
<Property name="packages">font-awesome,css-common</Property>
<DataSet id="dsMain">
<Property name="dataType">[dtMain]</Property>
- <Property name="dataProvider">superInventoryReportPR#getReportData</Property>
+ <Property name="dataProvider">reportInoutPR#getStoreData</Property>
<Property name="loadMode">manual</Property>
</DataSet>
<DataSet id="dsQuery">
<Property name="dataType">dtQuery</Property>
<Property></Property>
<Property name="loadMode">manual</Property>
- <Property name="dataProvider">superInventoryReportPR#getQuery</Property>
+ <Property name="dataProvider">reportInoutPR#getQueryStore</Property>
</DataSet>
<DataSet id="dsDeptList">
<Property name="dataProvider">deptPR#getDeptByUserType</Property>
@@ -200,7 +200,7 @@
"start":data.get("start"),
"end":data.get("end")
}
-window.parent.$.table.exportExcelDorado("./export/superInventoryReport-excel", "搴撳瓨鏁版嵁", param);</ClientEvent>
+window.parent.$.table.exportExcelDorado("./export/storage-excel", "搴撳瓨鏁版嵁", param);</ClientEvent>
<Property name="caption">瀵煎嚭EXCEL</Property>
<Property name="exClassName">btn-q2</Property>
<Property name="width">140</Property>
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java
deleted file mode 100644
index 5bbd020..0000000
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.fzzy.igds;
-
-import com.bstek.dorado.annotation.DataProvider;
-import com.fzzy.igds.data.SuperInventoryReportData;
-import com.fzzy.igds.data.SuperInventoryReportParam;
-import com.fzzy.igds.service.SuperInventoryReportService;
-import com.fzzy.igds.service.SysDeptService;
-import com.fzzy.igds.utils.ContextUtil;
-import com.fzzy.igds.utils.DateUtil;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import org.apache.commons.lang3.time.DateFormatUtils;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 搴撳瓨鎶ヨ〃
- *
- * @author sgj
- * @date 2025/12/22
- */
-@Component
-public class SuperInventoryReportPR {
-
- @Resource
- private SuperInventoryReportService superInventoryReportService;
- @Resource
- private SysDeptService sysDeptService;
-
- /**
- * superInventoryReportPR#getQuery
- *
- * @return
- */
- @DataProvider
- public SuperInventoryReportParam getQuery() {
- SuperInventoryReportParam result = new SuperInventoryReportParam();
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- result.setTitle("搴撳瓨姹囨�昏〃");
- if (null != subDept) {
- result.setTitle(subDept.getDeptName() + "搴撳瓨姹囨�昏〃");
- result.setDeptId(String.valueOf(subDept.getDeptId()));
- }
- result.setTimeDesc("妫�娴嬫椂闂�");
- result.setEnd(new Date());
- Date start = DateUtil.getNewByDay(new Date(), -30);
- result.setStart(start);
- result.setTimeDesc(
- DateFormatUtils.format(start, "yyyy-MM-dd") + " 鑷� "
- + DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
- result.setCreateUser(ContextUtil.getLoginUserName());
- result.setCreateTime(new Date());
- return result;
- }
-
- /**
- * superInventoryReportPR#getReportData
- *
- * @param param
- */
- @DataProvider
- public List<SuperInventoryReportData> getReportData(SuperInventoryReportParam param) {
- if (null == param) {
- param = new SuperInventoryReportParam();
- }
- List<SuperInventoryReportData> superInventoryReportData = superInventoryReportService.listSuperInventoryReportData(param);
- return superInventoryReportData;
- }
-
-
-}
diff --git a/fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java b/fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java
deleted file mode 100644
index 87eb5cd..0000000
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package com.fzzy.igds.export;
-
-
-import com.fzzy.igds.*;
-import com.fzzy.igds.data.*;
-import com.fzzy.igds.domain.Company;
-import com.fzzy.igds.domain.Depot;
-import com.fzzy.igds.domain.Dept;
-import com.fzzy.igds.domain.InoutRecord;
-import com.fzzy.igds.service.*;
-import com.fzzy.igds.utils.ContextUtil;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.domain.entity.SysDept;
-import com.ruoyi.common.core.domain.entity.SysDictData;
-import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-
-import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.stream.Collectors;
-
-
-/**
- * 鏁版嵁瀵煎嚭EXCEL鍏ュ彛
- *
- * @author sgj
- * @date 2025/12/24
- */
-@Controller
-@RequestMapping("export")
-public class ReportController {
-
-
- @Resource
- private InoutRecordService inoutReportService;
- @Resource
- private SysDeptService sysDeptService;
- @Resource
- private CoreDeptService coreDeptService;
- @Resource
- private DepotService depotService;
- @Resource
- private CoreCompanyService coreCompanyService;
- @Autowired
- private ReportInDetailPR reportInDetailPR;
- @Autowired
- private ReportOutDetailPR reportOutDetailPR;
- @Autowired
- private SuperInventoryReportPR superInventoryReportPR;
-
- @Autowired
- private CompanyPR companyPR;
-
- @Autowired
- private DeptPR deptPR;
-
- @Autowired
- private DepotPR depotPR;
-
- @Autowired
- private DicPR dicPR;
-
-
- /**
- * 鍑哄叆搴撴姤琛ㄥ鍑�
- *
- * @return
- */
- @RequestMapping("/inOutReport-excel")
- @ResponseBody
- public AjaxResult inOutReport(InoutParam param) {
- //璁剧疆鏍囬
- String sheetName = "鎶ヨ〃鏁版嵁";
- //鏌ヨ鏁版嵁
- List<InoutRecord> list = new ArrayList<>();
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
- //鍒涘缓鏀跺偍鍏徃ID鍒板悕绉扮殑鏄犲皠
- Map<String, String> companyMap = Optional.ofNullable(companyPR.getData())
- .orElse(new ArrayList<>())
- .stream()
- .collect(Collectors.toMap(Company::getId, Company::getDwmc, (key1, key2) -> key2));
- //鍒涘缓鎵�鍦ㄥ簱鍖篒D鍒板悕绉扮殑鏄犲皠
- Map<String, String> deptMap = Optional.ofNullable(deptPR.getAllData())
- .orElse(new ArrayList<>())
- .stream()
- .collect(Collectors.toMap(Dept::getId, Dept::getKqmc, (key1, key2) -> key2));
- // 鍒涘缓浠撳簱ID鍒板悕绉扮殑鏄犲皠
- Map<String, String> depotMap = Optional.ofNullable(depotPR.getData(null))
- .orElse(new ArrayList<>())
- .stream()
- .collect(Collectors.toMap(Depot::getId, Depot::getName, (key1, key2) -> key2));
- //鍒涘缓绮鍝佺ID鍒板悕绉扮殑鏄犲皠
- Map<String, String> foodVarietyMap = Optional.ofNullable(dicPR.sysDictData("FOOD_VARIETY_"))
- .orElse(new ArrayList<>())
- .stream()
- .collect(Collectors.toMap(SysDictData::getDictValue, SysDictData::getDictLabel, (key1, key2) -> key2));
-
- //缁勮瀹為檯瀵煎嚭鏁版嵁
- if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
- sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
- list = reportInDetailPR.listRecord(param);
- List<InoutRecordInExport> exportList = new ArrayList<>();
- for (InoutRecord record : list) {
- InoutRecordInExport export = new InoutRecordInExport();
- export.setId(record.getId());
- export.setPlateNum(record.getPlateNum());
- // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
- String depotNameValue = depotMap.get(record.getDepotId());
- export.setDepotId(depotNameValue != null ? depotNameValue : "");
- //绮鍝佺鏄犲皠
- String foodVarietyNameValue = foodVarietyMap.get(record.getFoodVariety());
- export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setFullWeight(record.getFullWeight());
- export.setEmptyWeight(record.getEmptyWeight());
- export.setNetWeight(record.getNetWeight());
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
- export.setCompleteTime(record.getCompleteTime());
- export.setDeOther(record.getDeOther());
- exportList.add(export);
- }
- ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
- }
-
- if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
- sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
- list = reportOutDetailPR.listRecord(param);
- List<InoutRecordOutExport> exportList = new ArrayList<>();
- for (InoutRecord record : list) {
- InoutRecordOutExport export = new InoutRecordOutExport();
- export.setId(record.getId());
- export.setPlateNum(record.getPlateNum());
- // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
- String depotNameValue = depotMap.get(record.getDepotId());
- export.setDepotId(depotNameValue != null ? depotNameValue : "");
- //绮鍝佺鏄犲皠
- String foodVarietyNameValue = foodVarietyMap.get(record.getFoodVariety());
- export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setFullWeight(record.getFullWeight());
- export.setEmptyWeight(record.getEmptyWeight());
- export.setNetWeight(record.getNetWeight());
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
- export.setCompleteTime(record.getCompleteTime());
- export.setDeOther(record.getDeOther());
- exportList.add(export);
- }
- ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
- }
-
- if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
- sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
- list = reportInDetailPR.listRecord(param);
- List<InoutRecordDetailInExport> exportList = new ArrayList<>();
- for (InoutRecord record : list) {
- InoutRecordDetailInExport export = new InoutRecordDetailInExport();
- //鏀跺偍鍏徃鏄犲皠
- String companyNameValue = companyMap.get(record.getCompanyId());
- export.setCompanyId(companyNameValue != null ? companyNameValue : "");
- //搴撳尯鏄犲皠
- String deptNameValue = deptMap.get(record.getDeptId());
- export.setDeptId(deptNameValue != null ? deptNameValue : "");
- export.setId(record.getId());
- export.setPlateNum(record.getPlateNum());
- // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
- String depotNameValue = depotMap.get(record.getDepotId());
- export.setDepotId(depotNameValue != null ? depotNameValue : "");
- //绮鍝佺鏄犲皠
- String foodVarietyNameValue = foodVarietyMap.get(record.getFoodVariety());
- export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
- export.setCompleteTime(record.getCompleteTime());
- exportList.add(export);
- }
- ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
- }
-
- if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
- sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
- list = reportOutDetailPR.listRecord(param);
- List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
- for (InoutRecord record : list) {
- InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
- //鏀跺偍鍏徃鏄犲皠
- String companyNameValue = companyMap.get(record.getCompanyId());
- export.setCompanyId(companyNameValue != null ? companyNameValue : "");
- //搴撳尯鏄犲皠
- String deptNameValue = deptMap.get(record.getDeptId());
- export.setDeptId(deptNameValue != null ? deptNameValue : "");
- export.setId(record.getId());
- export.setPlateNum(record.getPlateNum());
- // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
- String depotNameValue = depotMap.get(record.getDepotId());
- export.setDepotId(depotNameValue != null ? depotNameValue : "");
- //绮鍝佺鏄犲皠
- String foodVarietyNameValue = foodVarietyMap.get(record.getFoodVariety());
- export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
- export.setSettleWeight(record.getSettleWeight());
- export.setRecordWeight(record.getRecordWeight());
- export.setCompleteTime(record.getCompleteTime());
- exportList.add(export);
- }
- ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
- return util.exportExcel(exportList, sheetName, deptName);
- }
- return AjaxResult.error("鍙傛暟閿欒");
- }
-
-
- /**
- * 搴撳瓨鎶ヨ〃瀵煎嚭
- *
- * @return
- */
- @RequestMapping("/superInventoryReport-excel")
- @ResponseBody
- public AjaxResult superInventoryReport(SuperInventoryReportParam param) {
- //璁剧疆鏍囬
- String sheetName = "搴撳瓨鎶ヨ〃鏁版嵁";
- //鏌ヨ鏁版嵁
- List<SuperInventoryReportData> list = superInventoryReportPR.getReportData(param);
- //鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
- String deptName = "";
- SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
- if (null != subDept) {
- deptName = subDept.getDeptName();
- }
-
- //瀵煎嚭
- ExcelUtil<SuperInventoryReportData> util = new ExcelUtil<SuperInventoryReportData>(SuperInventoryReportData.class);
- return util.exportExcel(list, sheetName, deptName);
- }
-
-}
diff --git a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
index bc10824..78b203e 100644
--- a/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
+++ b/fzzy-igdss-web/src/main/java/com/fzzy/common/ExportController.java
@@ -1,13 +1,12 @@
package com.fzzy.common;
import com.fzzy.common.manager.ExportManager;
-import com.fzzy.igds.ReportInDetailPR;
-import com.fzzy.igds.ReportOutDetailPR;
-import com.fzzy.igds.SuperInventoryReportPR;
-import com.fzzy.igds.data.ExportWordParam;
-import com.fzzy.igds.data.InoutParam;
-import com.fzzy.igds.data.SuperInventoryReportData;
-import com.fzzy.igds.data.SuperInventoryReportParam;
+import com.fzzy.igds.*;
+import com.fzzy.igds.constant.FoodVariety;
+import com.fzzy.igds.data.*;
+import com.fzzy.igds.domain.Company;
+import com.fzzy.igds.domain.Depot;
+import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.SysDeptService;
import com.fzzy.igds.utils.ContextUtil;
@@ -24,6 +23,9 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
/**
* @Description 鏁版嵁瀵煎嚭鍏ュ彛
@@ -45,6 +47,12 @@
private ReportOutDetailPR reportOutDetailPR;
@Resource
private SuperInventoryReportPR superInventoryReportPR;
+ @Resource
+ private CompanyPR companyPR;
+ @Resource
+ private DeptPR deptPR;
+ @Resource
+ private DepotPR depotPR;
/**
* 瀵煎嚭word骞朵笅杞�
@@ -90,31 +98,145 @@
@RequestMapping("/inout-excel")
@ResponseBody
public AjaxResult inOutExcel(InoutParam param) {
- //璁剧疆鏍囬
+//璁剧疆鏍囬
String sheetName = "鎶ヨ〃鏁版嵁";
//鏌ヨ鏁版嵁
List<InoutRecord> list = new ArrayList<>();
-
- if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
- sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
- list = reportInDetailPR.listRecord(param);
- }
-
- if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
- sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
- list = reportOutDetailPR.listRecord(param);
- }
-
//鑾峰彇鍒嗗簱缂栫爜瀵瑰簲鐨勫垎搴撳悕绉�
String deptName = "";
SysDept subDept = sysDeptService.getCacheDept(null, ContextUtil.subDeptId(null));
if (null != subDept) {
deptName = subDept.getDeptName();
}
+ //鍒涘缓鏀跺偍鍏徃ID鍒板悕绉扮殑鏄犲皠
+ Map<String, String> companyMap = Optional.ofNullable(companyPR.getData())
+ .orElse(new ArrayList<>())
+ .stream()
+ .collect(Collectors.toMap(Company::getId, Company::getDwmc, (key1, key2) -> key2));
+ //鍒涘缓鎵�鍦ㄥ簱鍖篒D鍒板悕绉扮殑鏄犲皠
+ Map<String, String> deptMap = Optional.ofNullable(deptPR.getAllData())
+ .orElse(new ArrayList<>())
+ .stream()
+ .collect(Collectors.toMap(Dept::getId, Dept::getKqmc, (key1, key2) -> key2));
+ // 鍒涘缓浠撳簱ID鍒板悕绉扮殑鏄犲皠
+ Map<String, String> depotMap = Optional.ofNullable(depotPR.getData(null))
+ .orElse(new ArrayList<>())
+ .stream()
+ .collect(Collectors.toMap(Depot::getId, Depot::getName, (key1, key2) -> key2));
- //瀵煎嚭
- ExcelUtil<InoutRecord> util = new ExcelUtil<InoutRecord>(InoutRecord.class);
- return util.exportExcel(list, sheetName, deptName);
+ //缁勮瀹為檯瀵煎嚭鏁版嵁
+ if (StringUtils.isNotEmpty(param.getType()) && "IN".equals(param.getType())) {
+ sheetName = "鍏ュ簱鎶ヨ〃鏁版嵁";
+ list = reportInDetailPR.listRecord(param);
+ List<InoutRecordInExport> exportList = new ArrayList<>();
+ for (InoutRecord record : list) {
+ InoutRecordInExport export = new InoutRecordInExport();
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
+ export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
+ export.setFullWeight(record.getFullWeight());
+ export.setEmptyWeight(record.getEmptyWeight());
+ export.setNetWeight(record.getNetWeight());
+ export.setSettleWeight(record.getSettleWeight());
+ export.setRecordWeight(record.getRecordWeight());
+ export.setCompleteTime(record.getCompleteTime());
+ export.setDeOther(record.getDeOther());
+ exportList.add(export);
+ }
+ ExcelUtil<InoutRecordInExport> util = new ExcelUtil<InoutRecordInExport>(InoutRecordInExport.class);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+
+ if (StringUtils.isNotEmpty(param.getType()) && "OUT".equals(param.getType())) {
+ sheetName = "鍑哄簱鎶ヨ〃鏁版嵁";
+ list = reportOutDetailPR.listRecord(param);
+ List<InoutRecordOutExport> exportList = new ArrayList<>();
+ for (InoutRecord record : list) {
+ InoutRecordOutExport export = new InoutRecordOutExport();
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
+ export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
+ export.setFullWeight(record.getFullWeight());
+ export.setEmptyWeight(record.getEmptyWeight());
+ export.setNetWeight(record.getNetWeight());
+ export.setSettleWeight(record.getSettleWeight());
+ export.setRecordWeight(record.getRecordWeight());
+ export.setCompleteTime(record.getCompleteTime());
+ export.setDeOther(record.getDeOther());
+ exportList.add(export);
+ }
+ ExcelUtil<InoutRecordOutExport> util = new ExcelUtil<InoutRecordOutExport>(InoutRecordOutExport.class);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+
+ if (StringUtils.isNotEmpty(param.getType()) && "IN_DETAIL".equals(param.getType())) {
+ sheetName = "鍏ュ簱鏄庣粏鎶ヨ〃鏁版嵁";
+ list = reportInDetailPR.listRecord(param);
+ List<InoutRecordDetailInExport> exportList = new ArrayList<>();
+ for (InoutRecord record : list) {
+ InoutRecordDetailInExport export = new InoutRecordDetailInExport();
+ //鏀跺偍鍏徃鏄犲皠
+ String companyNameValue = companyMap.get(record.getCompanyId());
+ export.setCompanyId(companyNameValue != null ? companyNameValue : "");
+ //搴撳尯鏄犲皠
+ String deptNameValue = deptMap.get(record.getDeptId());
+ export.setDeptId(deptNameValue != null ? deptNameValue : "");
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
+ export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
+ export.setSettleWeight(record.getSettleWeight());
+ export.setRecordWeight(record.getRecordWeight());
+ export.setCompleteTime(record.getCompleteTime());
+ exportList.add(export);
+ }
+ ExcelUtil<InoutRecordDetailInExport> util = new ExcelUtil<InoutRecordDetailInExport>(InoutRecordDetailInExport.class);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+
+ if (StringUtils.isNotEmpty(param.getType()) && "OUT_DETAIL".equals(param.getType())) {
+ sheetName = "鍑哄簱鏄庣粏鎶ヨ〃鏁版嵁";
+ list = reportOutDetailPR.listRecord(param);
+ List<InoutRecordDetailOutExport> exportList = new ArrayList<>();
+ for (InoutRecord record : list) {
+ InoutRecordDetailOutExport export = new InoutRecordDetailOutExport();
+ //鏀跺偍鍏徃鏄犲皠
+ String companyNameValue = companyMap.get(record.getCompanyId());
+ export.setCompanyId(companyNameValue != null ? companyNameValue : "");
+ //搴撳尯鏄犲皠
+ String deptNameValue = deptMap.get(record.getDeptId());
+ export.setDeptId(deptNameValue != null ? deptNameValue : "");
+ export.setId(record.getId());
+ export.setPlateNum(record.getPlateNum());
+ // 灏嗕粨搴揑D鏄犲皠涓轰粨搴撳悕绉�
+ String depotNameValue = depotMap.get(record.getDepotId());
+ export.setDepotId(depotNameValue != null ? depotNameValue : "");
+ //绮鍝佺鏄犲皠
+ String foodVarietyNameValue = FoodVariety.getMsg(record.getFoodVariety());
+ export.setFoodVariety(foodVarietyNameValue != null ? foodVarietyNameValue : "");
+ export.setSettleWeight(record.getSettleWeight());
+ export.setRecordWeight(record.getRecordWeight());
+ export.setCompleteTime(record.getCompleteTime());
+ exportList.add(export);
+ }
+ ExcelUtil<InoutRecordDetailOutExport> util = new ExcelUtil<InoutRecordDetailOutExport>(InoutRecordDetailOutExport.class);
+ return util.exportExcel(exportList, sheetName, deptName);
+ }
+ return AjaxResult.error("鍙傛暟閿欒");
}
/**
--
Gitblit v1.9.3