diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java index 899f5e7e8..61ea1f8c9 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationZeroPackageServiceImpl.java @@ -29,10 +29,12 @@ import com.logpm.distribution.mapper.DistributionReservationZeroPackageMapper; import com.logpm.distribution.service.IDistributionParcelListService; import com.logpm.distribution.service.IDistributionParcelNumberService; import com.logpm.distribution.service.IDistributionReservationZeroPackageService; +import com.logpm.distribution.service.IDistributionStockArticleService; import com.logpm.distribution.vo.DistributionReservationZeroPackageVO; import org.springblade.common.constant.reservation.ReservationPackageStatusConstant; import org.springblade.core.mp.base.BaseServiceImpl; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import java.util.List; @@ -51,6 +53,9 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm private DistributionParcelListMapper distributionParcelListMapper; @Autowired private IDistributionParcelNumberService distributionParcelNumberService; + @Autowired + @Lazy + private IDistributionStockArticleService distributionStockArticleService; @Override @@ -118,6 +123,7 @@ public class DistributionReservationZeroPackageServiceImpl extends BaseServiceIm distributionParcelNumberService.updateById(distributionParcelNumberEntity); reservationZeroPackageEntity.setQuantity(0); reservationZeroPackageEntity.setZeroPackageStatus(ReservationPackageStatusConstant.quxiao.getValue()); + distributionStockArticleService.maintenanceOrderInfo(parcelListEntity.getOrderCode(),parcelListEntity.getWarehouseId()); this.updateById(reservationZeroPackageEntity); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java index aba7cbe7a..bc47719d8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistrilbutionBillLadingServiceImpl.java @@ -336,10 +336,10 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl stockArticleList = distrilbutionBillLading.getStockArticleList(); if (Func.isNotEmpty(stockArticleList)){ String orderCodes = stockArticleList.stream().map(DistributionStockArticleEntity::getOrderCode).collect(Collectors.joining(",")); @@ -650,6 +650,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl list3 = distrilbutionBillPackageService.list(Wrappers.query().lambda() .eq(DistrilbutionBillPackageEntity::getBillLadingId, distrilbutionBillLadingEntity.getId()) .ne(DistrilbutionBillPackageEntity::getPacketBarStatus, "2") - .ne(DistrilbutionBillPackageEntity::getStockArticleId, distributionStockArticleVO.getId()) + .eq(DistrilbutionBillPackageEntity::getStockArticleId, distributionStockArticleVO.getId()) ); if (!list3.isEmpty()){ distributionStockArticleVO.setReservationNum(list3.size());