diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java index 79f10270c1..4ff2dd3f49 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java @@ -26,6 +26,7 @@ package com.yxt.anrui.buscenter.api.busdeliveredapply; import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo; +import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -238,4 +239,10 @@ public interface BusDeliveredApplyFeign { @ResponseBody public ResultBean delegate(@RequestBody DeliveredDelegateQuery deliveredDelegateQuery); + @ApiOperation(value = "欠款出库转办") + @PutMapping(value = "/assignTask") + @ResponseBody + public ResultBean assignTask(@RequestBody DeliveredDelegateQuery query); + + } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java index c6dd7e1cbd..19aaf75abb 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java @@ -191,6 +191,11 @@ public class BusDeliveredApplyFeignFallback implements BusDeliveredApplyFeign { return null; } + @Override + public ResultBean assignTask(DeliveredDelegateQuery query) { + return null; + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { return null; diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java index 7ab5478323..ba43969bd7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java @@ -262,6 +262,11 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign { return busDeliveredApplyService.delegate(deliveredDelegateQuery); } + @Override + public ResultBean assignTask(DeliveredDelegateQuery query) { + return busDeliveredApplyService.assignTask(query); + } + @Override public ResultBean complete(BusDeliveredApplyCompleteDto query) { BusinessVariables bv = new BusinessVariables(); diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java index c32dcb9526..b6d4a8ca9a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java @@ -1053,7 +1053,7 @@ public class BusDeliveredApplyService extends MybatisBaseService { pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData()); }); @@ -1300,7 +1300,7 @@ public class BusDeliveredApplyService extends MybatisBaseService> appendRetrievalCarsQk(@SpringQueryMap DeliveredDetailssQuery query); + } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java index 8e9df01111..6cc5cf8bae 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java @@ -207,6 +207,11 @@ public class AppBusDeliveredApplyFeignFallback implements AppBusDeliveredApplyFe return null; } + @Override + public ResultBean assignTask(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) { + return null; + } + @Override public ResultBean> appendRetrievalCarsQk(DeliveredDetailssQuery query) { return null; diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java index 9668a0954a..417984fd20 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java @@ -216,6 +216,11 @@ public class AppBusDeliveredApplyRest implements AppBusDeliveredApplyFeign { return appBusDeliveredApplyService.delegate(deliveredApplyDelegateQuery); } + @Override + public ResultBean assignTask(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) { + return appBusDeliveredApplyService.assignTask(deliveredApplyDelegateQuery); + } + @Override public ResultBean> appendRetrievalCarsQk(DeliveredDetailssQuery query) { return appBusDeliveredApplyService.appendRetrievalCarsQk(query); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java index a8d14f3da0..43df29d3fe 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java @@ -48,6 +48,7 @@ import com.yxt.anrui.buscenter.api.busdeliveredapplydetails.BusDeliveredApplyDet import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderIsDTKPJVo; +import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; @@ -403,7 +404,7 @@ public class AppBusDeliveredApplyService { billApplicationIInfoVo.setIsCanEdit(true); }*/ billApplicationIInfoVo.setIsCanEdit(busSalesOrderIsDTKPJVo.getIsEdit()); - if(!busSalesOrderIsDTKPJVo.getIsEdit()){ + if (!busSalesOrderIsDTKPJVo.getIsEdit()) { billApplicationIInfoVo.setInvoiceMoney(busSalesOrderIsDTKPJVo.getOneBillMoney()); } @@ -902,11 +903,19 @@ public class AppBusDeliveredApplyService { public ResultBean delegate(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) { ResultBean rb = ResultBean.fireFail(); DeliveredDelegateQuery deliveredDelegateQuery = new DeliveredDelegateQuery(); - BeanUtil.copyProperties(deliveredApplyDelegateQuery,deliveredDelegateQuery); + BeanUtil.copyProperties(deliveredApplyDelegateQuery, deliveredDelegateQuery); ResultBean resultBean = busDeliveredApplyFeign.delegate(deliveredDelegateQuery); return resultBean; } + public ResultBean assignTask(DeliveredApplyDelegateQuery deliveredApplyDelegateQuery) { + ResultBean rb = ResultBean.fireFail(); + DeliveredDelegateQuery deliveredDelegateQuery = new DeliveredDelegateQuery(); + BeanUtil.copyProperties(deliveredApplyDelegateQuery, deliveredDelegateQuery); + ResultBean delegate = busDeliveredApplyFeign.assignTask(deliveredDelegateQuery); + return delegate; + } + public ResultBean> appendRetrievalCarsQk(DeliveredDetailssQuery query) { ResultBean> rb = ResultBean.fireFail(); DeliverDetailsQuery deliverDetailsQuery = new DeliverDetailsQuery(); @@ -923,4 +932,6 @@ public class AppBusDeliveredApplyService { PagerVo vo = CoverUtils.selectPagerVo(retrievalNotList.getData()); return rb.success().setData(vo); } + + } \ No newline at end of file