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 4f7b72b20..540ccb558 100644 --- a/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java +++ b/src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java @@ -154,12 +154,24 @@ public class ThrInvOrderController { return ResultVOUtils.error(500, "刷新失败!"); } + /** + * 收费出入库明细 + * + * @param filterDownloadInvOrderRequest + * @return + */ @PostMapping("/udiwms/thrsys/downloadInvOrder") public BaseResponse downloadInvOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { thrInvOrderService.downloadInvSfOrderFilter(filterDownloadInvOrderRequest); return ResultVOUtils.success(); } + /** + * 高耗出入库明细 + * + * @param filterDownloadInvOrderRequest + * @return + */ @PostMapping("/udiwms/thrsys/downloadInvGhOrder") public BaseResponse downloadInvGhOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { thrInvOrderService.downloadInvGhOrderFilter(filterDownloadInvOrderRequest); @@ -167,6 +179,12 @@ public class ThrInvOrderController { return ResultVOUtils.success(); } + /** + * 普耗出入库明细 + * + * @param filterDownloadInvOrderRequest + * @return + */ @PostMapping("/udiwms/thrsys/downloadInvPhOrder") public BaseResponse downloadInvPhOrder(@RequestBody @Valid FilterDownloadInvOrderRequest filterDownloadInvOrderRequest) { thrInvOrderService.downloadInvPhOrderFilter(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 87a97bc4a..150c4de9f 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 @@ -687,7 +687,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00")); filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59")); - handleExternalThrInvSfOrder(filterInvProductRequest); + handleExternalThrInvGhOrder(filterInvProductRequest); log.info("手动抓取第三方高耗出入库明细生成单据定时任务结束"); } @@ -698,7 +698,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService { filterInvProductRequest.setThirdSys(filterDownloadInvOrderRequest.getThirdSysFk()); filterInvProductRequest.setStartDate(stringToDate(filterDownloadInvOrderRequest.getStartDate() + " 00:00:00")); filterInvProductRequest.setEndDate(stringToDate(filterDownloadInvOrderRequest.getEndDate() + " 23:59:59")); - handleExternalThrInvSfOrder(filterInvProductRequest); + handleExternalThrInvPhOrder(filterInvProductRequest); log.info("手动抓取第三方普耗出入库明细生成单据定时任务结束"); }