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> fzzy-igdss-view/src/main/java/com/fzzy/igds/FileUploadManage.java
@@ -97,4 +97,35 @@ return newFileName; } /** * ä¸ä¼ åºå ¥åºå¯¼å ¥Excelæ¨¡æ¿ * 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; } } 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> 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> 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> fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
ÎļþÒÑɾ³ý 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); } } 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> fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportOutDetailPR.java
ÎļþÒÑɾ³ý fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportStore.view.xml
ÎļþÃû´Ó fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReport.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> fzzy-igdss-view/src/main/java/com/fzzy/igds/SuperInventoryReportPR.java
ÎļþÒÑɾ³ý fzzy-igdss-view/src/main/java/com/fzzy/igds/export/ReportController.java
ÎļþÒÑɾ³ý 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)); //å建æå¨åºåºIDå°å称çæ å° 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()); // å°ä»åºIDæ å°ä¸ºä»åºå称 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()); // å°ä»åºIDæ å°ä¸ºä»åºå称 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()); // å°ä»åºIDæ å°ä¸ºä»åºå称 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()); // å°ä»åºIDæ å°ä¸ºä»åºå称 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("åæ°é误"); } /**
