From bd5c79e34a6c701dce2b7e0d7a3adffd00caaf09 Mon Sep 17 00:00:00 2001
From: vayne <vayne0702@163.com>
Date: Wed, 31 Jul 2024 11:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=91=E9=A2=9D=E8=B4=9F=E6=95=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jnpf/service/impl/WarehousingOutboundServiceImpl.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
index 3ca1c629..0a091754 100644
--- a/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
+++ b/jnpf-java-boot/jnpf-scm/jnpf-scm-biz/src/main/java/jnpf/service/impl/WarehousingOutboundServiceImpl.java
@@ -742,9 +742,11 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
             //发货关系表，最后一次相减得出含税小计
             int size = 0;
             BigDecimal SaleAmountCount = BigDecimal.ZERO;
+            BigDecimal SaleTaxCount = BigDecimal.ZERO;
 //            List<WarehousingStorageProductEntity> tableField119 = JsonUtil.getJsonToList(receiptOrderForm.getDeliveryProductRelationList(),WarehousingStorageProductEntity.class);
             for(DeliveryProductRelationModel entitys : deliveryOrderForm.getDeliveryProductRelationList()){
                 countNum = countNum.add(entitys.getDeliveryNum());
+                SaleTaxCount = SaleTaxCount.add(entitys.getTaxCount());
                 WarehousingOutboundProductEntity warehousingOutboundProductEntity = new WarehousingOutboundProductEntity();
                 warehousingOutboundProductEntity.setId(RandomUtil.uuId());
                 warehousingOutboundProductEntity.setWarehousingOutboundId(entity.getId());
@@ -789,7 +791,7 @@ public class WarehousingOutboundServiceImpl extends ServiceImpl<WarehousingOutbo
                 deliveryRelationEntity.setDeliveryNum(entitys.getDeliveryNum()); //数量
                 deliveryRelationEntity.setSalePrice(entitys.getReturnUnit());//采购单价
                 if (size == deliveryOrderForm.getDeliveryProductRelationList().size()-1){
-                    deliveryRelationEntity.setSaleCount(countNum.subtract(SaleAmountCount));
+                    deliveryRelationEntity.setSaleCount(SaleTaxCount.subtract(SaleAmountCount));
                 }else {
                     deliveryRelationEntity.setSaleCount(entitys.getReturnUnit().multiply(entitys.getDeliveryNum()).setScale(2, RoundingMode.HALF_UP)); //金额
                     SaleAmountCount = SaleAmountCount.add(deliveryRelationEntity.getSaleCount());