From 4c6a3545ecbcc9dc557e11ef791873f2cf9678cd Mon Sep 17 00:00:00 2001 From: ljw Date: Wed, 27 Nov 2024 22:00:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=201.=E9=9A=8F=E6=9C=BA=E8=B5=84=E6=96=99?= =?UTF-8?q?=E5=8F=8A=E9=85=8D=E4=BB=B6=E5=B7=A5=E5=85=B7=E5=8C=85=EF=BC=8C?= =?UTF-8?q?=E6=9C=BA=E5=9E=8B=E5=8F=B0=E6=95=B0=E6=A0=B9=E6=8D=AE=E5=8F=91?= =?UTF-8?q?=E8=BF=90=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DeclareDocxToExportinvoiceConvert.java | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java b/src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java index 7b629057..d3babfed 100644 --- a/src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java +++ b/src/main/java/com/yem/wm/es/declaredocx/convert/DeclareDocxToExportinvoiceConvert.java @@ -40,6 +40,19 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { DynamicObjectCollection yemExportinvoiceC = dataEntity.getDynamicObjectCollection("yem_exportinvoice_c");//报关商品 DynamicObjectCollection yemExportinvoiceCd = dataEntity.getDynamicObjectCollection("yem_exportinvoice_cd");//报关商品对照表 DynamicObjectCollection yemEsMaterialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");///商品明细 + for (int i = 0; i < yemEsMaterialinfo.size(); i++) { + DynamicObject dynamicObject = yemEsMaterialinfo.get(i); + for (int i1 = 0; i1 < yemExportinvoiceCd.size(); i1++) { + DynamicObject dynamicObject1 = yemExportinvoiceCd.get(i1); + if (i == dynamicObject1.getInt("yem_fgseq")) { + int anInt = dynamicObject1.getInt("yem_decgoodsseq"); + DynamicObject dynamicObject2 = yemExportinvoiceC.get(anInt-1); + BigDecimal yemCusqty = dynamicObject2.getBigDecimal("yem_cusqty"); + BigDecimal yemQty = dynamicObject.getBigDecimal("yem_qty"); + dynamicObject2.set("yem_cusqty",yemCusqty.add(yemQty)); + } + } + } List idList = yemEsMaterialinfo.stream().map(x -> x.getString("yem_fseq")).collect(Collectors.toList());//获取源单序号 List yem_fgseq = new ArrayList<>(); for (DynamicObject yemExportinvoiceCds : yemExportinvoiceCd) { @@ -68,19 +81,7 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { // } // } // } - for (int i = 0; i < yemEsMaterialinfo.size(); i++) { - DynamicObject dynamicObject = yemEsMaterialinfo.get(i); - for (int i1 = 0; i1 < yemExportinvoiceCd.size(); i1++) { - DynamicObject dynamicObject1 = yemExportinvoiceCd.get(i1); - if (i == dynamicObject1.getInt("yem_fgseq")) { - int anInt = dynamicObject1.getInt("yem_decgoodsseq"); - DynamicObject dynamicObject2 = yemExportinvoiceC.get(anInt); - BigDecimal yemCusqty = dynamicObject2.getBigDecimal("yem_cusqty"); - BigDecimal yemQty = dynamicObject.getBigDecimal("yem_qty"); - dynamicObject2.set("yem_cusqty",yemCusqty.add(yemQty)); - } - } - } + calculatePremium(dataEntity); }