From e595e12fa1ec230ec866dadbe13779765ae6d075 Mon Sep 17 00:00:00 2001 From: chenrui <1187576398@qq.com> Date: 星期一, 09 六月 2025 17:24:10 +0800 Subject: [PATCH] 开票台账删除 --- src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java | 7 +++ src/main/resources/mapper/sales/ReceiptPaymentMapper.xml | 10 +++++ src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 27 +++++++++++-- src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java | 15 +++++++ src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java | 7 +++ 5 files changed, 61 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java index f3ddc45..abf43f9 100644 --- a/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java +++ b/src/main/java/com/ruoyi/sales/controller/InvoiceLedgerController.java @@ -173,4 +173,19 @@ return AjaxResult.success(invoiceLedgerService.invoiceLedgerProductDetail(id)); } + /** + * 寮�绁ㄥ彴璐﹀垹闄� + * @param invoiceRegistrationProductId + * @return + */ + @DeleteMapping("delInvoiceLedger/{invoiceRegistrationProductId}") + public AjaxResult delInvoiceLedger(@PathVariable Integer invoiceRegistrationProductId) { + try { + invoiceLedgerService.delInvoiceLedger(invoiceRegistrationProductId); + return AjaxResult.success(); + }catch (Exception e) { + return AjaxResult.error(e.getMessage()); + } + } + } diff --git a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java index 696de82..ad71e5c 100644 --- a/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java +++ b/src/main/java/com/ruoyi/sales/mapper/ReceiptPaymentMapper.java @@ -62,4 +62,11 @@ * 鏌ヨ鍥炴璁板綍涓嶅垎椤� */ List<ReceiptPaymentDto> receiptPaymentHistoryListNoPage( @Param("params") ReceiptPaymentDto receiptPaymentDto); + + /** + * 閫氳繃寮�绁ㄧ櫥璁颁骇鍝乮d鏌ヨ鏄惁宸茬粡鏈夊洖娆捐褰� + * @param invoiceRegistrationProductId + * @return + */ + List<ReceiptPayment> receiptPaymentListByProdRegId(Integer invoiceRegistrationProductId); } diff --git a/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java b/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java index fc64488..ae71649 100644 --- a/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java +++ b/src/main/java/com/ruoyi/sales/service/InvoiceLedgerService.java @@ -104,4 +104,11 @@ * @return */ InvoiceRegistrationProductDto invoiceLedgerProductDetail(Integer id); + + /** + * 寮�绁ㄥ彴璐﹀垹闄� + * @param invoiceRegistrationProductId + * @return + */ + void delInvoiceLedger(Integer invoiceRegistrationProductId); } diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java index 9ce10fb..0d6cf08 100644 --- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java +++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java @@ -10,12 +10,10 @@ import com.ruoyi.sales.dto.InvoiceLedgerDto; import com.ruoyi.sales.dto.InvoiceRegistrationProductDto; import com.ruoyi.sales.excel.InvoiceLedgerExcelDto; -import com.ruoyi.sales.mapper.InvoiceLedgerFileMapper; -import com.ruoyi.sales.mapper.InvoiceLedgerMapper; -import com.ruoyi.sales.mapper.InvoiceRegistrationMapper; -import com.ruoyi.sales.mapper.InvoiceRegistrationProductMapper; +import com.ruoyi.sales.mapper.*; import com.ruoyi.sales.pojo.InvoiceLedger; import com.ruoyi.sales.pojo.InvoiceLedgerFile; +import com.ruoyi.sales.pojo.ReceiptPayment; import com.ruoyi.sales.service.InvoiceLedgerService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.BeanUtils; @@ -52,7 +50,7 @@ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper; @Autowired - private InvoiceRegistrationMapper invoiceRegistrationMapper; + private ReceiptPaymentMapper receiptPaymentMapper; /** * 寮�绁ㄥ彴璐︽柊澧� @@ -307,4 +305,23 @@ return invoiceRegistrationProductDto; } + /** + * 寮�绁ㄥ彴璐﹀垹闄� + * @param invoiceRegistrationProductId + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void delInvoiceLedger(Integer invoiceRegistrationProductId) { + // 鍒ゆ柇鏄惁鏈夊洖娆捐褰� + List<ReceiptPayment> receiptPaymentList = receiptPaymentMapper.receiptPaymentListByProdRegId(invoiceRegistrationProductId); + if(!CollectionUtils.isEmpty(receiptPaymentList)){ + throw new RuntimeException("璇峰厛鍒犻櫎鍥炴璁板綍"); + } + // 鍒犻櫎寮�绁ㄥ彴璐� + + // 鍒犻櫎寮�绁ㄧ櫥璁� + // 鍥炴粴宸插紑绁ㄦ暟閲� + } + } diff --git a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml index 06c3f4e..3e288af 100644 --- a/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml +++ b/src/main/resources/mapper/sales/ReceiptPaymentMapper.xml @@ -255,4 +255,14 @@ ORDER BY T1.receipt_payment_date DESC </select> + <select id="receiptPaymentListByProdRegId" resultType="com.ruoyi.sales.pojo.ReceiptPayment"> + SELECT + T1.* + FROM + receipt_payment T1 + LEFT JOIN invoice_ledger T2 ON T1.invoice_ledger_id = T2.id + WHERE + T2.invoice_registration_product_id = #{invoiceRegistrationProductId} + </select> + </mapper> \ No newline at end of file -- Gitblit v1.9.3