From 6492800e72b7788c535d528cd73f8d69ae0a06e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Thu, 12 Dec 2024 17:34:18 +0800 Subject: [PATCH] =?UTF-8?q?[feat]=20=E9=87=87=E8=B4=AD=E7=AE=A1=E7=90=86?= =?UTF-8?q?=20=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=AE=A1=E6=89=B9=E5=AE=8C?= =?UTF-8?q?=E6=88=90controller=E6=8E=A5=E5=8F=A3=EF=BC=8C=E5=AE=A1?= =?UTF-8?q?=E6=89=B9=E9=80=9A=E8=BF=87=E5=90=8E=E8=B0=83=E7=94=A8=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=BA=94=E4=BB=98=E8=B4=A6=E6=AC=BE=EF=BC=9B=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E6=B5=81=E7=A8=8Bservice=E6=96=B9=E6=B3=95=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=8D=B3=E9=80=9A=E8=BF=87=E5=90=8E=E8=B0=83?= =?UTF-8?q?=E7=94=A8=E7=94=9F=E6=88=90=E5=BA=94=E4=BB=98=E8=B4=A6=E6=AC=BE?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/purchase/controller/PurchaseOrderController.java | 7 ++++++- .../purchase/service/impl/PurchaseOrderServiceImpl.java | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java index 213a1145..8376e2f2 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/controller/PurchaseOrderController.java +++ b/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)){ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java index 869054f1..147b49a4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/purchase/service/impl/PurchaseOrderServiceImpl.java +++ b/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;