diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index dd404c8f4..3f2be4e7c 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1355,11 +1355,21 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { List loadscanEntityList = distributionLoadscanMapper.selectList(Wrappers.query().lambda() .eq(DistributionLoadscanEntity::getReservationId, reservationId) .in(DistributionLoadscanEntity::getPackageId, packageIds) + .eq(DistributionLoadscanEntity::getSignforState, 2) .ne(DistributionLoadscanEntity::getScanStatus, LoadingStatusConstant.quxiao.getValue()) ); for (DistributionParcelNumberDTO distributionParcelNumberDTO : distributionParcelNumberDTOS) { //判断是全部进行返回还是部分 + if (!loadscanEntityList.isEmpty()) { + //需要比对此品类是否存在签收数据 + List zeroLoading = loadscanEntityList.stream().filter(f -> f.getPackageId().equals(distributionParcelNumberDTO.getParcelListId())).collect(Collectors.toList()); + if (!zeroLoading.isEmpty()) { + //存在签收数据,进行部分释放 + } + }else { + //进行全部释放 + } } if (Func.isNotEmpty(loadscanEntityList)) { //查看是否存在需要进行回库的零担 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index 146b4ce5c..616d965aa 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -5216,6 +5216,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl logList = new ArrayList<>();