From 2b35183407eb7b1b1524f7b101f1098d9caea042 Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期三, 02 四月 2025 15:13:24 +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 | 36 +++++++++++++++++++++++-------------
1 files changed, 23 insertions(+), 13 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 373d76a..07896ec 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
@@ -4,6 +4,7 @@
import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vincent.rsf.framework.common.R;
@@ -32,6 +33,7 @@
import java.util.List;
import java.util.Map;
import java.util.Objects;
+import java.util.stream.Collectors;
@Service("matnrService")
public class MatnrServiceImpl extends ServiceImpl<MatnrMapper, Matnr> implements MatnrService {
@@ -103,19 +105,20 @@
}
@Override
- public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam) {
- IPage<Map<String, Object>> reulst = this.baseMapper.selectMatnrs(pageParam, pageParam.buildWrapper(true));
- /**鑾峰彇鐗╂枡鍒嗛〉淇℃伅 */
- 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());
+ public PageParam<Matnr, BaseParam> getMatnrPage(PageParam<Matnr, BaseParam> pageParam, Map<String, Object> params) {
+ QueryWrapper<Matnr> queryWrapper = pageParam.buildWrapper(true);
+ 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);
}
- });
+ }
}
-
- PageParam<Matnr, BaseParam> page = this.page(pageParam, pageParam.buildWrapper(true));
+ /**鎷兼帴鎵╁睍瀛楁*/
+ PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
List<Matnr> records = page.getRecords();
for (Matnr record : records) {
if (!Objects.isNull(record.getFieldsIndex())) {
@@ -198,6 +201,13 @@
return true;
}
+ @Override
+ public PageParam<Matnr, BaseParam> getPages(Map<String, Object> map) {
+
+
+ return null;
+ }
+
/**
* @desc 鏇存柊鎵╁睍鐗╂枡鎵╁睍瀛楁鍊�
* @param matnr
@@ -216,9 +226,9 @@
*/
String uuid16 = CommonUtil.randomUUID16();
if (!FieldsUtils.getFieldsSta().isEmpty()) {
- Map<String, ?> extendFields = (Map<String, ?>) matnr.get("extendFields");
+// Map<String, ?> extendFields = (Map<String, ?>) matnr.get("extendFields");
try {
- FieldsUtils.saveFields(extendFields, uuid16);
+ FieldsUtils.saveFields(matnr, uuid16);
matnr1.setFieldsIndex(uuid16);
} catch (Exception ex) {
log.error(ex.toString());
--
Gitblit v1.9.1