diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java index 7e820c9fe..0c6e79d0d 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupInfoServiceImpl.java @@ -108,6 +108,7 @@ public class DistributionStockupInfoServiceImpl extends BaseServiceImpl stockupInfoEntityList = this.list(Wrappers.query().lambda() - .eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId()) - .ne(DistributionStockupInfoEntity::getStockStatus, "4") - ); - if (Func.isNotEmpty(stockupInfoEntityList)){ - DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity(); - distributionStockupEntity.setId(distributionStockupInfoEntity.getStockupId()); - boolean flag = stockupInfoEntityList.stream().allMatch(f -> "3".equals(f.getStockStatus())); - if (flag){ - distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue()); - }else { - //查询是否存在完结 - boolean anyMatch = stockupInfoEntityList.stream().anyMatch(f -> "3".equals(f.getStockStatus())); - if (anyMatch){ - distributionStockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue()); - }else { - distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue()); - } - } - distributionStockupService.updateById(distributionStockupEntity); - } }else { //查询备货任务错误的原因 log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId); } break; + case 2: + List billLadingentityList = this.list(Wrappers.query().lambda() + .eq(DistributionStockupInfoEntity::getReservationId, reservationId) + .eq(DistributionStockupInfoEntity::getStockUpType, 3) + .ne(DistributionStockupInfoEntity::getStockStatus, "4") + ); + if (billLadingentityList.size() == 1){ + distributionStockupInfoEntity = billLadingentityList.get(0); + //可进行备货任务的完结标识 + distributionStockupInfoEntity.setStockStatus("3"); + this.updateById(distributionStockupInfoEntity); + }else { + log.error(method+"预约单关联备货任务错误reservationId:{}",reservationId); + } + break; + default: + List stockupInfoEntityList = this.list(Wrappers.query().lambda() + .eq(DistributionStockupInfoEntity::getStockupId, distributionStockupInfoEntity.getStockupId()) + .ne(DistributionStockupInfoEntity::getStockStatus, "4") + ); + if (Func.isNotEmpty(stockupInfoEntityList)){ + DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity(); + distributionStockupEntity.setId(distributionStockupInfoEntity.getStockupId()); + boolean flag = stockupInfoEntityList.stream().allMatch(f -> "3".equals(f.getStockStatus())); + if (flag){ + distributionStockupEntity.setStockupStatus(StockupStatusConstant.yibeihuo.getValue()); + }else { + //查询是否存在完结 + boolean anyMatch = stockupInfoEntityList.stream().anyMatch(f -> "3".equals(f.getStockStatus())); + if (anyMatch){ + distributionStockupEntity.setStockupStatus(StockupStatusConstant.beihuozhong.getValue()); + }else { + distributionStockupEntity.setStockupStatus(StockupStatusConstant.daibeihuo.getValue()); + } + } + distributionStockupService.updateById(distributionStockupEntity); + } + break; } }