From 68fae8cc33d80553355997554b06f5ac1395ef2c Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 25 十二月 2025 11:39:37 +0800
Subject: [PATCH] 出库报表列宽调整，映射调整，查询调整，导出实现
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java | 10 ++++++++--
1 files changed, 8 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 1f5cfa8..e0dc0e3 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
@@ -80,6 +80,12 @@
if(StringUtils.isEmpty(param.getDeptId())){
param.setDeptId(param.getCompanyId());
}
+ 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>();
+ }
+ }
param.setCompanyId(null);
inoutReportService.listPageInout(corePage, param);
//鑾峰彇鏌ヨ鍒板緱list鏁版嵁
@@ -93,11 +99,11 @@
int index = 1;
List<InoutRecord> list = new ArrayList<>();
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)));
}
+ list.add(record);
+ record.setRemarks(String.valueOf(index));
emptyWeightSum += record.getEmptyWeight();
fullWeightSum += record.getFullWeight();
deOtherSum += record.getDeOther();
--
Gitblit v1.9.3