From 31fa22ac9bdcad743fe705d46c03f393d0be819c Mon Sep 17 00:00:00 2001 From: "pref_mail@163.com" Date: Sat, 3 Feb 2024 10:57:41 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=A9=BA=E6=8C=87=E9=92=88?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaskQuestServiceImpl.java | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java index 57c826396..090894032 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java @@ -765,24 +765,21 @@ public class TaskQuestServiceImpl extends BaseServiceImpl>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", 1); List list = new ArrayList<>(); AtomicBoolean s = new AtomicBoolean(false); - taskSearchDTO.getQuestDetailIds().stream().forEach(i -> { + taskSearchDTO.getQuestDetailIds().forEach(i -> { log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", i); - //查询当前包件盘点状态 -// boolean b = questDetailList.stream().anyMatch(q -> q.getId().equals(i) && q.getQuestStatus().equals(1)); -// if(b){ -// s.set(true); -// } - QuestDetailEntity questDetail = new QuestDetailEntity(); - questDetail.setId(Long.valueOf(i)); - questDetail.setQuestStatus(1); - questDetail.setUpdateUser(user.getUserId()); - questDetail.setUpdateTime(new Date()); - questDetail.setInventoryUser(user.getUserId()); - questDetail.setInventoryTime(new Date()); -// questDetail.setId(Long.valueOf(i)); -// questDetail.setQuestStatus(1); - list.add(questDetail); + if(ObjectUtils.isNotNull(i)){ + //查询当前包件盘点状态 + + QuestDetailEntity questDetail = new QuestDetailEntity(); + questDetail.setId(Long.valueOf(i)); + questDetail.setQuestStatus(1); + questDetail.setUpdateUser(user.getUserId()); + questDetail.setUpdateTime(new Date()); + questDetail.setInventoryUser(user.getUserId()); + questDetail.setInventoryTime(new Date()); + list.add(questDetail); + } }); log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> tag {}", 1);