From 61fea1076428feccb540cd7ff2e7c9272d8be701 Mon Sep 17 00:00:00 2001 From: zhengyf Date: Sun, 12 Jan 2025 23:55:43 +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=BF=AE=E6=94=B9=E5=8F=82=E8=80=83=E5=94=AE=E4=BB=B7?= =?UTF-8?q?=3D=3D0=EF=BC=8C=E6=B2=A1=E6=9C=89=E7=9A=84=E6=8A=A5=E9=94=99?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sales/RefundOnlyPluginInitializerToB.java | 17 ++++++++++++++++- .../sales/RefundOnlyPluginInitializerToC.java | 17 ++++++++++++++++- 2 files changed, 32 insertions(+), 2 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 dc8ab81b..747e4b24 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 @@ -539,11 +539,26 @@ public class RefundOnlyPluginInitializerToB extends PluginBaseEntity { if (bdInvbasdocEntity == null) { Assert.state(false, "根据存货编码：{}，查询存货基本档案失败。", kk); } - BdInvmandocEntity bdInvmandocEntity = queryU8CEntityUtil.queryBdInvmandocByPkInvbasdocAndPkCorp(bdInvbasdocEntity.getPkInvbasdoc(), split[0]); + //查询公司主键 + System.out.println(corpCode); + BdCorpEntity bdCorpEntity = queryU8CEntityUtil.queryBdCorpByUnitCode(corpCode); + if (bdCorpEntity == null) { + Assert.state(false, "根据公司编码：{}，查询公司档案失败。", corpCode); + } + + //查询管理档案 + BdInvmandocEntity bdInvmandocEntity = queryU8CEntityUtil.queryBdInvmandocByPkInvbasdocAndPkCorp(bdInvbasdocEntity.getPkInvbasdoc(), bdCorpEntity.getPkCorp()); if (bdInvmandocEntity == null) { Assert.state(false, "根据公司编码：{}，存货编码：{}，存货主键：{}，查询存货管理档案失败。", split[0], kk, bdInvbasdocEntity.getPkInvbasdoc()); } //参考售价 + if (bdInvmandocEntity.getRefsaleprice() == null) { + Assert.state(false, "根据公司编码：{}，存货编码：{}，存货主键：{}，参考售价不为0为空。请检查参考售价", split[0], kk, bdInvbasdocEntity.getPkInvbasdoc()); + } + //==0 过滤 + if (new BigDecimal(0).compareTo(new BigDecimal(bdInvmandocEntity.getRefsaleprice())) == 0) { + continue; + } BigDecimal refsaleprice = new BigDecimal(bdInvmandocEntity.getRefsaleprice()); for (RerturnGoodsOrderSearchDetails detail : vv) { sum_jfbbje = sum_jfbbje.add(refsaleprice); 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 6b0ee8a4..e38f8909 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 @@ -542,11 +542,26 @@ public class RefundOnlyPluginInitializerToC extends PluginBaseEntity { if (bdInvbasdocEntity == null) { Assert.state(false, "根据存货编码：{}，查询存货基本档案失败。", kk); } - BdInvmandocEntity bdInvmandocEntity = queryU8CEntityUtil.queryBdInvmandocByPkInvbasdocAndPkCorp(bdInvbasdocEntity.getPkInvbasdoc(), split[0]); + //查询公司主键 + System.out.println(corpCode); + BdCorpEntity bdCorpEntity = queryU8CEntityUtil.queryBdCorpByUnitCode(corpCode); + if (bdCorpEntity == null) { + Assert.state(false, "根据公司编码：{}，查询公司档案失败。", corpCode); + } + + //查询管理档案 + BdInvmandocEntity bdInvmandocEntity = queryU8CEntityUtil.queryBdInvmandocByPkInvbasdocAndPkCorp(bdInvbasdocEntity.getPkInvbasdoc(), bdCorpEntity.getPkCorp()); if (bdInvmandocEntity == null) { Assert.state(false, "根据公司编码：{}，存货编码：{}，存货主键：{}，查询存货管理档案失败。", split[0], kk, bdInvbasdocEntity.getPkInvbasdoc()); } //参考售价 + if (bdInvmandocEntity.getRefsaleprice() == null) { + Assert.state(false, "根据公司编码：{}，存货编码：{}，存货主键：{}，参考售价不为0为空。请检查参考售价", split[0], kk, bdInvbasdocEntity.getPkInvbasdoc()); + } + //==0 过滤 + if (new BigDecimal(0).compareTo(new BigDecimal(bdInvmandocEntity.getRefsaleprice())) == 0) { + continue; + } BigDecimal refsaleprice = new BigDecimal(bdInvmandocEntity.getRefsaleprice()); for (RerturnGoodsOrderSearchDetails detail : vv) { sum_jfbbje = sum_jfbbje.add(refsaleprice);