diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java index c4196d79..c15199ab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/IBaseRequisitioningOrderService.java @@ -2,6 +2,10 @@ package com.ruoyi.system.service; import java.util.List; import com.ruoyi.system.domain.BaseRequisitioningOrder; +import com.ruoyi.system.domain.SysSalesOrder; +import com.ruoyi.system.domain.Vo.BaseRequisitioningOrderVo; +import org.activiti.engine.runtime.ProcessInstance; +import org.springframework.transaction.annotation.Transactional; /** * 请购单Service接口 @@ -17,15 +21,16 @@ public interface IBaseRequisitioningOrderService * @param requisitioningId 请购单ID * @return 请购单 */ - public BaseRequisitioningOrder selectBaseRequisitioningOrderById(Long requisitioningId); + public BaseRequisitioningOrderVo selectBaseRequisitioningOrderById(Long requisitioningId); /** * 查询请购单列表 - * - * @param baseRequisitioningOrder 请购单 + * + * @param baseRequisitioningOrderVo 请购单 * @return 请购单集合 */ - public List selectBaseRequisitioningOrderList(BaseRequisitioningOrder baseRequisitioningOrder); + + List selectBaseRequisitioningOrderList(BaseRequisitioningOrderVo baseRequisitioningOrderVo); /** * 新增请购单 @@ -79,4 +84,15 @@ public interface IBaseRequisitioningOrderService List selectBaseRequisitioningOrderByIds(String ids); Object getId(); + + @Transactional(rollbackFor = Exception.class) + ProcessInstance cancelSysCustomerById(Long id); + /** + * 恢复申请 */ + @Transactional(rollbackFor = Exception.class) + ProcessInstance restoreSysCustomerById(Long id); + /** + * 提交申请*/ + + public ProcessInstance submitApply(BaseRequisitioningOrder baseRequisitioningOrder); }