From cb248506e5944f49fef18c6e973fbd650b45dc03 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期三, 24 十二月 2025 17:35:19 +0800
Subject: [PATCH] 入库报表列宽调整，映射调整，查询调整，导出实现
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
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
index 6567db1..1f5cfa8 100644
--- a/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
+++ b/fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java
@@ -27,7 +27,7 @@
private SysDeptService sysDeptService;
/**
- * reportInoutDetailPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
+ * reportInDetailPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
*
* @param
* @return
@@ -61,7 +61,7 @@
/**
* 鍑哄叆搴撴眹鎬昏〃
- * reportInoutDetailPR#listRecord 鎶ヨ〃鏁版嵁锛屽彧鑾峰彇宸茬粡瀹屾垚鐨勶紝骞朵笖闈炲紓甯告暟鎹拰鍒犻櫎鏁版嵁
+ * reportInDetailPR#listRecord 鎶ヨ〃鏁版嵁锛屽彧鑾峰彇宸茬粡瀹屾垚鐨勶紝骞朵笖闈炲紓甯告暟鎹拰鍒犻櫎鏁版嵁
*
* @param param
* @return
@@ -76,6 +76,11 @@
param.setType(Constant.TYPE_IN);
//澶氬弬鏁板垎椤垫煡璇�
com.baomidou.mybatisplus.extension.plugins.pagination.Page<InoutRecord> corePage = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(0, 10000);
+ //鏀跺偍鍏徃鏌ヨ澶勭悊
+ if(StringUtils.isEmpty(param.getDeptId())){
+ param.setDeptId(param.getCompanyId());
+ }
+ param.setCompanyId(null);
inoutReportService.listPageInout(corePage, param);
//鑾峰彇鏌ヨ鍒板緱list鏁版嵁
List<InoutRecord> result = corePage.getRecords();
@@ -90,6 +95,9 @@
for (InoutRecord record : result) {
list.add(record);
record.setRemarks(String.valueOf(index));
+ if(StringUtils.isNotBlank(record.getDeptId())){
+ record.setCompanyId(record.getDeptId().substring(0,(record.getDeptId().length()-3)));
+ }
emptyWeightSum += record.getEmptyWeight();
fullWeightSum += record.getFullWeight();
deOtherSum += record.getDeOther();
--
Gitblit v1.9.3