From b72473634d81716920dc1069c8fdb208f4d1a98e Mon Sep 17 00:00:00 2001 From: ljw Date: Tue, 21 Jan 2025 11:33:44 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"fix=EF=BC=9A"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 2fe307d84473dd099fdd8e7179027658edb49ed7. --- .../DeclareDocxToExportinvoiceConvert.java | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 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 e785c11b..c2feca41 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,6 +5,7 @@ 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.dataentity.entity.MulBasedataDynamicObjectCollection; import kd.bos.entity.BillEntityType; import kd.bos.entity.ExtendedDataEntity; import kd.bos.entity.botp.plugin.AbstractConvertPlugIn; @@ -34,30 +35,30 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn { String name = this.getSrcMainType().getName(); ExtendedDataEntity[] findByEntityKeys = e.getTargetExtDataEntitySet().FindByEntityKey(targetName); for (ExtendedDataEntity findByEntityKey : findByEntityKeys) { -// List shippingDetails = (List) findByEntityKey.getValue("ConvertSource"); + List shippingDetails = (List) findByEntityKey.getValue("ConvertSource"); DynamicObject dataEntity = findByEntityKey.getDataEntity();//单据主实体 -// for (DynamicObject shippingDetail : shippingDetails) { -//// -//// Long value = shippingDetail.getLong("id"); -//// DynamicObject findBynames = BusinessDataServiceHelper.loadSingle(value, name); -//// MulBasedataDynamicObjectCollection yemDestport = (MulBasedataDynamicObjectCollection ) findByEntityKey.getValue("yem_shipports"); -//// DynamicObjectCollection fourBookColls = new DynamicObjectCollection(); -//// DynamicObject tempDyObjs = new DynamicObject(yemDestport.getDynamicObjectType()); -//// tempDyObjs.set("fbasedataid",findBynames.getDynamicObject("yem_despportcodebase")); -//// fourBookColls.add(tempDyObjs); -//// dataEntity.set("yem_shipports", fourBookColls); -//// -//// -//// MulBasedataDynamicObjectCollection yemDestports = (MulBasedataDynamicObjectCollection ) findByEntityKey.getValue("yem_destports"); -//// DynamicObjectCollection fourBookColl = new DynamicObjectCollection(); -//// DynamicObject tempDyObj = new DynamicObject(yemDestports.getDynamicObjectType()); -//// tempDyObj.set("fbasedataid",findBynames.getDynamicObject("yem_distinateportbase")); -//// fourBookColl.add(tempDyObj); -//// dataEntity.set("yem_destports", fourBookColl); -// -// -// }//携带合同中的佣金率 + for (DynamicObject shippingDetail : shippingDetails) { + + Long value = shippingDetail.getLong("id"); + DynamicObject findBynames = BusinessDataServiceHelper.loadSingle(value, name); + MulBasedataDynamicObjectCollection yemDestport = (MulBasedataDynamicObjectCollection ) findByEntityKey.getValue("yem_shipports"); + DynamicObjectCollection fourBookColls = new DynamicObjectCollection(); + DynamicObject tempDyObjs = new DynamicObject(yemDestport.getDynamicObjectType()); + tempDyObjs.set("fbasedataid",findBynames.getDynamicObject("yem_despportcodebase")); + fourBookColls.add(tempDyObjs); + dataEntity.set("yem_shipports", fourBookColls); + + + MulBasedataDynamicObjectCollection yemDestports = (MulBasedataDynamicObjectCollection ) findByEntityKey.getValue("yem_destports"); + DynamicObjectCollection fourBookColl = new DynamicObjectCollection(); + DynamicObject tempDyObj = new DynamicObject(yemDestports.getDynamicObjectType()); + tempDyObj.set("fbasedataid",findBynames.getDynamicObject("yem_distinateportbase")); + fourBookColl.add(tempDyObj); + dataEntity.set("yem_destports", fourBookColl); + + + }//携带合同中的佣金率 setRate(findByEntityKey); bringLatestExRate(dataEntity);