From 9df566b190604034bba00b18eac34e1d21008097 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B7=B4=E5=8D=AB?= <14240332@qq.com>
Date: Tue, 4 Apr 2023 17:47:06 +0800
Subject: [PATCH] =?UTF-8?q?amountNotTax=E9=87=91=E9=A2=9D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../arinvoices/service/impl/Arinvoices_item0ServiceImpl.java    | 2 +-
 .../jnpf/invoices/service/impl/InvoicesItem0ServiceImpl.java    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java
index a9cebb8c..b8e42655 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/arinvoices/service/impl/Arinvoices_item0ServiceImpl.java
@@ -54,7 +54,7 @@ public class Arinvoices_item0ServiceImpl extends ServiceImpl<Arinvoices_item0Map
                 dataRowMap.put("involceAmount", model.getInvolceAmount().add(model.getTaxAmount()));
                 dataRowMap.put("taxRate", model.getTaxRate());
                 dataRowMap.put("taxAmount", model.getTaxAmount());
-                dataRowMap.put("amountNotTax", model.getInvolceAmount().subtract(model.getTaxAmount()));
+                dataRowMap.put("amountNotTax", model.getInvolceAmount());
                 dataRowMap.put("invoiceStatus", "0");
                 dataRowMap.put("creatorUserName", model.getCreatorUserName());
                 dataRowMap.put("invoiceDate", model.getInvoiceDate());
diff --git a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesItem0ServiceImpl.java b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesItem0ServiceImpl.java
index 212f9f7b..bec230be 100644
--- a/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesItem0ServiceImpl.java
+++ b/SC-boot/linkage-scm/src/main/java/jnpf/invoices/service/impl/InvoicesItem0ServiceImpl.java
@@ -58,7 +58,7 @@ public class InvoicesItem0ServiceImpl extends ServiceImpl<InvoicesItem0Mapper, I
                 dataRowMap.put("invoiceAmount", model.getInvoiceAmount().add(model.getTaxAmount()));//金额 + 税额=发票金额
                 dataRowMap.put("taxRate", model.getTaxRate());
                 dataRowMap.put("taxAmount", model.getTaxAmount());
-                dataRowMap.put("amountNotTax", model.getInvoiceAmount().subtract(model.getTaxAmount()));
+                dataRowMap.put("amountNotTax", model.getInvoiceAmount());
                 dataRowMap.put("invoiceStatus", "0");
                 dataRowMap.put("creatorUserName", model.getCreatorUserName());
                 dataRowMap.put("invoicingDate", model.getInvoicingDate());