From ff0a50c19d7f178160aa824349e95a14b94d36dd Mon Sep 17 00:00:00 2001 From: linfso Date: Wed, 18 Sep 2024 09:53:34 +0800 Subject: [PATCH] md --- .../EmisSettleInvoiceRecordServiceImpl.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) 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 baa3bbc14..354bb74a3 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 @@ -20,6 +20,7 @@ import com.xdadan.erp.emis.domain.enumtype.EmisBizErrorType; import com.xdadan.erp.emis.domain.exception.EmisBizError; import com.xdadan.erp.emis.mapper.EmisSettleBillMapper; import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRelMapper; +import com.xdadan.erp.emis.mapper.EmisSettleSubBillMapper; import com.xdadan.erp.emis.service.EmisBaseService; import com.xdadan.erp.emis.utils.WaybillHelper; import lombok.extern.slf4j.Slf4j; @@ -50,6 +51,9 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen @Autowired private EmisSettleBillMapper emisSettleBillMapper; + @Autowired + private EmisSettleSubBillMapper emisSettleSubBillMapper; + @Autowired private EmisSettleInvoiceRelMapper emisSettleInvoiceRelMapper; @@ -116,6 +120,19 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen WaybillHelper.formatQueryValue(emisSettleInvoiceRecord.getSettleBillNo()) ); + List listRelCheck=emisSettleInvoiceRecord.getInvoiceRelList(); + if(!CollectionUtils.isEmpty(listRelCheck)){ + // 查询单号如果有未确认的单号，则不允许提交申请 + for (EmisSettleInvoiceRel invoiceRel:listRelCheck + ) { + + EmisSettleSubBill subBill = emisSettleSubBillMapper.selectSettleSubBillBySubBillNo(invoiceRel.getBillNo()); + if(!"1".equals(subBill.getBlConfirmSite())){ + throw new EmisBizError(EmisBizErrorType.FAIL,"运单号:"+subBill.getBillNo()+" 出账未确认或确认不出账，不允许开票"); + } + } + } + // 记录开票运单号 List listRel=emisSettleInvoiceRecord.getInvoiceRelList(); if(!CollectionUtils.isEmpty(listRel)){