From 3570da9d7186097216a0ad711edf9b2e09362040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E7=90=A6?= <sci3197@dingtalk.com>
Date: Tue, 12 Sep 2023 16:15:07 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=80=E9=A1=B9=E5=8F=91=E7=A5=A8=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/erp/enums/TaxRateCodeEnum.java   | 20 +++++++++----------
 .../service/impl/ImageSubmitServiceImpl.java  |  8 +++++---
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/enums/TaxRateCodeEnum.java b/dxhy-erp/src/main/java/com/dxhy/erp/enums/TaxRateCodeEnum.java
index 6f589164..f1030d92 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/enums/TaxRateCodeEnum.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/enums/TaxRateCodeEnum.java
@@ -6,16 +6,16 @@ import com.dxhy.common.vo.Tax;
  * 税率 税码关系表
  */
 public enum TaxRateCodeEnum {
-    X0("0%","X0"),
-    X1("16%","X1"),
-    X2("13%","X2"),
-    X3("10%","X3"),
-    X4("9%","X4"),
-    X5("6%","X5"),
-    X6("5%","X6"),
-    X7("3%","X7"),
-    X8("2%","X8"),
-    X9("1%","X9"),
+    X0("0","X0"),
+    X1("16","X1"),
+    X2("13","X2"),
+    X3("10","X3"),
+    X4("9","X4"),
+    X5("6","X5"),
+    X6("5","X6"),
+    X7("3","X7"),
+    X8("2","X8"),
+    X9("1","X9"),
 
     ;
 
diff --git a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
index 65e9a498..758cb5f4 100644
--- a/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
+++ b/dxhy-erp/src/main/java/com/dxhy/erp/service/impl/ImageSubmitServiceImpl.java
@@ -82,7 +82,6 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
             return R.error(500, "未查询到如下发票，请重新查验，" + errorMsg);
         }
 
-        DynamicContextHolder.push(DbConstant.DETAIL_WRITE);
         QueryWrapper<SdnyTDxRecordInvoiceDetail> detailQueryWrapper = new QueryWrapper<>();
         detailQueryWrapper.in("uuid", uuidList);
         List<SdnyTDxRecordInvoiceDetail> detailList = detailDao.selectList(detailQueryWrapper);
@@ -216,7 +215,7 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
             List<ZData> zDatas=new ArrayList<>();
             for (SdnyTDxRecordInvoiceDetailSales detail : item.getDetailList()) {
                 detail.setTaxRateOfSap(getTaxRate(detail.getTaxRate()));
-                detail.setTaxRate(detail.getTaxRateOfSap().multiply(new BigDecimal(100)).toPlainString()+"%");
+                detail.setTaxRate(detail.getTaxRateOfSap().multiply(new BigDecimal(100)).toPlainString());
                 BigDecimal totalAmount = new BigDecimal(detail.getDetailAmount()).add(new BigDecimal(detail.getTaxAmount()));
                 zDatas.add(ZData.builder()
                         .ZBHSJE(detail.getDetailAmount())
@@ -267,7 +266,10 @@ public class ImageSubmitServiceImpl implements ImageSubmitService {
         //推送到SAP
         log.info("推送山能数据:{}", JSONObject.toJSONString(param));
         String result = snPushCheckRecordService.pushCheckResultToSAP(param.toJSONString());
-
+        JSONObject rs = JSONObject.parseObject(result).getJSONObject("ES_OUTPUT");
+        if (!"S".equals(rs.getString("ZTYPE"))) {
+            return R.error(500,rs.getString("ZMESSAGE"));
+        }
         return R.success();
     }