From 38c1fe1d0f0380f0b20a6f07ec221d41572fb171 Mon Sep 17 00:00:00 2001 From: zhouc Date: Fri, 27 Sep 2024 21:41:20 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9=E6=94=B6=E6=AC=BE=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E3=80=81=E5=AE=9E=E9=99=85=E6=94=B6=E6=AC=BE=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=B8=BA0=E4=B8=8D=E4=BC=9A=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dynamic/CreditBackFillEdit.java | 48 +++++++++++-------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java b/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java index f4bcb05e..b5125701 100644 --- a/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java +++ b/src/main/java/com/yem/wm/es/storagetrans/dynamic/CreditBackFillEdit.java @@ -352,16 +352,20 @@ public class CreditBackFillEdit extends AbstractFormPlugin { im_infocrecollection.clear(); for (DynamicObject crecollection : formCreCollection) { - DynamicObject addNew = im_infocrecollection.addNew(); - addNew.set("yem_credate", crecollection.getDate("yem_credate"));//业务日期 - addNew.set("yem_crecurrency", crecollection.getDynamicObject("yem_crecurrency"));//信保币别 - addNew.set("yem_crerate", crecollection.getBigDecimal("yem_crerate"));//信保汇率 - addNew.set("yem_crecollecdate", crecollection.getDate("yem_crecollecdate"));//收款日期 - addNew.set("yem_creactualamt", crecollection.getBigDecimal("yem_creactualamt"));//实际收汇金额 - addNew.set("yem_creactuallocamt", crecollection.getBigDecimal("yem_creactuallocamt"));//实际收汇金额本位币 - addNew.set("yem_crenote", crecollection.getString("yem_crenote"));//收款备注 - addNew.set("yem_crecollecurrency", crecollection.getDynamicObject("yem_crecollecurrency"));//收款币别 - addNew.set("yem_crecollecamt", crecollection.getBigDecimal("yem_crecollecamt"));//收款金额 + BigDecimal yem_crecollecamt = crecollection.getBigDecimal("yem_crecollecamt"); + BigDecimal yem_creactualamt = crecollection.getBigDecimal("yem_creactualamt"); + if(yem_crecollecamt.compareTo(BigDecimal.ZERO)>0&&yem_creactualamt.compareTo(BigDecimal.ZERO)>0){ + DynamicObject addNew = im_infocrecollection.addNew(); + addNew.set("yem_credate", crecollection.getDate("yem_credate"));//业务日期 + addNew.set("yem_crecurrency", crecollection.getDynamicObject("yem_crecurrency"));//信保币别 + addNew.set("yem_crerate", crecollection.getBigDecimal("yem_crerate"));//信保汇率 + addNew.set("yem_crecollecdate", crecollection.getDate("yem_crecollecdate"));//收款日期 + addNew.set("yem_creactualamt", crecollection.getBigDecimal("yem_creactualamt"));//实际收汇金额 + addNew.set("yem_creactuallocamt", crecollection.getBigDecimal("yem_creactuallocamt"));//实际收汇金额本位币 + addNew.set("yem_crenote", crecollection.getString("yem_crenote"));//收款备注 + addNew.set("yem_crecollecurrency", crecollection.getDynamicObject("yem_crecollecurrency"));//收款币别 + addNew.set("yem_crecollecamt", crecollection.getBigDecimal("yem_crecollecamt"));//收款金额 + } } } else { DynamicObjectCollection im_infocrecollection = im_info.getDynamicObjectCollection("yem_crecollection"); @@ -401,16 +405,20 @@ public class CreditBackFillEdit extends AbstractFormPlugin { DynamicObjectCollection parentSubCollection = parentCreditEntry.get(index).getDynamicObjectCollection("yem_crecollection"); parentSubCollection.clear(); for (DynamicObject crecollection : subCollection) { - DynamicObject parentAddNer = parentSubCollection.addNew(); - parentAddNer.set("yem_credate", crecollection.getDate("yem_credate"));//业务日期 - parentAddNer.set("yem_crecurrency", crecollection.getDynamicObject("yem_crecurrency"));//信保币别 - parentAddNer.set("yem_crerate", crecollection.getBigDecimal("yem_crerate"));//信保汇率 - parentAddNer.set("yem_crecollecdate", crecollection.getDate("yem_crecollecdate"));//收款日期 - parentAddNer.set("yem_creactualamt", crecollection.getBigDecimal("yem_creactualamt"));//实际收汇金额 - parentAddNer.set("yem_creactuallocamt", crecollection.getBigDecimal("yem_creactuallocamt"));//实际收汇金额本位币 - parentAddNer.set("yem_crenote", crecollection.getString("yem_crenote"));//收款备注 - parentAddNer.set("yem_crecollecurrency", crecollection.getDynamicObject("yem_crecollecurrency"));//收款币别 - parentAddNer.set("yem_crecollecamt", crecollection.getBigDecimal("yem_crecollecamt"));//收款金额 + BigDecimal yem_crecollecamt = crecollection.getBigDecimal("yem_crecollecamt"); + BigDecimal yem_creactualamt = crecollection.getBigDecimal("yem_creactualamt"); + if(yem_crecollecamt.compareTo(BigDecimal.ZERO)>0&&yem_creactualamt.compareTo(BigDecimal.ZERO)>0){ + DynamicObject parentAddNer = parentSubCollection.addNew(); + parentAddNer.set("yem_credate", crecollection.getDate("yem_credate"));//业务日期 + parentAddNer.set("yem_crecurrency", crecollection.getDynamicObject("yem_crecurrency"));//信保币别 + parentAddNer.set("yem_crerate", crecollection.getBigDecimal("yem_crerate"));//信保汇率 + parentAddNer.set("yem_crecollecdate", crecollection.getDate("yem_crecollecdate"));//收款日期 + parentAddNer.set("yem_creactualamt", crecollection.getBigDecimal("yem_creactualamt"));//实际收汇金额 + parentAddNer.set("yem_creactuallocamt", crecollection.getBigDecimal("yem_creactuallocamt"));//实际收汇金额本位币 + parentAddNer.set("yem_crenote", crecollection.getString("yem_crenote"));//收款备注 + parentAddNer.set("yem_crecollecurrency", crecollection.getDynamicObject("yem_crecollecurrency"));//收款币别 + parentAddNer.set("yem_crecollecamt", crecollection.getBigDecimal("yem_crecollecamt"));//收款金额 + } } BigDecimal creactualamt = BigDecimal.ZERO;// 实际收汇金额