From fa3ef763afcdcb5d2e110bb2b89ec037de1e3cf8 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Fri, 2 Jun 2023 10:50:23 +0800
Subject: [PATCH] =?UTF-8?q?Merge=20branch=20'test'=20of=20D:\=E6=A1=8C?=
 =?UTF-8?q?=E9=9D=A2\=E5=B1=B1=E8=83=BD\pt=20with=20conflicts.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/erp/controller/SDNYMainProcessController.java   | 5 +++++
 .../java/com/dxhy/erp/service/SNPushCheckRecordService.java  | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

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 d3a54b26..7923e143 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
@@ -263,6 +263,8 @@ public class SDNYMainProcessController extends AbstractController {
             log.info("查验结果为:{}", checkInvoiceResult);
             } catch (Exception e) {
                 e.printStackTrace();
+                log.error("查验失败，errormsg:{}",e.getMessage());
+                return ResponseEntity.ok(JSONObject.toJSONString(R.error("查验失败，"+e.getMessage())));
             }
 
             if (!checkInvoiceResult.containsKey("code")) {
@@ -452,6 +454,9 @@ public class SDNYMainProcessController extends AbstractController {
         for (int i = 0; i < detailList.size(); i++) {
             String taxRateDetail = "";
             JSONObject detail = (JSONObject) detailList.get(i);
+            if(StringUtils.isNotEmpty(detail.getString("goodsName")) && detail.getString("goodsName").contains("详见销货清单")){
+                continue;
+            }
             Map<String, String> snDetailMap = new HashMap<String, String>();
             snDetailMap.put("rowNo", i + 1 + "");
             snDetailMap.put("commodityCode", detail.getString("goodsNum"));
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 3f963953..46d5a178 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
@@ -451,7 +451,8 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
                 jsonObject.put("tonnage", invoiceData.get("dw"));
                 jsonObject.put("limitPeople", invoiceData.get("xcrs"));
                 String taxRate = "";
-                if ("免税".equals(invoiceData.get("sl"))) {
+                if (invoiceData.get("sl")==null||StringUtils.isBlank(invoiceData.get("sl").toString())||
+                        "免税".equals(invoiceData.get("sl").toString())|| "不征税".equals(invoiceData.get("sl").toString()) || "***".equals(invoiceData.get("sl").toString())) {
                     taxRate = "0";
                     jsonObject.put("taxRate", taxRate);
                 } else {
@@ -726,6 +727,7 @@ public class SNPushCheckRecordService extends AbstractServiceAdapter {
             reimburse.setTaxRate("0%");
             reimburse.setTaxCode(getTaxCode(reimburse.getTaxRate()));
         }
+
         reimburse.setIsDeduction(invoice.getIsDeductible());
 
         if (StringUtils.isNoneBlank(reimburse.getInvoiceCode())) {