From 1e7849282875b5bcd237d93f7b496aecb6ede4b6 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 05 五月 2025 10:01:11 +0800
Subject: [PATCH] 1. 任务历史档报错问题修复 2. 单据添加收货单明细不显示问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
index 2c7f1c0..9872363 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/LocAreaMatRelaServiceImpl.java
@@ -77,7 +77,7 @@
LocAreaMatRela locAreaMatRela = new LocAreaMatRela();
locAreaMatRela
.setAreaMatId(param.getAreaMatId())
- .setAreaId(param.getAreaId())
+// .setAreaId(param.getAreaId())
.setLocId(locId)
.setLocTypeId(typeId)
.setMatnrId(matnrId.getId())
@@ -89,7 +89,9 @@
}
if (!Objects.isNull(param.getLocId()) && !param.getLocId().isEmpty()) {
- List<LocTypeRela> list = locTypeRelaService.list(new LambdaQueryWrapper<LocTypeRela>().in(LocTypeRela::getLocId, param.getLocId()).select(LocTypeRela::getTypeId, LocTypeRela::getLocId));
+ List<LocTypeRela> list = locTypeRelaService.list(new LambdaQueryWrapper<LocTypeRela>()
+ .in(LocTypeRela::getLocId, param.getLocId())
+ .select(LocTypeRela::getTypeId, LocTypeRela::getLocId));
if (list.isEmpty()) {
throw new CoolException("鏁版嵁閿欒锛氬簱浣嶆湭缁戝畾搴撲綅绫诲瀷锛侊紒");
}
@@ -175,12 +177,12 @@
}
List<LocAreaMatRela> locAreaMatRelas = this.list(new LambdaQueryWrapper<LocAreaMatRela>().eq(LocAreaMatRela::getAreaMatId, id));
if (locAreaMatRelas.isEmpty()) {
- throw new CoolException("搴撳尯缁戝畾鐗╂枡涓虹┖锛侊紒");
+ return new ArrayList<>();
}
List<Long> longList = locAreaMatRelas.stream().map(LocAreaMatRela::getGroupId).collect(Collectors.toList());
List<MatnrGroup> groups = matnrGroupService.list(new LambdaQueryWrapper<MatnrGroup>().in(MatnrGroup::getId, longList));
if (groups.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒锛氱墿鏂欏垎缁勪笉瀛樺湪锛侊紒");
+ return new ArrayList<>();
}
return groups;
}
@@ -199,12 +201,12 @@
}
List<LocAreaMatRela> locAreaMatRelas = this.list(new LambdaQueryWrapper<LocAreaMatRela>().eq(LocAreaMatRela::getAreaMatId, id));
if (locAreaMatRelas.isEmpty()) {
- throw new CoolException("搴撳尯缁戝畾鐗╂枡涓虹┖锛侊紒");
+ return new ArrayList<>();
}
List<Long> longList = locAreaMatRelas.stream().map(LocAreaMatRela::getLocTypeId).collect(Collectors.toList());
List<LocType> list = locTypeService.list(new LambdaQueryWrapper<LocType>().in(LocType::getId, longList));
if (list.isEmpty()) {
- throw new CoolException("鏁版嵁閿欒锛氬簱浣嶇被鍨嬩笉瀛樺湪锛侊紒");
+ return new ArrayList<>();
}
return list;
}
--
Gitblit v1.9.1