欠款出库增加加签、转办

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);
+
+
 }

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;

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();

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<BusDeliveredApp
                         }
                     } else {
                         //推送开票申请数据
-                       if("1".equals(busDeliveredApply.getPaymentMethodKey())){//贷款的不再推送开票申请
+                        if ("1".equals(busDeliveredApply.getPaymentMethodKey())) {//贷款的不再推送开票申请
                             Future future1 = pool.submit(() -> {
                                 pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
                             });
@@ -1300,7 +1300,7 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                             //根据合同和车辆sid获取欠款开票的信息
                             BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
                             if (busBillApplication != null) {
-                                BusBillVehicle busBillVehicle = busBillVehicleService.selectOnes(busBillApplication.getSid(),busDeliveredApplyDetails.getVinSid());
+                                BusBillVehicle busBillVehicle = busBillVehicleService.selectOnes(busBillApplication.getSid(), busDeliveredApplyDetails.getVinSid());
                                 if ("02".equals(busBillVehicle.getBillTypeKey())) {
                                     if (!data.getSingleFinalPrice().equals(busBillApplication.getOneBillMoney())) {
                                         //若高低开，推送价值客户备案
@@ -3034,9 +3034,9 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     public ResultBean submitAppDeliveredApply(AppSubmitDeliveredApplyDto dto) {
         ResultBean rb = ResultBean.fireFail();
         BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(dto.getContractId());
-        if(busSalesOrder != null){
+        if (busSalesOrder != null) {
-            if("2".equals(busSalesOrder.getPayTypeKey())){
+            if ("2".equals(busSalesOrder.getPayTypeKey())) {
-                if(StringUtils.isBlank(dto.getLoanSid())){
+                if (StringUtils.isBlank(dto.getLoanSid())) {
                     return rb.setMsg("贷款的无贷款人不允许提交");
                 }
             }
@@ -4580,11 +4580,11 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 }
                 //根据合同和车辆sid获取欠款开票的信息
                 BusBillApplication busBillApplication = busBillApplicationService.selectByContractNoAndSid(busDeliveredApply.getContractNo(), busDeliveredApplyDetails.getVinSid());
-                if(busBillApplication != null){
+                if (busBillApplication != null) {
                     appCarListVo.setQkKpSid(busBillApplication.getSid());
                     //根据欠款开票的编号查询
                     FinBillApplication finBillApplication = busBillApplicationService.selectByNo(busBillApplication.getBillNo());
-                    if(finBillApplication != null){
+                    if (finBillApplication != null) {
                         appCarListVo.setQkLpSid(finBillApplication.getSid());
                     }
                 }
@@ -4722,6 +4722,16 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         return rb.success();
     }
 
+    public ResultBean assignTask(DeliveredDelegateQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        FlowDelegateQuery delegateQuery = new
+                FlowDelegateQuery();
+        BeanUtil.copyProperties(query, delegateQuery);
+        flowFeign.assignTask(delegateQuery);
+        return rb.success();
+    }
+
+
     public ResultBean ckxstz(String ckSid) {
         ResultBean rb = ResultBean.fireFail();
         BusDeliveredApply busDeliveredApply = fetchBySid(ckSid);
@@ -4734,4 +4744,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         pushOutApply(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
         return rb.success();
     }
+
+
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -35,7 +35,7 @@ public enum ProcDefEnum {
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
     //    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
     BUSDELIVEREDAPPLY("出库申请", "process_30ixry76:2:5357504"),
-    QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:2:5642504"),
+    QKBUSDELIVEREDAPPLY("欠款出库申请", "process_161otrwo:3:7192504"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.terminal.api.autoservice.retrieval;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoDto;
 import com.yxt.anrui.terminal.api.autoservice.invoiced.BillApplicationIInfoVo;
 import com.yxt.anrui.terminal.api.autoservice.retrieval.flowable.*;
+import com.yxt.anrui.terminal.api.autoservice.saleOrders.flowable.AppOrderDelegateQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -219,9 +220,16 @@ public interface AppBusDeliveredApplyFeign {
     @ResponseBody
     public ResultBean delegate(@RequestBody DeliveredApplyDelegateQuery deliveredApplyDelegateQuery);
 
+    @ApiOperation(value = "欠款出库转办")
+    @PutMapping(value = "/assignTask")
+    @ResponseBody
+    public ResultBean assignTask(@RequestBody DeliveredApplyDelegateQuery deliveredApplyDelegateQuery);
+
+
     @ApiOperation("待补充车辆")
     @GetMapping("/appendRetrievalCarsQk")
     @ResponseBody
     public ResultBean<List<CarListVos2>> appendRetrievalCarsQk(@SpringQueryMap DeliveredDetailssQuery query);
 
+
 }

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<List<CarListVos2>> appendRetrievalCarsQk(DeliveredDetailssQuery query) {
         return null;

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<List<CarListVos2>> appendRetrievalCarsQk(DeliveredDetailssQuery query) {
         return appBusDeliveredApplyService.appendRetrievalCarsQk(query);

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<List<CarListVos2>> appendRetrievalCarsQk(DeliveredDetailssQuery query) {
         ResultBean<List<CarListVos2>> rb = ResultBean.fireFail();
         DeliverDetailsQuery deliverDetailsQuery = new DeliverDetailsQuery();
@@ -923,4 +932,6 @@ public class AppBusDeliveredApplyService {
         PagerVo<DeliveredPageVo> vo = CoverUtils.selectPagerVo(retrievalNotList.getData());
         return rb.success().setData(vo);
     }
+
+
 }