From a9a35f4aaf053e6a8cbeca5146cc50e432076404 Mon Sep 17 00:00:00 2001
From: zhengyf <zyf654042662@163.com>
Date: Wed, 22 Jan 2025 11:23:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E4=BB=85=E9=80=80=E6=AC=BE=E5=BA=97=E9=93=BA=E5=8F=96=E6=95=B0?=
=?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugin/sales/RefundOnlyPluginInitializerToB.java | 12 +++++++++---
.../plugin/sales/RefundOnlyPluginInitializerToC.java | 11 ++++++++---
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java
index bcaf0f49..c0342c8b 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToB.java
@@ -477,7 +477,8 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
List<RerturnGoodsOrderSearchDetails> ofsDetails = new ArrayList<>();
for (RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader : entry.getValue()) {
allDetail.stream().forEach(index -> {
- if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) {
+// if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) {
+ if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null) {
ofsDetails.add(index);
}
});
@@ -548,7 +549,7 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
// BigDecimal sum_zyx7 = new BigDecimal(0);
//查询是否需要参考售价
- if (isReferenceShop) {
+ if (isReferenceShop) {//五个店铺
//查询存货基本档案，管理档案，取参考售价
BdInvbasdocEntity bdInvbasdocEntity = queryU8CEntityUtil.queryBdInvbasdocByCode(kk);
if (bdInvbasdocEntity == null) {
@@ -595,9 +596,14 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity {
}
}
- } else {
+ } else {//非五个店铺
+
//金额计算
for (RerturnGoodsOrderSearchDetails detail : vv) {
+
+ if("0".equals(detail.getTotalAmount())){
+ continue;
+ }
sum_jfbbje = sum_jfbbje.add(new BigDecimal(detail.getTotalAmount()));
BigDecimal sj = new BigDecimal(detail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR);
diff --git a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java
index 6e7053fd..19d696d4 100644
--- a/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java
+++ b/buildpackage/src/main/java/com/hzya/frame/plugin/lets/plugin/sales/RefundOnlyPluginInitializerToC.java
@@ -479,7 +479,8 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
List<RerturnGoodsOrderSearchDetails> ofsDetails = new ArrayList<>();
for (RerturnGoodsOrderSearchHeader rerturnGoodsOrderSearchHeader : entry.getValue()) {
allDetail.stream().forEach(index -> {
- if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) {
+// if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null && !"0".equals(index.getTotalAmount())) {
+ if (rerturnGoodsOrderSearchHeader.getCode().equals(index.getReturnOrderCode()) && index.getTotalAmount() != null) {
ofsDetails.add(index);
}
});
@@ -550,7 +551,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
//查询是否需要参考售价
- if (isReferenceShop) {
+ if (isReferenceShop) {//五个店铺
//查询存货基本档案，管理档案，取参考售价
BdInvbasdocEntity bdInvbasdocEntity = queryU8CEntityUtil.queryBdInvbasdocByCode(kk);
if (bdInvbasdocEntity == null) {
@@ -597,11 +598,15 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity {
}
}
- } else {
+ } else {//非五个店铺
//金额计算
for (RerturnGoodsOrderSearchDetails detail : vv) {
+ if("0".equals(detail.getTotalAmount())){
+ continue;
+ }
+
sum_jfbbje = sum_jfbbje.add(new BigDecimal(detail.getTotalAmount()));
BigDecimal sj = new BigDecimal(detail.getTotalAmount()).multiply(new BigDecimal(0.13)).setScale(2, RoundingMode.FLOOR);