From 1da0571d3b368e4bfa05a84858d86f865c98a4bf Mon Sep 17 00:00:00 2001 From: ljw Date: Sat, 11 Jan 2025 18:21:26 +0800 Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=87=BA=E5=8F=A3=E6=8A=A5?= =?UTF-8?q?=E5=85=B3=E7=94=9F=E6=88=90=E5=87=BA=E5=8F=A3=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E6=97=B6=E5=A4=9A=E9=80=89=E5=9F=BA=E7=A1=80=E8=B5=84=E6=96=99?= =?UTF-8?q?=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yem/tws/task/CusdecToDeclaredocxTask.java | 18 ------------- .../DeclareDocxToExportinvoiceConvert.java | 25 +++++++++++++++++-- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java index c1450200..e6b29f96 100644 --- a/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java +++ b/src/main/java/com/yem/tws/task/CusdecToDeclaredocxTask.java @@ -187,24 +187,6 @@ 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 9190b716..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 @@ -31,6 +31,7 @@ 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); @@ -59,7 +60,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)); } @@ -97,10 +98,30 @@ 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) {