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 9d7c75ada..ae62944d8 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 @@ -2171,7 +2171,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { DistributionDeliveryDetailsEntity one = distributionDeliveryDetailsService.getOne(Wrappers.query().lambda() .eq(DistributionDeliveryDetailsEntity::getBillLadingId, reservationId) .eq(DistributionDeliveryDetailsEntity::getStockListId, stockupDTO.getStockListId()) - .apply("inventory_status in (1,2)") + .apply("inventory_status in (1,3)") ); if (ObjectUtils.isNull(one)) { log.info("自提库存品数据为空!!"); @@ -2767,13 +2767,13 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { DistributionReservationEntity reservationEntity = new DistributionReservationEntity(); boolean fa = false; if (distributionStockupEntity.getStockupStatus().equals(StockupStatusConstant.beihuozhong.getValue())) { + distributionStockup.setId(stockupDTO.getStockupId()); if (i > 0) { // 有数量 fa = true; } else if (i == 0) { //修改完成状态 //修改备货状态 - distributionStockup.setId(stockupDTO.getStockupId()); distributionStockup.setStockupStatus(StockupStatusConstant.yibeihuo.getValue()); reservationEntity.setId(stockupDTO.getReservationId());