From 992dd09878e83aa812af411f2a9fbac216db1701 Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 15 Nov 2024 13:24:57 +0800 Subject: [PATCH] md --- .../erp/web/emis/EmisSettleBillController.java | 3 +++ .../service/impl/EmisSettleBillServiceImpl.java | 17 +++++++++++------ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java index 1f09ed8e7..083c52c0a 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSettleBillController.java @@ -282,6 +282,9 @@ public class EmisSettleBillController extends BaseController try { emisSettleBillService.addSubBillToSettleBill(emisSettleBill); + + + return AjaxResult.success("操作成功"); }catch (Exception ex){ ex.printStackTrace(); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java index c3c7cd744..821bc97cb 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleBillServiceImpl.java @@ -455,15 +455,20 @@ public class EmisSettleBillServiceImpl extends EmisBaseService implements IEmisS // 部分收款 emisSettleBill.setPaymentStatus("2"); } - - // 如果已开票,则调整为部分开票 - if("1".equals(emisSettleBill.getOpenBillStatus())){ - emisSettleBill.setOpenBillStatus("2"); - } } +// // 如果已开票,则调整为部分开票 +// if("1".equals(emisSettleBill.getOpenBillStatus())){ +// emisSettleBill.setOpenBillStatus("2"); +// } + // 账单总金额 - return emisSettleBillMapper.updateEmisSettleBill(emisSettleBill); + emisSettleBillMapper.updateEmisSettleBill(emisSettleBill); + + // 重新计算开票状态 + reCalcSettleBillInvoiceStatus(old.getSettleBillNo()); + + return 1; }