diff --git a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java index d7fa628ea..4f7b72b20 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java @@ -5,10 +5,7 @@ import com.glxp.api.annotation.AuthRuleAnnotation; import com.glxp.api.common.enums.ResultEnum; import com.glxp.api.common.res.BaseResponse; import com.glxp.api.common.util.ResultVOUtils; -import com.glxp.api.entity.thrsys.ThrInvOrder; -import com.glxp.api.entity.thrsys.ThrInvOrderDetail; -import com.glxp.api.entity.thrsys.ThrOrderDetailEntity; -import com.glxp.api.entity.thrsys.ThrOrderEntity; +import com.glxp.api.entity.thrsys.*; import com.glxp.api.req.system.DeleteRequest; import com.glxp.api.req.thrsys.*; import com.glxp.api.res.PageSimpleResponse; @@ -156,4 +153,23 @@ public class ThrInvOrderController { } return ResultVOUtils.error(500, "刷新失败!"); } + + @PostMapping("/udiwms/thrsys/downloadInvOrder") + public BaseResponse downloadInvOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { + thrInvOrderService.downloadInvSfOrderFilter(filterDownloadInvOrderRequest); + return ResultVOUtils.success(); + } + + @PostMapping("/udiwms/thrsys/downloadInvGhOrder") + public BaseResponse downloadInvGhOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { + thrInvOrderService.downloadInvGhOrderFilter(filterDownloadInvOrderRequest); + + return ResultVOUtils.success(); + } + + @PostMapping("/udiwms/thrsys/downloadInvPhOrder") + public BaseResponse downloadInvPhOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { + thrInvOrderService.downloadInvPhOrderFilter(filterDownloadInvOrderRequest); + return ResultVOUtils.success(); + } } diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterDownloadInvOrderRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterDownloadInvOrderRequest.java new file mode 100644 index 000000000..4f12728dd --- /dev/null +++ b/src/main/java/com/glxp/api/req/thrsys/FilterDownloadInvOrderRequest.java @@ -0,0 +1,25 @@ +package com.glxp.api.req.thrsys; + +import lombok.Data; + +import javax.validation.constraints.NotEmpty; + +@Data +public class FilterDownloadInvOrderRequest { + + /** + * 开始日期 + */ + @NotEmpty(message = "起始日期不要可为空") + private String startDate; //起始日期 + /** + * 结束日期 + */ + @NotEmpty(message = "结束日期不要可为空") + private String endDate; //结束日期 + /** + * 外部系统 + */ + @NotEmpty(message = "外部系统不要可为空") + private String thirdSysFk; +} diff --git a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java index b28384db7..3bba27260 100644 --- a/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java +++ b/src/main/java/com/glxp/api/service/thrsys/ThrInvOrderService.java @@ -3,6 +3,7 @@ package com.glxp.api.service.thrsys; import com.glxp.api.entity.thrsys.ThrInvOrder; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.req.inv.FilterInvProductRequest; +import com.glxp.api.req.thrsys.FilterDownloadInvOrderRequest; import com.glxp.api.req.thrsys.FilterThrInvOrderRequest; import com.glxp.api.req.thrsys.GenerateOrderRequest; import com.glxp.api.req.thrsys.RefreshOrderRequest; @@ -64,4 +65,9 @@ public interface ThrInvOrderService { */ boolean refreshGhOrder(RefreshOrderRequest refreshOrderRequest); + void downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest); + + void downloadInvGhOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest); + + void downloadInvPhOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest); } diff --git a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java index dd4c22d42..73632d48e 100644 --- a/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java +++ b/src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java @@ -27,6 +27,7 @@ import com.glxp.api.entity.thrsys.ThrOrderEntity; import com.glxp.api.entity.thrsys.ThrSystemDetailEntity; import com.glxp.api.http.ErpInvClient; import com.glxp.api.req.inv.FilterInvProductRequest; +import com.glxp.api.req.thrsys.FilterDownloadInvOrderRequest; import com.glxp.api.req.thrsys.FilterThrInvOrderRequest; import com.glxp.api.req.thrsys.GenerateOrderRequest; import com.glxp.api.req.thrsys.RefreshOrderRequest; @@ -668,6 +669,33 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { return true; } + @Override + public void downloadInvSfOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { + log.info("手动抓取第三方收费出入库明细生成单据定时任务开始"); + FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); + BeanUtils.copyProperties(filterDownloadInvOrderRequest,filterInvProductRequest); + handleExternalThrInvSfOrder(filterInvProductRequest); + log.info("手动抓取第三方收费出入库明细生成单据定时任务结束"); + } + + @Override + public void downloadInvGhOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { + log.info("手动抓取第三方高耗出入库明细生成单据定时任务开始"); + FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); + BeanUtils.copyProperties(filterDownloadInvOrderRequest,filterInvProductRequest); + handleExternalThrInvGhOrder(filterInvProductRequest); + log.info("手动抓取第三方高耗出入库明细生成单据定时任务结束"); + } + + @Override + public void downloadInvPhOrderFilter(FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { + log.info("手动抓取第三方普耗出入库明细生成单据定时任务开始"); + FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest(); + BeanUtils.copyProperties(filterDownloadInvOrderRequest,filterInvProductRequest); + handleExternalThrInvPhOrder(filterInvProductRequest); + log.info("手动抓取第三方普耗出入库明细生成单据定时任务结束"); + } + /** * 校验relId字段有空返回false *