From 8c39eb09386b96d0256695b3de3d2822e95809f0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 17 七月 2025 10:23:30 +0800
Subject: [PATCH] 盘点单下发功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
index 52bc2c6..7026595 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java
@@ -108,17 +108,24 @@
@Override
public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
- QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
+ List<Long> longs = new ArrayList<>();
if (params.containsKey("groupId")) {
Object groupId = params.get("groupId");
- if (!Objects.isNull(groupId)) {
+ MatnrGroup group = matnrGroupService.getById(groupId.toString());
+ if (null != group){
+ pageParam.getWhere().getMap().remove("groupId");
List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString())).select(MatnrGroup::getId));
if (!matnrGroups.isEmpty()) {
- List<Long> longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
- queryWrapper.or().in("group_id", longs);
+ longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+
}
+ longs.add(group.getId());
+
}
}
+ QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
+ queryWrapper.in(!longs.isEmpty(),"group_id", longs);
+
FieldsUtils.setFieldsFilters(queryWrapper,pageParam,Matnr.class);
/**鎷兼帴鎵╁睍瀛楁*/
PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
--
Gitblit v1.9.1