Browse Source

[feat]

采购管理 采购订单
修改采购订单审批完成controller接口,审批通过后调用生成应付账款;
修改采购订单启动流程service方法,提交即通过后调用生成应付账款;
dev
王晓迪 2 months ago
parent
commit
6492800e72
  1. 7
      ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java
  2. 5
      ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java

7
ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java

@ -12,6 +12,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.financial.service.IFinancialAccountsPayableService;
import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.purchase.domain.*;
import com.ruoyi.purchase.domain.Vo.*;
@ -78,6 +79,9 @@ public class PurchaseOrderController extends BaseController
@Autowired
private IProcessService processService;
@Autowired
private IFinancialAccountsPayableService payableService;
@RequiresPermissions("purchase:purchaseOrder:view")
@GetMapping()
public String purchaseOrder()
@ -296,7 +300,8 @@ public class PurchaseOrderController extends BaseController
if("submit".equals(instanceType)){
// 使用状态-是
purchaseOrderVo.setUseStatus("1");
//purchaseOrderService.addPurchaseOrderPayable(purchaseOrderVo);
PurchaseOrder purchaseOrder = purchaseOrderService.selectPurchaseOrderById(purchaseOrderVo.getPurchaseOrderId());
payableService.createFinancialAccountsPayable(purchaseOrder);
}
// 作废
else if("cancel".equals(instanceType)){

5
ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java

@ -27,6 +27,7 @@ import com.ruoyi.erp.domain.ErpDevelopModifyorder;
import com.ruoyi.erp.mapper.ErpDevelopModifyorderMapper;
import com.ruoyi.financial.domain.FinancialAccountsPayable;
import com.ruoyi.financial.mapper.FinancialAccountsPayableMapper;
import com.ruoyi.financial.service.IFinancialAccountsPayableService;
import com.ruoyi.process.general.service.IProcessService;
import com.ruoyi.process.todoitem.mapper.BizTodoItemMapper;
import com.ruoyi.purchase.domain.*;
@ -160,6 +161,9 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
@Autowired
private WarehouseInventoryInquiryMapper inventoryInquiryMapper;
@Autowired
private IFinancialAccountsPayableService payableService;
/**
* 查询采购订单
@ -1021,6 +1025,7 @@ public class PurchaseOrderServiceImpl implements IPurchaseOrderService
purchaseOrder.setAuditStatus("1");
// 使用状态-是
purchaseOrder.setUseStatus("1");
payableService.createFinancialAccountsPayable(purchaseOrder);
}
purchaseOrderMapper.updatePurchaseOrder(purchaseOrder);
return processInstance;

Loading…
Cancel
Save