From f0b08232eef75fbf8de46e6324cdd4876a78ef04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Sun, 4 Feb 2024 09:35:12 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A5=A8=E6=B1=A0=E6=8E=A8=E9=80=81?= =?UTF-8?q?=EF=BC=9A=E5=85=BC=E5=AE=B9=E5=85=A8=E7=94=B5=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E4=BB=A3=E7=A0=81=E4=B8=BA=E7=A9=BA=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dxhy/erp/service/impl/InvoicePoolServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index d14dc699..c16a2350 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -1945,11 +1945,11 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { public ReturnStateInfo getCheckData(SalesInvoicePushInfos info) { ReturnStateInfo run = new ReturnStateInfo(); - if (StringUtils.isBlank(info.getInvoiceCode())) { - run.setReturnCode(ReturnCodeEnum.FPDMBNWK.getFhzDm()); - run.setReturnMessage(ReturnCodeEnum.FPDMBNWK.getFhzMc(ReturnCodeEnum.FPDMBNWK.getIndex())); - return run; - } +// if (StringUtils.isBlank(info.getInvoiceCode())) { +// run.setReturnCode(ReturnCodeEnum.FPDMBNWK.getFhzDm()); +// run.setReturnMessage(ReturnCodeEnum.FPDMBNWK.getFhzMc(ReturnCodeEnum.FPDMBNWK.getIndex())); +// return run; +// } if (StringUtils.isBlank(info.getInvoiceNo())) { run.setReturnCode(ReturnCodeEnum.FPHMBNWK.getFhzDm()); run.setReturnMessage(ReturnCodeEnum.FPHMBNWK.getFhzMc(ReturnCodeEnum.FPHMBNWK.getIndex())); From 6071b66e4784ccb53613adbaf2af23864468dac7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Tue, 5 Mar 2024 10:35:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=BC=80=E7=A5=A8?= =?UTF-8?q?=E6=8E=A8=E9=80=81=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java index c16a2350..b2073b5c 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/InvoicePoolServiceImpl.java @@ -1945,6 +1945,7 @@ public class InvoicePoolServiceImpl implements InvoicePoolService { public ReturnStateInfo getCheckData(SalesInvoicePushInfos info) { ReturnStateInfo run = new ReturnStateInfo(); + //兼容全电类型，不校验发票代码 // if (StringUtils.isBlank(info.getInvoiceCode())) { // run.setReturnCode(ReturnCodeEnum.FPDMBNWK.getFhzDm()); // run.setReturnMessage(ReturnCodeEnum.FPDMBNWK.getFhzMc(ReturnCodeEnum.FPDMBNWK.getIndex()));