From 40b9706aaef635a203da05c71cb733ae76a28933 Mon Sep 17 00:00:00 2001 From: mashuai Date: Sat, 6 Sep 2025 18:30:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basic/service/impl/BmQrBoxServiceImpl.java | 18 +++++++++++++++++- .../impl/LeaseApplyInfoServiceImpl.java | 3 +++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java index 253a1dbd..12951e84 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmQrBoxServiceImpl.java @@ -83,7 +83,23 @@ public class BmQrBoxServiceImpl implements BmQrBoxService { if (null != bmQrBoxInfo.getStatus()) { bmQrBoxInfo.setStatusList(Arrays.asList(bmQrBoxInfo.getStatus().split(","))); } - return bmQrBoxMapper.find(bmQrBoxInfo); + List list = bmQrBoxMapper.find(bmQrBoxInfo); + if (CollectionUtil.isNotEmpty(list)) { + if (CollectionUtil.isNotEmpty(bmQrBoxInfo.getStatusList())) { + if(bmQrBoxInfo.getStatusList().contains("2") && bmQrBoxInfo.getStatusList().contains("5")) { + // 将list中状态为2和5并且devNum大于0的数据过滤出来 + list = list.stream() + // 先判空list中的bmQrBoxInfo1和它的statusList，避免空指针 + .filter(bmQrBoxInfo1 -> bmQrBoxInfo1 != null + && bmQrBoxInfo1.getStatus() != null + && bmQrBoxInfo1.getDevNum() > 0) + .filter(bmQrBoxInfo1 -> "2".equals(bmQrBoxInfo1.getStatus()) + || "5".equals(bmQrBoxInfo1.getStatus())) + .collect(Collectors.toList()); + } + } + } + return list; } /** diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java index 4c3b2a7f..507574e3 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseApplyInfoServiceImpl.java @@ -1412,6 +1412,9 @@ public class LeaseApplyInfoServiceImpl implements ILeaseApplyInfoService { } } if (leaseOutDetails.getManageType().equals(MaTypeManageTypeEnum.NUMBER_DEVICE.getTypeId())) { + if (leaseOutDetails.getInputNum().compareTo(BigDecimal.ZERO) <= 0) { + return AjaxResult.error("出库数量不能小于0"); + } // 查询待出库数量 LeaseApplyDetails info = new LeaseApplyDetails(); if (StringUtils.isNotBlank(leaseOutDetails.getPublishTask())) {