From a6b31188a2afd5e7ceb79bd481a70cc1e4737fb8 Mon Sep 17 00:00:00 2001 From: zhenghaoyu Date: Tue, 17 Oct 2023 20:31:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?1.=E7=9B=98=E7=82=B9=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=90=88=E5=90=8C=E5=8F=B7=E7=9B=98=E7=82=B9=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../logpm/warehouse/service/impl/TaskQuestServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 84ec36f1a..b5afb5def 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 @@ -240,15 +240,15 @@ public class TaskQuestServiceImpl extends BaseServiceImpl zeroQuestDetailEntities = questDetailMap.get(2); List inventoryQuestDetailEntities = questDetailMap.get(3); if (Func.isNotEmpty(questDetailEntities)){ - Map> orderMap = questDetailEntities.stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderId)); + Map> orderMap = questDetailEntities.stream().collect(Collectors.groupingBy(QuestDetailEntity::getOrderCode)); orderMap.forEach((k,v)->{ - DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findEntityByStockArticleId(k); + DistributionStockArticleEntity stockArticleEntity = distributionStockArticleClient.findStockArticleByOrderCodeAndWarehouseId(k,taskSearchDTO.getWarehouseId()); List detailEntities = orderMap.get(k); TaskContractVO taskContractVO = new TaskContractVO(); taskContractVO.setIsInventory(0); taskContractVO.setIsZero(0); taskContractVO.setOrderCode(detailEntities.get(0).getOrderCode()); - taskContractVO.setOrderId(k); + taskContractVO.setOrderId(detailEntities.get(0).getOrderId()); taskContractVO.setTotal(detailEntities.stream().mapToInt(QuestDetailEntity::getStockNum).sum()); taskContractVO.setZktotal(detailEntities.stream().mapToInt(QuestDetailEntity::getStockNum).sum()); taskContractVO.setUnTotal(detailEntities.stream().filter(q->Func.equals(q.getQuestStatus(),1)).mapToInt(QuestDetailEntity::getStockNum).sum()); From 2a4edd15437e0d0e7a087b1d7c8a9cee161ea778 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080@qq.com> Date: Tue, 17 Oct 2023 20:51:17 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E6=89=98?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 5e6a2c879..6ee083316 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 @@ -409,7 +409,7 @@ public class TaskQuestServiceImpl extends BaseServiceImpl{ taskTrayVO.setTrayCode(p.getTrayCode()); num.set(num.get() + p.getStockNum()); - if(p.getQuestStatus().equals(1)){ + if(p.getQuestStatus().equals(1) && p.getIsNew().equals(0)){ List list = questDetailChildService.list(Wrappers.query().lambda() .eq(QuestDetailChildEntity::getQuestDetailId, p.getId()) .eq(QuestDetailChildEntity::getWarehouseId, warehouseId)