Browse Source

欠款出库增加加签、转办

master
fanzongzhe 2 years ago
parent
commit
1e3aaf3fd2
  1. 7
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeign.java
  2. 5
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyFeignFallback.java
  3. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyRest.java
  4. 12
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  5. 2
      anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java
  6. 8
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeign.java
  7. 5
      anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/AppBusDeliveredApplyFeignFallback.java
  8. 5
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyRest.java
  9. 11
      anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/retrieval/AppBusDeliveredApplyService.java

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

5
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;

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

12
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

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

2
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"),

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

5
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;

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

11
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;
@ -907,6 +908,14 @@ public class AppBusDeliveredApplyService {
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);
}
}
Loading…
Cancel
Save