diff --git a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java index e6b29f96..c1450200 100644 --- a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java +++ b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java @@ -187,6 +187,24 @@ public class CusdecToDeclaredocxTask extends AbstractTask { declaredocx.set("yem_despportcodebase",user.getDynamicObject("yem_despportcodebase") ); declaredocx.set("yem_distinateportbase", user.getDynamicObject("yem_distinateportbase")); declaredocx.set("yem_transmodbase", user.getDynamicObject("yem_transmodbase")); +// List userList = new ArrayList<>(); +// DynamicObjectCollection userColl = declaredocx.getDynamicObjectCollection("yem_shipports"); +// userList.add(user.getDynamicObject("yem_despportcodebase")); +// for (DynamicObject users: userList) { +// DynamicObject newUser = new DynamicObject(userColl.getDynamicObjectType()); +// newUser.set("fbasedataId", users); +// userColl.add(newUser); +// } +// declaredocx.set("yem_shipports",userColl); +// List userLists = new ArrayList<>(); +// DynamicObjectCollection userColls = declaredocx.getDynamicObjectCollection("yem_destports"); +// userLists.add(user.getDynamicObject("yem_distinateportbase")); +// for (DynamicObject users: userLists) { +// DynamicObject newUser = new DynamicObject(userColls.getDynamicObjectType()); +// newUser.set("fbasedataId", users); +// userColls.add(newUser); +// } +// declaredocx.set("yem_destports",userColls); SaveServiceHelper.update(declaredocx); SaveServiceHelper.save(new DynamicObject[]{declaredocx}); if ("结关".equals(yemCusdecstatusname) && !YEM.isEmpty(yemFiedatets)) { 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 177da359..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 @@ -31,7 +31,6 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { //上游 String name = this.getSrcMainType().getName(); ExtendedDataEntity[] findByEntityKeys = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); - ExtendedDataEntity[] findBynames = e.getTargetExtDataEntitySet().FindByEntityKey(name); for (ExtendedDataEntity findByEntityKey : findByEntityKeys) { //携带合同中的佣金率 setRate(findByEntityKey); @@ -60,7 +59,7 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { 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_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)); } @@ -98,30 +97,10 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { // } calculatePremium(dataEntity); - for (ExtendedDataEntity findByname : findBynames) { - List userList = new ArrayList<>(); - DynamicObjectCollection userColl =findByname.getDataEntity().getDynamicObjectCollection("yem_shipports"); - userList.add((DynamicObject) findByEntityKey.getValue("yem_despportcodebase")); - for (DynamicObject users : userList) { - DynamicObject newUser = new DynamicObject(userColl.getDynamicObjectType()); - newUser.set("fbasedataId", users); - userColl.add(newUser); - } - findByname.setValue("yem_shipports", userColl); - List userLists = new ArrayList<>(); - DynamicObjectCollection userColls = findByname.getDataEntity().getDynamicObjectCollection("yem_destports"); - userLists.add((DynamicObject) findByEntityKey.getValue("yem_distinateportbase")); - for (DynamicObject users : userLists) { - DynamicObject newUser = new DynamicObject(userColls.getDynamicObjectType()); - newUser.set("fbasedataId", users); - userColls.add(newUser); - } - findByname.setValue("yem_destports", userColls); - } + } ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); yemCushscode(findByname); - } private void yemCushscode(ExtendedDataEntity[] findByname) {