diff --git a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java index 6148b01fb..e305b927f 100644 --- a/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java +++ b/blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/feign/IDistributionReservationClient.java @@ -70,4 +70,12 @@ public interface IDistributionReservationClient { */ @GetMapping(TOP+"/maintenanceReservationInfo") R maintenanceReservationInfo(@RequestParam("warehouseId") String warehouseId); + + /** + * 维护取消预约信息 + * @param params + */ + @GetMapping(TOP+"/maintenanceCancelReservation") + void maintenanceCancelReservation(String params); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java index 9439a4ec1..405a0fb90 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/feign/DistributionReservationClient.java @@ -69,5 +69,13 @@ public class DistributionReservationClient implements IDistributionReservationCl return reservationService.maintenanceReservationInfoByWarehouseId(warehouseId); } + /** + * @param params + */ + @Override + public void maintenanceCancelReservation(String params) { + reservationService.maintenanceCancelReservation(params); + } + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java index 98488e776..117adfd2e 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java @@ -290,4 +290,10 @@ public interface IDistributionReservationService extends BaseService selectStockupZeroOrderList(Long reservationId); + /** + * 维护取消预约信息 + * @param params + */ + void maintenanceCancelReservation(String params); + } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java index de462c1e8..a3a69f0e1 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionParcelListServiceImpl.java @@ -811,7 +811,7 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl packageIds, Integer qu) { BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); if (Func.isEmpty(myCurrentWarehouse)) { 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 64bd08b9a..fc342bf49 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 @@ -2602,7 +2602,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl 0) { reservationStockarticleEntityList.forEach(rs -> { rs.setStockArticleStatus(ReservationOrderStatusConstant.quxiao.getValue()); - distributionReservationStockarticleService.updateById(rs); +// distributionReservationStockarticleService.updateById(rs); if (rs.getIsZero().equals(IsOrNoConstant.no.getValue())) { //订制品 //需要进行包件的预约状态维护 @@ -2647,6 +2647,8 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl selectStockupZeroOrderList(Long reservationId) { return baseMapper.selectStockupZeroOrderList(reservationId); } + + /** + * @param params + */ + @Override + public void maintenanceCancelReservation(String params) { + LambdaQueryWrapper lambda = Wrappers.query().lambda(); + if (Func.isNotBlank(params)){ + List list = Func.toLongList(params); + lambda.eq(DistributionReservationEntity::getWarehouseId,list); + } + List reservationEntityList = this.list(lambda); + for (DistributionReservationEntity reservationEntity : reservationEntityList) { + this.maintenanceReservationInfo(reservationEntity.getId()); + } + + } } diff --git a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java index 8e65ae0bc..b111d3935 100644 --- a/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java +++ b/blade-service/logpm-patch/src/main/java/com/logpm/patch/jobhandle/DistributionDatarepair.java @@ -124,6 +124,21 @@ public class DistributionDatarepair { } + /** + * 维护指定取消预约信息 + * @return + */ + @XxlJob("maintenanceCancelReservation") + public ReturnT maintenanceCancelReservation(String params) { + //维护配送的状态 + String method = "######################DistributionDatarepair.maintenanceDeliveryStatus"; + log.info(method+"维护配送订单id:{}",params); + distributionReservationClient.maintenanceCancelReservation(params); + log.info(method+"维护配送订单结束"); + return ReturnT.SUCCESS; + } + +