Merge remote-tracking branch 'origin/release' into release

dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoiceAuthServiceImpl.java

@@ -411,6 +411,7 @@ public class InvoiceAuthServiceImpl extends MpBaseServiceImpl<RecordInvoiceDao,
                 DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
                 tDxInvoiceReimburseService.getBaseMapper().update(null,updateWrapper);
             }
+            DynamicContextHolder.push("business"+DbConstant.BUSINESS_WRITE);
             UpdateWrapper updateWrapper = new UpdateWrapper();
             updateWrapper.set("voucher_no",zdata1.getBELNR());
             updateWrapper.set("document_number",zdata1.getZBZDH());

dxhy-export-domestic/src/main/java/com/dxhy/domestic/service/drawback/impl/DomesticInvoiceDrawbackServiceImpl.java

@@ -282,11 +282,12 @@ public class DomesticInvoiceDrawbackServiceImpl implements DomesticInvoiceDrawba
                 return vo;
             }
             // 与底账库信息对比
+            /*
             if (!dto.getInvoiceNo().equals(vo.getInvoiceNo()) || !dto.getInvoiceCode().equals(vo.getInvoiceCode())) {
                 vo.setAuthenticationFail("发票代码号码与底账库信息不一致");
                 vo.setSelected("0");
                 return vo;
-            }
+            }*/
             if (!dto.getInvoiceDate().equals(vo.getInvoiceDate())) {
                 vo.setAuthenticationFail("开票日期与底账库信息不一致");
                 vo.setSelected("0");