diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java index bb8e06131..53a556e60 100644 --- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java +++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/business/service/impl/InvoiceServiceImpl.java @@ -74,16 +74,16 @@ public class InvoiceServiceImpl extends ServiceImpl impl shippingInvoiceService.delMain(id); } if(Invoice.getType(invoiceNumber).equalsIgnoreCase(COMPLETE.name())) { - platformOrderContentService.cancelInvoice(invoiceNumber); - platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); - platformOrderService.cancelInvoice(invoiceNumber); - purchaseOrderService.cancelInvoice(invoiceNumber); - shippingInvoiceService.delMain(id); PurchaseOrder purchase = purchaseOrderService.getPurchaseByInvoiceNumberAndClientId(invoiceNumber, clientId); if(purchase.getInventoryDocumentString() != null && !purchase.getInventoryDocumentString().isEmpty()) shippingInvoiceService.deleteAttachmentFile(purchase.getInventoryDocumentString()); if(purchase.getPaymentDocumentString() != null && !purchase.getPaymentDocumentString().isEmpty()) shippingInvoiceService.deleteAttachmentFile(purchase.getPaymentDocumentString()); + platformOrderContentService.cancelInvoice(invoiceNumber); + platformOrderService.removePurchaseInvoiceNumber(invoiceNumber); + platformOrderService.cancelInvoice(invoiceNumber); + purchaseOrderService.cancelInvoice(invoiceNumber); + shippingInvoiceService.delMain(id); } savRefundService.cancelInvoice(invoiceNumber);