This commit is contained in:
linfso 2024-09-18 09:53:34 +08:00
parent 0216a903f7
commit ff0a50c19d

View File

@ -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.domain.exception.EmisBizError;
import com.xdadan.erp.emis.mapper.EmisSettleBillMapper; import com.xdadan.erp.emis.mapper.EmisSettleBillMapper;
import com.xdadan.erp.emis.mapper.EmisSettleInvoiceRelMapper; 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.service.EmisBaseService;
import com.xdadan.erp.emis.utils.WaybillHelper; import com.xdadan.erp.emis.utils.WaybillHelper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -50,6 +51,9 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
@Autowired @Autowired
private EmisSettleBillMapper emisSettleBillMapper; private EmisSettleBillMapper emisSettleBillMapper;
@Autowired
private EmisSettleSubBillMapper emisSettleSubBillMapper;
@Autowired @Autowired
private EmisSettleInvoiceRelMapper emisSettleInvoiceRelMapper; private EmisSettleInvoiceRelMapper emisSettleInvoiceRelMapper;
@ -116,6 +120,19 @@ public class EmisSettleInvoiceRecordServiceImpl extends EmisBaseService implemen
WaybillHelper.formatQueryValue(emisSettleInvoiceRecord.getSettleBillNo()) WaybillHelper.formatQueryValue(emisSettleInvoiceRecord.getSettleBillNo())
); );
List<EmisSettleInvoiceRel> 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<EmisSettleInvoiceRel> listRel=emisSettleInvoiceRecord.getInvoiceRelList(); List<EmisSettleInvoiceRel> listRel=emisSettleInvoiceRecord.getInvoiceRelList();
if(!CollectionUtils.isEmpty(listRel)){ if(!CollectionUtils.isEmpty(listRel)){