From 0ae24b9088f0df9fed3221bedd76a7d889a8de71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B7=AF=E6=98=8E=E6=85=A7?= <1191093413@qq.com> Date: Thu, 25 Jan 2024 10:33:48 +0800 Subject: [PATCH] =?UTF-8?q?1.=E6=9F=A5=E9=AA=8C=E6=8F=90=E4=BA=A4=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E5=8C=BA=E5=9D=97=E9=93=BE=E5=8F=91=E7=A5=A8=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BD=8D16=202.=E9=A1=B5=E9=9D=A2=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=B1=BB=E5=9E=8B=E5=8C=BA=E5=9D=97=E9=93=BE?= =?UTF-8?q?=E5=8F=91=E7=A5=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/dxhy/core/util/InvoiceTypeUtils.java | 3 +++ .../dxhy/erp/service/SNPushCheckRecordService.java | 12 ++++-------- .../service/impl/SignSaveInvoiceInfoServiceImpl.java | 3 +++ .../java/com/dxhy/extend/util/InvoiceTypeUtils.java | 3 +++ 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceTypeUtils.java b/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceTypeUtils.java index 5efc552b..3afe6a3d 100644 --- a/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceTypeUtils.java +++ b/dxhy-core/src/main/java/com/dxhy/core/util/InvoiceTypeUtils.java @@ -111,6 +111,9 @@ public class InvoiceTypeUtils { case "186": invoiceName = "全电纸质发票（增值税普通发票）"; break; + case "16": + invoiceName = "区块链发票"; + break; // case "85": // invoiceName = "可报销其他发票"; // break; diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java index 3440da15..fcd19041 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/SNPushCheckRecordService.java @@ -763,6 +763,9 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { if (checkInvoiceResult != null && !checkInvoiceResult.containsKey("code") && !checkInvoiceResult.containsKey("cyjg")) { checkInvoiceResult.put("invoiceNo", checkInvoiceResult.getString("invoiceNumber")); + if ("3".equals(invoice.getCheckStatus())){ + checkInvoiceResult.put("checkStatus","3"); + } log.info("补充查验的结果为:{}", checkInvoiceResult); signSaveInvoiceInfoService.saveQueryInvoiceResult(checkInvoiceResult, "", "1", "business"); } else if (invoice != null && "3".equals(invoice.getCheckStatus())) { @@ -804,6 +807,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { if (invoice != null){ + invoiceInfo.setInvoiceType("16"); invoiceInfo.setInvoiceCode(invoice.getInvoiceCode()); invoiceInfo.setInvoiceNo(invoice.getInvoiceNumber()); invoiceInfo.setGfTaxNo(invoice.getPurchaserTaxNo()); @@ -864,14 +868,6 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter { invoiceInfo.setInvoiceDate(invoiceDate); } - if (StringUtils.isNotBlank(invoice.getInvoiceType())){ - String fplxDm = SNFplxEnum.getFplxDm(invoice.getInvoiceType()); - if (StringUtils.isNotBlank(fplxDm)){ - invoiceInfo.setInvoiceType(fplxDm); - } - } - - if (invoice.getInvoiceLineList() != null && invoice.getInvoiceLineList().size() > 0){ invoiceInfo.setDetailYesorno("1"); } diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java index 0bd85f44..a2212cc2 100644 --- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java +++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/SignSaveInvoiceInfoServiceImpl.java @@ -550,6 +550,9 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl