From eaf842d3224720dca6c0267cf9f13f7b72f49a89 Mon Sep 17 00:00:00 2001
From: jiazx0107 <jiazx0107@163.com>
Date: 星期六, 03 一月 2026 00:48:10 +0800
Subject: [PATCH] 调增工单页面，调整登录验证功能
---
fzzy-igdss-view/src/main/java/com/fzzy/igds/ReportInDetailPR.java | 21 +++++++++++++++++++--
1 files changed, 19 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..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
@@ -27,7 +27,7 @@
private SysDeptService sysDeptService;
/**
- * reportInoutDetailPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
+ * reportInDetailPR#getQuery 鏍规嵁鎶ヨ〃绫诲瀷锛岃幏鍙栭粯璁ゆ煡璇俊鎭紝姣斿琛ㄥご淇℃伅绛�
*
* @param
* @return
@@ -61,7 +61,7 @@
/**
* 鍑哄叆搴撴眹鎬昏〃
- * reportInoutDetailPR#listRecord 鎶ヨ〃鏁版嵁锛屽彧鑾峰彇宸茬粡瀹屾垚鐨勶紝骞朵笖闈炲紓甯告暟鎹拰鍒犻櫎鏁版嵁
+ * reportInDetailPR#listRecord 鎶ヨ〃鏁版嵁锛屽彧鑾峰彇宸茬粡瀹屾垚鐨勶紝骞朵笖闈炲紓甯告暟鎹拰鍒犻櫎鏁版嵁
*
* @param param
* @return
@@ -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