From 026ee0026dca35929cf88763d721052e15aa0779 Mon Sep 17 00:00:00 2001 From: linfso Date: Tue, 8 Oct 2024 06:26:31 +0800 Subject: [PATCH] md --- .../service/impl/EmisSettleInvoiceRecordServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 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 6e62036c8..22225ef45 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 @@ -108,7 +108,6 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen @Transactional @Override public int insertEmisSettleInvoiceRecord(EmisSettleInvoiceRecord emisSettleInvoiceRecord) throws EmisBizError { - // 判断对应账单是否存在 // id流水号 String applySeqNo= WaybillHelper.genApplySeqNo(); @@ -126,13 +125,13 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen List listRelCheck=emisSettleInvoiceRecord.getInvoiceRelList(); if(!CollectionUtils.isEmpty(listRelCheck)){ - // 查询单号如果有未确认的单号，则不允许提交申请 + //bug 1151:业务开票申请：业务提交开票申请时，需要判断当前账单中是否存在运单号出现在业务出账确认和月结现金出账确认未确认或不出账状态， + // 如果存在则不允许提交申请 并且弹窗提示（具体单号+出账未确认/确认不出账） for (EmisSettleInvoiceRel invoiceRel:listRelCheck ) { - EmisSettleSubBill subBill = emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(invoiceRel.getBillNo()); if(!"1".equals(subBill.getBlConfirmSite())){ - throw new EmisBizError(EmisBizErrorType.FAIL,"运单号:"+subBill.getBillNo()+" 业务出账未确认或确认不出账，不允许开票"); + throw new EmisBizError(EmisBizErrorType.FAIL,"运单号:"+subBill.getBillNo()+" 业务出账未确认/确认不出账，不允许开票"); } } }