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 | 8 ++++++++
1 files changed, 8 insertions(+), 0 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 caa9ed9..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
@@ -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