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 a3b21c564..22a98fdf8 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 @@ -95,4 +95,10 @@ public interface IDistributionReservationClient { @GetMapping(TOP+"/getRetentionMa") String getRetentionMa(); + /** + * 维护预约信息 + * @param params + * @return + */ + Boolean maintainReservationInfo(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 c7ee97105..c675f46d2 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 @@ -17,6 +17,7 @@ package com.logpm.distribution.feign; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.logpm.distribution.dto.DistributionCancelReservationPackageDTO; import com.logpm.distribution.entity.DistributionReservationEntity; import com.logpm.distribution.service.IDistributionReservationService; @@ -27,11 +28,13 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import springfox.documentation.annotations.ApiIgnore; import java.util.List; +import java.util.Objects; /** * 预约列表 Feign实现类 @@ -98,5 +101,21 @@ public class DistributionReservationClient implements IDistributionReservationCl return reservationService.retentionMa(); } + @Override + @Transactional + public Boolean maintainReservationInfo(String params) { + DistributionReservationEntity one = reservationService.getOne(Wrappers.query().lambda() + .eq(DistributionReservationEntity::getReservationCode, params) + ); + if (Objects.isNull(one)){ + reservationService.maintenanceReservationInfo(one.getId()); + reservationService.maintenanceReservationInfo(one.getId()); + return true; + } + + + return false; + } + } 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 8206905e8..45abeb46b 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 @@ -318,4 +318,17 @@ public class DistributionDatarepair { } + /** + * 推送自提签收信息至工厂 + * + * @return + */ + @XxlJob("sendFactorySignforInfo") + public ReturnT maintainReservationInfo(String params) { + // 得到当前仓库所有的签收任务 + Boolean b = distributionReservationClient.maintainReservationInfo(params); + return ReturnT.SUCCESS; + } + + }