From 6a389857b3012c448ef271ee9fc092ea37d9d720 Mon Sep 17 00:00:00 2001 From: zhaoqiaobo <583671871@qq.com> Date: Thu, 19 Dec 2024 17:45:15 +0800 Subject: [PATCH] =?UTF-8?q?feat(all):=20=E8=BD=A6=E6=AC=A1=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E6=98=8E=E7=BB=86=E6=8A=A5=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1 修改报表逻辑 --- .../report/BillPlanReportListener.java | 3 + .../report/BillReViewReportListener.java | 3 + .../report/BillSignforReportListener.java | 3 + .../report/DeliverFinishReportListener.java | 8 ++- .../report/LoadingReportListener.java | 3 + .../receiver/report/PlanReportListener.java | 63 +++++++++++-------- .../receiver/report/ReViewReportListener.java | 3 + .../receiver/report/ReportListener.java | 16 +++++ .../report/ReservationPlanReportListener.java | 33 +++++++++- .../report/SignforReportListener.java | 3 + .../receiver/report/StockReportListener.java | 3 + 11 files changed, 112 insertions(+), 29 deletions(-) diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java index 7da811533..b13146aae 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillPlanReportListener.java @@ -72,12 +72,15 @@ public class BillPlanReportListener implements ReportService { } cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode()) && StrUtil.isNotEmpty(item.getIncomingBatch())) .collect(Collectors.groupingBy(item -> item.getMallName() + item.getMaterielCode() + item.getIncomingBatch())); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java index fa43d913a..0526cdee9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillReViewReportListener.java @@ -69,12 +69,15 @@ public class BillReViewReportListener implements ReportService { if (CollUtil.isNotEmpty(qualityDeliverEntities)) { cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java index b72db0bee..9b2d98247 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/BillSignforReportListener.java @@ -69,12 +69,15 @@ public class BillSignforReportListener implements ReportService { if (CollUtil.isNotEmpty(qualityDeliverEntities)) { cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index 9eafa08a8..743fdf2b0 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -288,6 +288,9 @@ public class DeliverFinishReportListener implements ReportService { if (addvaluePackageMap.containsKey(entity.getOrderPackageCode() + "1")) { stairsNumber = Convert.toInt(addvaluePackageMap.get(entity.getOrderPackageCode() + "1")); } + if (!NumberUtil.equals(stairsNumber, 0)) { + stairsNumber = stairsNumber - 1; + } // 平移米数 Integer translationNumber = 0; if (addvaluePackageMap.containsKey(entity.getOrderPackageCode() + "3")) { @@ -757,9 +760,12 @@ public class DeliverFinishReportListener implements ReportService { } Set longs = valueMap.keySet(); Integer dkp = 0; - if(CollUtil.isNotEmpty(allRouteMap)){ + if (CollUtil.isNotEmpty(allRouteMap)) { dkp = allRouteMap.keySet().size(); } + if (!NumberUtil.equals(dkp, 0)) { + dkp = dkp - 1; + } for (Map.Entry entityEntry : valueMap.entrySet()) { QualityDeliverEntity value2 = entityEntry.getValue(); String siteSubsidyCost = priceVO.getSiteSubsidyCost(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java index 1fd9864bf..534562090 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/LoadingReportListener.java @@ -69,12 +69,15 @@ public class LoadingReportListener implements ReportService { if (CollUtil.isNotEmpty(qualityDeliverEntities)) { cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java index 862c5cf1b..ce2a75fb7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/PlanReportListener.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -80,24 +82,30 @@ public class PlanReportListener implements ReportService { if (CollUtil.isNotEmpty(qualityDeliverEntities)) { cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getPlanReservationCode() + item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getPlanReservationCode() + item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getPlanReservationCode()) && StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode())) .collect(Collectors.groupingBy(item -> item.getPlanReservationCode() + item.getMallName() + item.getMaterielCode())); } else { - // 没有查询到，延迟30秒重新推送 + // 没有查询到，延迟10秒重新推送 factoryDataClient.sendMessage(SendMsg.builder() .exchange(FanoutConstants.distribution.DeliveryAndPlan.EXCHANGE_DELAY) .routingKey(null) .message(msg) - .delay(30000) + .delay(10000) .build()); return; } } + Set cmpSet = new HashSet<>(); + Set ltlSet = new HashSet<>(); + Set invSet = new HashSet<>(); for (ReservationVO reservationVO : reservationVOList) { String reservationCode = reservationVO.getReservationCode(); List details = reservationVO.getPackageDataList(); @@ -130,6 +138,9 @@ public class PlanReportListener implements ReportService { sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY); } } + if(StrUtil.isNotEmpty(detail.getPackageCode())){ + cmpSet.add(reservationCode + detail.getPackageCode()); + } } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { qualityDeliverEntity.setOrderCode(detail.getOrderCode()); qualityDeliverEntity.setCategory(detail.getProductName()); @@ -142,6 +153,9 @@ public class PlanReportListener implements ReportService { sendReport(qualityDeliverEntity, BizOperationEnums.MODIFY); } } + if(StrUtil.isNotEmpty(detail.getProductName()) && StrUtil.isNotEmpty(detail.getOrderCode())){ + ltlSet.add(reservationCode + detail.getProductName() + detail.getOrderCode()); + } } else if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) { qualityDeliverEntity.setBizCode(reservationVO.getReservationCode()); qualityDeliverEntity.setIncomingBatch(detail.getPickupBatch()); @@ -165,36 +179,31 @@ public class PlanReportListener implements ReportService { } } } + if(StrUtil.isNotEmpty(detail.getMallName()) && StrUtil.isNotEmpty(detail.getMaterialCode())){ + invSet.add(reservationCode + detail.getMallName() + detail.getMaterialCode()); + } } } } - // 系统中有的包件在当前不存在，则删除 - Set cmpSet = details.stream() - .filter(item -> ObjectUtil.equals(item.getPackageType(), PackageTypeEnums.CMP)) - .map(i -> reservationCode + i.getPackageCode()).collect(Collectors.toSet()); - for (Map.Entry> entry : cmpMap.entrySet()) { - String key = entry.getKey(); - if (!cmpSet.contains(key)) { - sendReport(entry.getValue().get(0), BizOperationEnums.DELETE); - } + } + for (Map.Entry> entry : cmpMap.entrySet()) { + String key = entry.getKey(); + if (!cmpSet.contains(key)) { + sendReport(entry.getValue().get(0), BizOperationEnums.DELETE); } - Set ltlSet = details.stream().filter(item -> ObjectUtil.equals(item.getPackageType(), PackageTypeEnums.LTL)) - .map(i -> reservationCode + i.getProductName() + i.getOrderCode()).collect(Collectors.toSet()); - for (Map.Entry> entry : ltlMap.entrySet()) { - String key = entry.getKey(); - if (!ltlSet.contains(key)) { - sendReport(entry.getValue().get(0), BizOperationEnums.DELETE); - } + } + for (Map.Entry> entry : ltlMap.entrySet()) { + String key = entry.getKey(); + if (!ltlSet.contains(key)) { + sendReport(entry.getValue().get(0), BizOperationEnums.DELETE); } - Set invSet = details.stream().filter(item -> ObjectUtil.equals(item.getPackageType(), PackageTypeEnums.INV)) - .map(i -> reservationCode + i.getMallName() + i.getMaterialCode()).collect(Collectors.toSet()); - for (Map.Entry> entry : invMap.entrySet()) { - String key = entry.getKey(); - if (!invSet.contains(key)) { - List value = entry.getValue(); - for (QualityDeliverEntity entity : value) { - sendReport(entity, BizOperationEnums.DELETE); - } + } + for (Map.Entry> entry : invMap.entrySet()) { + String key = entry.getKey(); + if (!invSet.contains(key)) { + List value = entry.getValue(); + for (QualityDeliverEntity entity : value) { + sendReport(entity, BizOperationEnums.DELETE); } } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java index b0eb33f8b..dd4e6c9e7 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReViewReportListener.java @@ -68,12 +68,15 @@ public class ReViewReportListener implements ReportService { if (CollUtil.isNotEmpty(qualityDeliverEntities)) { cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java index 74806f7d4..d0daefdfe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReportListener.java @@ -55,6 +55,7 @@ public class ReportListener { try { selectReportService(BillPlanReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("自提任务生成明细报表失败: {}", e.getMessage()); } } @@ -82,6 +83,7 @@ public class ReportListener { try { selectReportService(BillReViewReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("自提复核生成明细报表失败: {}", e.getMessage()); } } @@ -109,6 +111,7 @@ public class ReportListener { try { selectReportService(BillSignforReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("自提签收扫描生成明细报表失败: {}", e.getMessage()); } } @@ -136,6 +139,7 @@ public class ReportListener { try { selectReportService(CarStartReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("发车生成明细报表失败: {}", e.getMessage()); } } @@ -163,6 +167,7 @@ public class ReportListener { try { selectReportService(ConsigneeArriveReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("配送到达生成明细报表失败: {}", e.getMessage()); } } @@ -218,6 +223,7 @@ public class ReportListener { try { selectReportService(LoadingReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("装车生成明细报表失败: {}", e.getMessage()); } } @@ -245,6 +251,7 @@ public class ReportListener { try { selectReportService(PlanReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("配送计划生成明细报表失败: {}", e.getMessage()); } } @@ -274,6 +281,7 @@ public class ReportListener { try { selectReportService(PlanReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("配送计划生成明细报表失败: {}", e.getMessage()); } } @@ -301,6 +309,7 @@ public class ReportListener { try { selectReportService(ReservationPlanReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("预约计划生成明细报表失败: {}", e.getMessage()); } } @@ -328,6 +337,7 @@ public class ReportListener { try { selectReportService(ReturnWarehouseReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("回库生成明细报表失败: {}", e.getMessage()); } } @@ -355,6 +365,7 @@ public class ReportListener { try { selectReportService(ReViewReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("文员复核生成明细报表失败: {}", e.getMessage()); } } @@ -382,6 +393,7 @@ public class ReportListener { try { selectReportService(SignforReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("签收扫描生成明细报表失败: {}", e.getMessage()); } } @@ -409,6 +421,7 @@ public class ReportListener { try { selectReportService(StockReportListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("备货生成明细报表失败: {}", e.getMessage()); } } @@ -437,6 +450,7 @@ public class ReportListener { try { selectReportService(QualityDeliverListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("配送明细基础表处理失败: {}", e.getMessage()); } } @@ -465,6 +479,7 @@ public class ReportListener { try { selectReportService(QualityDeliverAddListener.class).buildReport(msg); } catch (Exception e) { + e.printStackTrace(); log.error("配送明细基础表Add失败: {}", e.getMessage()); } } @@ -487,6 +502,7 @@ public class ReportListener { String trainNumber = vo.getTrainNumber(); qualityDeliverService.carExpenseDispatchDetailFinal(trainNumber); } catch (Exception e) { + e.printStackTrace(); log.error("生成车辆车次成本报表失败: {}", e.getMessage()); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java index aa8eb906d..92cdd6d97 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/ReservationPlanReportListener.java @@ -25,7 +25,6 @@ import org.springblade.core.tool.utils.BeanUtil; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -71,13 +70,45 @@ public class ReservationPlanReportListener implements ReportService { } cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode()) && StrUtil.isNotEmpty(item.getIncomingBatch())) .collect(Collectors.groupingBy(item -> item.getMallName() + item.getMaterielCode() + item.getIncomingBatch())); + // 移除指定包件 + if (BizOperationEnums.REMOVE.equals(bizOperation)) { + if (CollUtil.isNotEmpty(details)) { + for (PackageData detail : details) { + if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.CMP)) { + if (cmpMap.containsKey(detail.getPackageCode())) { + QualityDeliverEntity qualityDeliverEntity = new QualityDeliverEntity(); + qualityDeliverEntity.setId(cmpMap.get(detail.getPackageCode()).get(0).getId()); + sendReport(qualityDeliverEntity, BizOperationEnums.DELETE); + } + } + if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.LTL)) { + if (ltlMap.containsKey(detail.getProductName() + detail.getOrderCode())) { + QualityDeliverEntity qualityDeliverEntity = new QualityDeliverEntity(); + qualityDeliverEntity.setId(ltlMap.get(detail.getProductName() + detail.getOrderCode()).get(0).getId()); + sendReport(qualityDeliverEntity, BizOperationEnums.DELETE); + } + } + if (ObjectUtil.equals(detail.getPackageType(), PackageTypeEnums.INV)) { + if (invMap.containsKey(detail.getMallName() + detail.getMaterialCode() + detail.getPickupBatch())) { + QualityDeliverEntity qualityDeliverEntity = new QualityDeliverEntity(); + qualityDeliverEntity.setId(invMap.get(detail.getMallName() + detail.getMaterialCode() + detail.getPickupBatch()).get(0).getId()); + sendReport(qualityDeliverEntity, BizOperationEnums.DELETE); + } + } + } + } + return; + } } } if (CollUtil.isNotEmpty(details)) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java index a89cca8fb..466ac1398 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/SignforReportListener.java @@ -70,12 +70,15 @@ public class SignforReportListener implements ReportService { if (CollUtil.isNotEmpty(qualityDeliverEntities)) { cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); } } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java index b8a37f4df..a42d9214e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/StockReportListener.java @@ -65,12 +65,15 @@ public class StockReportListener implements ReportService { if (CollUtil.isNotEmpty(qualityDeliverEntities)) { cmpMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.CMP.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getOrderPackageCode())) .collect(Collectors.groupingBy(item -> item.getOrderPackageCode())); ltlMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.LTL.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getCategory()) && StrUtil.isNotEmpty(item.getOrderCode())) .collect(Collectors.groupingBy(item -> item.getCategory() + item.getOrderCode())); invMap = qualityDeliverEntities.stream() .filter(item -> NumberUtil.equals(item.getConditions(), PackageTypeEnums.INV.getCode())) + .filter(item -> StrUtil.isNotEmpty(item.getMallName()) && StrUtil.isNotEmpty(item.getMaterielCode())) .collect(Collectors.groupingBy(item -> item.getMallName() + item.getMaterielCode())); } }