From 51ea5c4baf680676ee6c00dbcbbee81b3ad32059 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 28 十月 2025 15:15:49 +0800
Subject: [PATCH] 第二次筛选物料列表为空问题修复
---
rsf-admin/src/page/orders/outStock/OutOrderModal.jsx | 2 +-
rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx | 6 +++---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 25 ++++++++++++++-----------
rsf-admin/src/page/orders/check/MatnrInfoModal.jsx | 6 +++---
rsf-admin/src/page/orders/outStock/MatnrInfoModal.jsx | 7 ++++---
5 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
index cc7f9f6..ce2e90b 100644
--- a/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
+++ b/rsf-admin/src/page/orders/asnOrder/AsnWareModal.jsx
@@ -46,9 +46,9 @@
const reset = () => {
setFormData({
- name: '',
- code: '',
- groupId: 0
+ name: null,
+ code: null,
+ groupId: null
})
}
diff --git a/rsf-admin/src/page/orders/check/MatnrInfoModal.jsx b/rsf-admin/src/page/orders/check/MatnrInfoModal.jsx
index c92774f..fa0e5ca 100644
--- a/rsf-admin/src/page/orders/check/MatnrInfoModal.jsx
+++ b/rsf-admin/src/page/orders/check/MatnrInfoModal.jsx
@@ -48,9 +48,9 @@
const reset = () => {
setFormData({
- name: '',
- code: '',
- groupId: 0
+ name: null,
+ code: null,
+ groupId: null
})
}
diff --git a/rsf-admin/src/page/orders/outStock/MatnrInfoModal.jsx b/rsf-admin/src/page/orders/outStock/MatnrInfoModal.jsx
index 57b833f..e51d215 100644
--- a/rsf-admin/src/page/orders/outStock/MatnrInfoModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/MatnrInfoModal.jsx
@@ -48,9 +48,9 @@
const reset = () => {
setFormData({
- name: '',
- code: '',
- groupId: 0
+ name: null,
+ code: null,
+ groupId: null
})
}
@@ -78,6 +78,7 @@
const getData = async () => {
setIsLoading(true)
+ console.log(page);
const res = await request.post(`/matnr/page`, {
...formData,
current: page?.page,
diff --git a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
index d64d8a3..a12c340 100644
--- a/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
+++ b/rsf-admin/src/page/orders/outStock/OutOrderModal.jsx
@@ -198,7 +198,7 @@
</DialogTitle>
<Grid container rowSpacing={2} columnSpacing={2}>
<DialogContent>
- <Grid item sx={24}>
+ <Grid item>
<List
resource="/deliveryItem/filters"
sx={{
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 524ce11..34c5ea3 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
@@ -139,21 +139,24 @@
public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
List<Long> longs = new ArrayList<>();
if (params.containsKey("groupId")) {
- Object groupId = params.get("groupId");
- MatnrGroup group = matnrGroupService.getById(groupId.toString());
- if (null != group){
- pageParam.getWhere().getMap().remove("groupId");
- if(!group.getCode().equals("01")){
- List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
- .eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString()))
- .select(MatnrGroup::getId));
- if (!matnrGroups.isEmpty()) {
- longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+ if (!Objects.isNull(params.get("groupId"))) {
+ Object groupId = params.get("groupId");
+ MatnrGroup group = matnrGroupService.getById(groupId.toString());
+ if (null != group){
+ pageParam.getWhere().getMap().remove("groupId");
+ if(!group.getCode().equals("01")){
+ List<MatnrGroup> matnrGroups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>()
+ .eq(MatnrGroup::getParentId, Long.parseLong(groupId.toString()))
+ .select(MatnrGroup::getId));
+ if (!matnrGroups.isEmpty()) {
+ longs = matnrGroups.stream().map(MatnrGroup::getId).collect(Collectors.toList());
+ }
+ longs.add(group.getId());
}
- longs.add(group.getId());
}
}
+
}
QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
queryWrapper.in(!longs.isEmpty(),"group_id", longs);
--
Gitblit v1.9.1