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 c18e1c7ca..3fa2807f6 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 @@ -81,7 +81,7 @@ public class PlanReportListener implements ReportService { for (ReservationVO reservationVO : reservationVOList) { List details = reservationVO.getPackageDataList(); if (CollUtil.isNotEmpty(details)) { - totalNum = totalNum + 1; + totalNum = totalNum + details.size(); } } if (CollUtil.isNotEmpty(reservationCodeSet)) { diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java index caebc5e37..8b1122951 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionDeliveryListServiceImpl.java @@ -1247,7 +1247,7 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl broadcastDataByZeroOrderAndParcId = baseMapper.getBroadcastDataByZeroOrderAndParcId(distributionLoadscanEntity.getDeliveryId(), distributionLoadscanEntity.getWarehouseId(), distributionLoadscanEntity.getPackageId()); - PackageData packageData = BeanUtil.copy(broadcastDataByZeroOrderAndParcId, PackageData.class); - assert packageData != null; - packageData.setBrand(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("brandName"))); - PackageTypeEnums type = PackageTypeEnums.LTL; - packageData.setPackageType(type); - packageData.setProductName(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("productName"))); - packageData.setNumber(distributionLoadscanEntity.getLoadedNub()); - data.add(packageData); - + if(ObjectUtil.isNotEmpty(broadcastDataByZeroOrderAndParcId)){ + PackageData packageData = BeanUtil.copy(broadcastDataByZeroOrderAndParcId, PackageData.class); + assert packageData != null; + packageData.setBrand(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("brandName"))); + PackageTypeEnums type = PackageTypeEnums.LTL; + packageData.setPackageType(type); + packageData.setProductName(Convert.toStr(broadcastDataByZeroOrderAndParcId.get("productName"))); + packageData.setNumber(distributionLoadscanEntity.getLoadedNub()); + data.add(packageData); + } } distributionLoadVO.setPackageDataList(data); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java index 2a46e08d6..7c3242837 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionSignforServiceImpl.java @@ -3319,6 +3319,7 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl