From bd1d4feea4f9522c69ef4c0fd72b1221eae5201f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 14:41:06 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 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 bbc13ea..d0eb7ca 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
@@ -86,11 +86,13 @@
}
//鑾峰彇鍔ㄦ�佸瓧娈碉紝骞朵繚瀛樻槑缁嗗唴瀹�
if (!FieldsUtils.getFieldsSta().isEmpty()) {
- String uuid = CommonUtil.randomUUID16();
- matnr.setFieldsIndex(uuid);
//淇濆瓨鐗╂枡鎵╁睍灞炴�у��
try {
- FieldsUtils.saveFields(template, uuid);
+ String uuid = CommonUtil.randomUUID16();
+ boolean b = FieldsUtils.saveFields(template, uuid);
+ if (b) {
+ matnr.setFieldsIndex(uuid);
+ }
} catch (Exception e) {
throw new RuntimeException(e);
}
@@ -106,28 +108,28 @@
@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)) {
- 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);
+ 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());
}
+
+
}
}
-// IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, queryWrapper);
-// /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
-// List<Map<String, Object>> mapList = reulst.getRecords();
-// if (!mapList.isEmpty()) {
-// mapList.forEach(map -> {
-// if (!Objects.isNull(map.get("fieldsIndex"))) {
-// FieldsUtils.mergeFields(map, map.get("fieldsIndex").toString());
-// }
-// });
-// }
+ 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);
List<Matnr> records = page.getRecords();
--
Gitblit v1.9.1