From 7a2d6bb86b24505ae57a5f97a16ed7897a4aee18 Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Thu, 11 May 2023 14:24:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9mapper=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SDNYMainProcessController.java | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 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 b50339f0..c6ac59ed 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
@@ -750,8 +750,9 @@ public class SDNYMainProcessController extends AbstractController {
                 //将类似于0.03数据格式转化为3.00
                 if (snInvoiceDetail.getTaxRate() != null && snInvoiceDetail.getTaxRate() != "") {
                     sapInvoiceDetail.setZTAX(snInvoiceDetail.getTaxRate());
-                    if (snInvoiceDetail.equals("0")) {
+                    if ( "0".equals(snInvoiceDetail.getTaxRate())){
                         sapInvoiceDetail.setZTAX("0.00");
+//                        sapInvoiceDetail.setZSM(sapInvoiceDetail.getZTAX());
                     }
                     if (snInvoiceDetail.getTaxRate().contains(".")) {
                         String getTaxRate = snInvoiceDetail.getTaxRate();
@@ -759,6 +760,7 @@ public class SDNYMainProcessController extends AbstractController {
                             getTaxRate = getTaxRate.substring(0, 4);
                         }
                         BigDecimal tax = new BigDecimal(getTaxRate);
+                        sapInvoiceDetail.setZSM(getZSM(tax.toString()));
                         BigDecimal tax1 = tax.multiply(new BigDecimal("100"));
                         sapInvoiceDetail.setZTAX(tax1.toString());
                     }
@@ -776,7 +778,12 @@ public class SDNYMainProcessController extends AbstractController {
                 sapInvoiceDetail.setZGSJBM(snInvoiceDetail.getCommodityCode());
                 sapInvoiceDetail.setZSE(snInvoiceDetail.getTax());
                 sapInvoiceDetail.setZSL(snInvoiceDetail.getQuantity());
-                sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate()));
+                String zsmTax = snInvoiceDetail.getTaxRate();
+                if (zsmTax != null && zsmTax != "" && zsmTax.length() > 4){
+                    zsmTax = zsmTax.substring(0,4);
+                }
+//                sapInvoiceDetail.setZSM(getZSM(snInvoiceDetail.getTaxRate()));
+                sapInvoiceDetail.setZSM(getZSM(zsmTax));
                 sapInvoiceDetail.setZGGXH(snInvoiceDetail.getSpecificationModel());
                 if (snInvoice.getInvoiceCode() != null) {
                     sapInvoiceDetail.setZTID(snInvoice.getInvoiceCode() + snInvoice.getInvoiceNumber() + snFplx);
@@ -806,6 +813,19 @@ public class SDNYMainProcessController extends AbstractController {
             info.setZTAX(replace + ".00");
             info.setZSM(getZSM(divide.toString()));
         }
+        if (taxRate != null && taxRate.contains(".")){
+            if (taxRate.length() >4){
+                taxRate = taxRate.substring(0,4);
+                BigDecimal tax = new BigDecimal(taxRate);
+                info.setZSM(getZSM(tax.toString()));
+                BigDecimal tax1 = tax.multiply(new BigDecimal("100"));
+                info.setZTAX(tax1.toString());
+            }
+        }
+        if (taxRate != null && "0".equals(taxRate)){
+            info.setZTAX("0.00");
+            info.setZSM(getZSM(info.getZTAX()));
+        }
         if (invoiceLineList == null || invoiceLineList.size() == 0) {
             if (info.getZTAX() == null || info.getZTAX() == "") {
                 info.setZTAX("0.00");