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 b11503ae..177da359 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 @@ -5,7 +5,6 @@ import com.yem.wm.utils.DynamicObjectUtil; import com.yem.wm.utils.YEM; import kd.bos.dataentity.entity.DynamicObject; import kd.bos.dataentity.entity.DynamicObjectCollection; -import kd.bos.entity.BillEntityType; import kd.bos.entity.ExtendedDataEntity; import kd.bos.entity.botp.plugin.AbstractConvertPlugIn; import kd.bos.entity.botp.plugin.args.AfterConvertEventArgs; @@ -29,13 +28,11 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { public void afterConvert(AfterConvertEventArgs e) { super.afterConvert(e); String targetName = this.getTgtMainType().getName(); - BillEntityType srcMainType = this.getSrcMainType(); //上游 String name = this.getSrcMainType().getName(); - ExtendedDataEntity[] findByEntityKeys = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); + ExtendedDataEntity[] findBynames = e.getTargetExtDataEntitySet().FindByEntityKey(name); for (ExtendedDataEntity findByEntityKey : findByEntityKeys) { - DynamicObject findBynames = BusinessDataServiceHelper.loadSingle(findByEntityKey.getValue("id"), name); //携带合同中的佣金率 setRate(findByEntityKey); @@ -101,25 +98,26 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { // } calculatePremium(dataEntity); - List userList = new ArrayList<>(); - DynamicObjectCollection userColl = findBynames.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); + 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); } - findBynames.set("yem_shipports", userColl); - List userLists = new ArrayList<>(); - DynamicObjectCollection userColls = findBynames.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); - } - findBynames.set("yem_destports", userColls); - } ExtendedDataEntity[] findByname = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); yemCushscode(findByname);