From c8c05762118f98deb7bbdfe57a87e7244c63d090 Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 21 Aug 2024 07:36:49 +0800 Subject: [PATCH] md --- .../emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java | 4 ++++ .../erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java | 2 +- emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java index cf39659d4..ee091d2d1 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettleInvoiceRecordServiceImpl.java @@ -256,7 +256,11 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen throw new EmisBizError(EmisBizErrorType.FAIL,"已驳回！"); } + // 审核不通过 emisSettleInvoiceRecord.setBlAudit("2"); + // 开票失败 + emisSettleInvoiceRecord.setInvoiceStatus("3"); + emisSettleInvoiceRecord.setAuditNote(inputObj.getAuditNote()); emisSettleInvoiceRecord.setAuditManCode(getCurrentUser().getEmpCode()); emisSettleInvoiceRecord.setAuditSiteCode(getCurrentUser().getOwnerSiteCode()); diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java index bb0b69483..8e629cf4b 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisSettlePayRecordServiceImpl.java @@ -132,7 +132,6 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I return 1; } - /** * 重算账单收款金额 * @param settleBillNo @@ -229,6 +228,7 @@ public class EmisSettlePayRecordServiceImpl extends EmisBaseService implements I for (EmisSettleSubBill subBill:listSubBill) { EmisWaybill emisWaybill = new EmisWaybill(); emisWaybill.setBillCode(subBill.getBillCode()); + emisWaybill.setPaymentStatus(newBill.getPaymentStatus()); emisWaybillMapper.updatePayedStatus(emisWaybill); } } diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml index c9e14f144..193aecd6c 100644 --- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml +++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml @@ -2313,7 +2313,7 @@ update emis_waybill - set payment_status='1' + set payment_status=#{paymentStatus} where bill_code=#{billCode}