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 6ef91e627..f1c201155 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 @@ -5160,14 +5160,16 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl orderPackageIds = ts.stream() .map(DistributionParcelListEntity::getId) // 获取每个对象的包件ID .collect(Collectors.toList()); + if (Func.isNotEmpty(orderPackageCodes)){ + List allocationStrList = distributionParcelListMapper.selectAllocationInforByOrderPackageCode(orderPackageCodes, distrilbutionBillLadingEntity.getWarehouseId()); + String allocationStr = StringUtils.join(allocationStrList, ","); + tempMap.put("货位", allocationStr); + } - - List allocationStrList = distributionParcelListMapper.selectAllocationInforByOrderPackageCode(orderPackageCodes, distrilbutionBillLadingEntity.getWarehouseId()); - String allocationStr = StringUtils.join(allocationStrList, ","); - tempMap.put("货位", allocationStr); //通过订单id和预约id查询对应包件的备货区信息 LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()).in(DistributionStockEntity::getParcelListId, orderPackageIds); + lambdaQueryWrapper.eq(DistributionStockEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) + .in(DistributionStockEntity::getParcelListId, orderPackageIds); List distributionStockEntities = distributionStockMapper.selectList(lambdaQueryWrapper); Set stockupAreaStrList = distributionStockEntities.stream().map(DistributionStockEntity::getStockupArea).collect(Collectors.toSet()); 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 ffdbfd6c6..793e26f63 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 @@ -4295,7 +4295,6 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl set = new UpdateWrapper().lambda() //// .eq(DistributionSignforEntity::getId, distributionSignforEntity.getId()) //// .set(StringUtils.isNotBlank(distributionSignfor.getDeliverySignPictures()), DistributionSignforEntity::getDeliverySignPictures, distributionSignfor.getDeliverySignPictures()) diff --git a/blade-service/pom.xml b/blade-service/pom.xml index b21f8d8b1..19fc03996 100644 --- a/blade-service/pom.xml +++ b/blade-service/pom.xml @@ -62,10 +62,10 @@ blade-starter-metrics - - org.springblade - blade-starter-transaction - + + + + org.springblade blade-starter-tenant