From ac3cfc47a08ce8e9e99ecc43fdbada396a714def Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期一, 05 一月 2026 21:26:17 +0800
Subject: [PATCH] 调整出入库配置2
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java | 13 +++++++++++--
1 files changed, 11 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..a4996d9 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
@@ -74,12 +74,21 @@
}
//鏌ヨ鍏ュ簱鏁版嵁
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鏁版嵁
@@ -93,11 +102,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