From 4271e8e8911f61b5466a477db655f01cba606358 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Sat, 8 Feb 2025 00:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=BD=E7=9F=A5=EF=BC=9A=E4=BB=85=E9=80=80?= =?UTF-8?q?=E6=AC=BE=E4=BC=98=E5=8C=96=E9=87=91=E9=A2=9D=E4=B8=BA0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lets/plugin/sales/RefundOnlyPluginInitializerToB.java | 8 ++++++-- .../lets/plugin/sales/RefundOnlyPluginInitializerToC.java | 7 +++++-- 2 files changed, 11 insertions(+), 4 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 a623e8e3..fb988ae5 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 @@ -513,7 +513,7 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); if (entity == null) { - Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); + Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请检查。", split[1]); } parentvo.setHbbm(entity.getCustcode()); @@ -601,7 +601,7 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { //金额计算 for (RerturnGoodsOrderSearchDetails detail : vv) { - if("0".equals(detail.getTotalAmount())){ + if ("0".equals(detail.getTotalAmount())) { continue; } sum_jfbbje = sum_jfbbje.add(new BigDecimal(detail.getTotalAmount())); @@ -637,6 +637,10 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { } } + if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0) { + continue; + } + childrenn.setJfbbje("-" + sum_jfbbje); childrenn.setJfybje("-" + sum_jfbbje); childrenn.setJfbbsj("-" + sum_jfbbsj); 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 109c837f..0f4e43ce 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 @@ -515,7 +515,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { //hbbm 客商==店铺,根据店铺区分tob、toc,,,编码需要转换，转换称自定义项。 BdCubasdocEntity entity = queryU8CEntityUtil.getFuzzyQueryCustomers(split[1]); if (entity == null) { - Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请假查。", split[1]); + Assert.state(false, "根据客商自定义项1：{},未查询到客商基本档案，请检查。", split[1]); } parentvo.setHbbm(entity.getCustcode()); @@ -603,7 +603,7 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { //金额计算 for (RerturnGoodsOrderSearchDetails detail : vv) { - if("0".equals(detail.getTotalAmount())){ + if ("0".equals(detail.getTotalAmount())) { continue; } @@ -640,6 +640,9 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { } } + if (sum_jfbbje.compareTo(BigDecimal.ZERO) == 0) { + continue; + } childrenn.setJfbbje("-" + sum_jfbbje); childrenn.setJfybje("-" + sum_jfbbje);