From 1ca48170fed2b32e2939049e2161118c0c521350 Mon Sep 17 00:00:00 2001
From: sgj <1442489573@qq.com>
Date: 星期四, 29 一月 2026 09:15:44 +0800
Subject: [PATCH] Merge branch 'master' of http://124.71.187.17:8299/r/fzzy-igdss
---
fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
index bbbf64b..a44bdfa 100644
--- a/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
+++ b/fzzy-igdss-core/src/main/java/com/fzzy/igds/service/SuperInventoryReportService.java
@@ -286,6 +286,8 @@
if (StringUtils.isNotBlank(param.getDeptId())) {
inoutRecordQueryWrapper.likeRight("dept_id", param.getDeptId());
}
+ inoutRecordQueryWrapper.likeRight("progress", Constant.PROGRESS_RECORD); //宸插畬鎴愮殑鍗曟嵁
+ inoutRecordQueryWrapper.ne("record_status", Constant.RECORD_STATUS_DEL); //涓嶆槸鍒犻櫎鐨勫崟瀛愶紝鍗虫甯哥殑鍗曞瓙
inoutRecordQueryWrapper.ge("create_time", param.getStart());
inoutRecordQueryWrapper.le("create_time", param.getEnd());
inoutRecordQueryWrapper.orderByAsc("create_time");
--
Gitblit v1.9.3