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 d3babfed..9190b716 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 @@ -42,14 +42,28 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { DynamicObjectCollection yemEsMaterialinfo = dataEntity.getDynamicObjectCollection("yem_es_materialinfo");///商品明细 for (int i = 0; i < yemEsMaterialinfo.size(); i++) { DynamicObject dynamicObject = yemEsMaterialinfo.get(i); + String string = dynamicObject.getString("yem_fseq"); + int intNum = Integer.parseInt(string); for (int i1 = 0; i1 < yemExportinvoiceCd.size(); i1++) { DynamicObject dynamicObject1 = yemExportinvoiceCd.get(i1); - if (i == dynamicObject1.getInt("yem_fgseq")) { + if (intNum == 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)); + for (int i2 = 0; i2 < yemExportinvoiceC.size(); i2++) { + DynamicObject dynamicObject2 = yemExportinvoiceC.get(i2); + if (dynamicObject2.getInt("seq") == anInt) { + BigDecimal yemCusqty = dynamicObject2.getBigDecimal("yem_cusqty"); + BigDecimal yem_cusamount = dynamicObject2.getBigDecimal("yem_cusamount"); + BigDecimal yem_localamount = dynamicObject2.getBigDecimal("yem_localamount"); + BigDecimal yemQty = dynamicObject.getBigDecimal("yem_qty"); + BigDecimal yem_sellamt = dynamicObject.getBigDecimal("yem_sellamt"); + BigDecimal yem_locamt = dynamicObject.getBigDecimal("yem_locamt"); + dynamicObject2.set("yem_cusqty", yemCusqty.add(yemQty)); + dynamicObject2.set("yem_cusamount", yem_sellamt.add(yem_cusamount)); + dynamicObject2.set("yem_cusconsalesprice", BigDecimalUtils.div(yem_sellamt.add(yem_cusamount),yemCusqty.add(yemQty),4)); + dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount)); +// dynamicObject2.set("yem_localamount", yem_locamt.add(yem_localamount)); + } + } } } }