From 59251b6445daef3729a205fc7054fcbdc55b060a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 16 四月 2025 11:16:05 +0800
Subject: [PATCH] #修复 1. 收货单新增物料时分组查询不生效 2. 综合订单分页数调整 3. 物料列表报错修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/MatnrServiceImpl.java | 19 +++++--------------
1 files changed, 5 insertions(+), 14 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..6c5fa1b 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);
}
@@ -117,17 +119,6 @@
}
}
}
-// 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());
-// }
-// });
-// }
-
/**鎷兼帴鎵╁睍瀛楁*/
PageParam<Matnr, BaseParam> page = this.page(pageParam, queryWrapper);
List<Matnr> records = page.getRecords();
--
Gitblit v1.9.1