From b7fa11ff11ea34ac0231fcdd41135b3def7129de Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期日, 18 一月 2026 01:22:54 +0800
Subject: [PATCH] 调功工单功能
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java | 17 +++++++++++++++++
1 files changed, 17 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..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,8 +74,22 @@
}
//鏌ヨ鍏ュ簱鏁版嵁
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鏁版嵁
List<InoutRecord> result = corePage.getRecords();
@@ -88,6 +102,9 @@
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();
--
Gitblit v1.9.3