1.查验提交入库区块链发票类型位16 2.页面展示发票类型区块链发票

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;

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");
             }

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

@@ -550,6 +550,9 @@ public class SignSaveInvoiceInfoServiceImpl extends MpBaseServiceImpl<SignRecord
             invoice.setInvoiceCode(invoiceCode);
             invoice.setInvoiceNo(invoiceNo);
         }
+        if ("3".equals(queryInvoiceResult.getString("checkStatus"))){
+            invoice.setInvoiceType("16");
+        }
 
 
         invoice.setUuid(uuid);

dxhy-extend/src/main/java/com/dxhy/extend/util/InvoiceTypeUtils.java

@@ -95,6 +95,9 @@ public class InvoiceTypeUtils {
                 case "32":
                     invoiceName = "电子发票（普通发票）";
                     break;
+                case "16":
+                    invoiceName = "区块链发票";
+                    break;
 //                case "85":
 //                    invoiceName = "可报销其他发票";
 //                    break;