From 979cc0e40caa02cbe93b580d34fa22c02a51b262 Mon Sep 17 00:00:00 2001
From: yefei <yefei@ele-cloud.com>
Date: Thu, 25 May 2023 19:46:19 +0800
Subject: [PATCH] =?UTF-8?q?ariesy=201.=E4=BF=AE=E5=A4=8D=E6=9F=A5=E9=AA=8C?=
 =?UTF-8?q?=E7=A5=A8=E6=B1=A0=E5=B7=B2=E5=AD=98=E5=9C=A8=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=A8=8E=E7=8E=87=E4=B8=BA=E6=95=B4=E6=95=B0=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E5=80=99=EF=BC=8C=E6=8E=A8=E9=80=81=E5=88=B0sap=E7=9A=84?=
 =?UTF-8?q?=E7=A8=8E=E7=8E=87=E4=B9=9F=E4=B8=BA=E6=95=B4=E6=95=B0=202.?=
 =?UTF-8?q?=E5=AE=A2=E8=BF=90=E6=B1=BD=E8=BD=A6=E7=A5=A8=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E4=B9=98=E8=BD=A6=E4=BA=BA=E5=92=8C=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=8F=B7=E9=83=BD=E6=9C=89=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B?=
 =?UTF-8?q?=E6=89=8D=E5=81=9A=E4=BB=B7=E7=A8=8E=E5=88=86=E7=A6=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SDNYMainProcessController.java | 41 +++++++++++--------
 .../erp/service/SNPushCheckRecordService.java |  6 +++
 2 files changed, 31 insertions(+), 16 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
index abeb45ef..43874a81 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/controller/SDNYMainProcessController.java
@@ -495,22 +495,31 @@ public class SDNYMainProcessController extends AbstractController {
                 if (detail.get("taxRate") != null && StringUtils.isNoneBlank(detail.get("taxRate").toString())) {
                     taxRateDetail = detail.get("taxRate").toString();
                     if (!"0".equals(taxRateDetail)) {
-//                        if (StringUtils.isNoneBlank(taxRateDetail)) {
-//                            int index = taxRateDetail.indexOf("%");
-//                            if (index > 0) {
-//                                taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1);
-//                                Float num = Float.parseFloat(taxRateDetail);
-//                                if (num > 9) {
-//                                    taxRateDetail = "0." + taxRateDetail;
-//                                } else {
-//                                    if (!taxRateDetail.startsWith("0")) {
-//                                        taxRateDetail = "0.0" + taxRateDetail;
-//                                    }
-//                                }
-//                            }
-//                        }
-
-                        taxRateDetail = CheckUtil.formatPercentSl(taxRateDetail);
+                        if (StringUtils.isNoneBlank(taxRateDetail)) {
+                            int index = taxRateDetail.indexOf("%");
+                            if (index > 0) {
+                                taxRateDetail = taxRateDetail.substring(0, taxRateDetail.length() - 1);
+                                Float num = Float.parseFloat(taxRateDetail);
+                                if (num > 9) {
+                                    taxRateDetail = "0." + taxRateDetail;
+                                } else {
+                                    if (!taxRateDetail.startsWith("0")) {
+                                        taxRateDetail = "0.0" + taxRateDetail;
+                                    }
+                                }
+                            }else{
+                                Float num = Float.parseFloat(taxRateDetail);
+                                if (num > 9) {
+                                    taxRateDetail = "0." + taxRateDetail;
+                                } else {
+                                    if (!taxRateDetail.startsWith("0")) {
+                                        taxRateDetail = "0.0" + taxRateDetail;
+                                    }
+                                }
+                            }
+                        }
+
+//                        taxRateDetail = CheckUtil.formatPercentSl(taxRateDetail);
                     }
 
                     if ("11".equals(invoiceType)) {
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 104df6fd..a3123784 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
@@ -616,6 +616,12 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
             InvoiceInfo invoiceInfo = convertToInvoiceInfo(invoice);
             log.info("进行价税分离的发票信息为:{}", invoiceInfo);
 
+            if(SNFplxEnum.KYQCP.getFplxDm().equals(fplxdm)){
+                if(StringUtils.isEmpty(invoice.getRiderName()) || StringUtils.isEmpty(invoice.getIdcardNo())){
+                    return result;
+                }
+            }
+
             ServiceResult<InvoiceInfo> invoiceResult = this.valoremTaxCount(invoiceInfo, "Y");
             InvoiceInfo data = invoiceResult.getData();
             if (data != null) {