出库导入报错;
This commit is contained in:
+8
-2
@@ -199,16 +199,16 @@ public class ReservationStockOutOrderDomainService {
|
|||||||
List<ReservationDeliveryDetailsLink> oldList = reservationDeliveryDetailsLinkService.list(new LambdaQueryWrapper<ReservationDeliveryDetailsLink>().eq(ReservationDeliveryDetailsLink::getOrderId, stockOutOrderDO.getOutOrderId()));
|
List<ReservationDeliveryDetailsLink> oldList = reservationDeliveryDetailsLinkService.list(new LambdaQueryWrapper<ReservationDeliveryDetailsLink>().eq(ReservationDeliveryDetailsLink::getOrderId, stockOutOrderDO.getOutOrderId()));
|
||||||
// ====================== 核心:取差值 ======================
|
// ====================== 核心:取差值 ======================
|
||||||
// 第一步:把新列表的所有id存入Set(O(1)查找,效率最高)
|
// 第一步:把新列表的所有id存入Set(O(1)查找,效率最高)
|
||||||
|
if (reservationDeliveryDetailsLinkList != null && !reservationDeliveryDetailsLinkList.isEmpty()
|
||||||
|
&& oldList != null && !oldList.isEmpty()) {
|
||||||
Set<Long> newIdSet = reservationDeliveryDetailsLinkList.stream()
|
Set<Long> newIdSet = reservationDeliveryDetailsLinkList.stream()
|
||||||
.map(ReservationDeliveryDetailsLink::getId)
|
.map(ReservationDeliveryDetailsLink::getId)
|
||||||
.filter(Objects::nonNull) // 过滤null id,避免空指针
|
.filter(Objects::nonNull) // 过滤null id,避免空指针
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
|
|
||||||
// 第二步:筛选出旧列表中 不在新列表里的元素(就是要删除的差值)
|
// 第二步:筛选出旧列表中 不在新列表里的元素(就是要删除的差值)
|
||||||
List<ReservationDeliveryDetailsLink> deleteList = oldList.stream()
|
List<ReservationDeliveryDetailsLink> deleteList = oldList.stream()
|
||||||
.filter(oldItem -> !newIdSet.contains(oldItem.getId()))
|
.filter(oldItem -> !newIdSet.contains(oldItem.getId()))
|
||||||
.collect(Collectors.toList());
|
.collect(Collectors.toList());
|
||||||
|
|
||||||
// 第三步:执行删除(如果需要)
|
// 第三步:执行删除(如果需要)
|
||||||
if (CollUtil.isNotEmpty(deleteList)) {
|
if (CollUtil.isNotEmpty(deleteList)) {
|
||||||
for (ReservationDeliveryDetailsLink reservationDeliveryDetailsLink : deleteList) {
|
for (ReservationDeliveryDetailsLink reservationDeliveryDetailsLink : deleteList) {
|
||||||
@@ -216,6 +216,12 @@ public class ReservationStockOutOrderDomainService {
|
|||||||
}
|
}
|
||||||
// reservationDeliveryDetailsLinkService.removeByIds(deleteList);
|
// reservationDeliveryDetailsLinkService.removeByIds(deleteList);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) {
|
if (!CollectionUtils.isEmpty(reservationDeliveryDetailsLinkList)) {
|
||||||
for (ReservationDeliveryDetailsLink reservationDeliveryDetailsLink : reservationDeliveryDetailsLinkList) {
|
for (ReservationDeliveryDetailsLink reservationDeliveryDetailsLink : reservationDeliveryDetailsLinkList) {
|
||||||
reservationDeliveryDetailsLink.setOrderNumber(stockOutOrderDO.getOutOrderNumber());
|
reservationDeliveryDetailsLink.setOrderNumber(stockOutOrderDO.getOutOrderNumber());
|
||||||
|
|||||||
Reference in New Issue
Block a user