diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java index ed2deaa7d..ba3f51c33 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionParcelListService.java @@ -203,4 +203,10 @@ public interface IDistributionParcelListService extends BaseServicequery().lambda() + .eq(DistributionParcelNumberEntity::getParcelListId, parcelListId) + ); + if (Func.isNotEmpty(distributionParcelNumberEntity)){ + DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); + int totalQuantity = distributionParcelNumberEntity.getQuantity(); + int handledQuantity = distributionParcelNumberEntity.getHandQuantity(); + int deliveryQuantity = distributionParcelNumberEntity.getDeliveryQuantity(); + int outboundQuantity = distributionParcelNumberEntity.getOutboundQuantity(); + int signinQuantity = distributionParcelNumberEntity.getSigninQuantity(); + if (totalQuantity > 0){ + if (handledQuantity == totalQuantity){ + parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); + } + parcelListEntity.setId(parcelListId); + if ((deliveryQuantity + outboundQuantity) == 0){ + parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); + + }else if ((deliveryQuantity + outboundQuantity) == totalQuantity){ + parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.yiyueyue.getValue()); + } + if (outboundQuantity == 0){ + parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.weizhuancghe.getValue()); + }else if (outboundQuantity == totalQuantity){ + parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue()); + parcelListEntity.setOrderPackageReservationStatus(OrderPackageStatusConstant.yichuku.getValue()); + } + + + if (signinQuantity == totalQuantity){ + parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yiqianshou.getValue()); + } + this.updateById(parcelListEntity); + + + } + + } + + + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java index b688213d0..c067c8ea4 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java @@ -2673,8 +2673,10 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl