From a09d765dae2f830aafae9a6c597867822d9e5b65 Mon Sep 17 00:00:00 2001
From: ljw <ljw@yunemao.com>
Date: Sat, 11 Jan 2025 19:26:36 +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

---
 .../DeclareDocxToExportinvoiceConvert.java    | 42 ++++++++++---------
 1 file changed, 22 insertions(+), 20 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 177da359..b11503ae 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.entity.BillEntityType;
 import kd.bos.entity.ExtendedDataEntity;
 import kd.bos.entity.botp.plugin.AbstractConvertPlugIn;
 import kd.bos.entity.botp.plugin.args.AfterConvertEventArgs;
@@ -28,11 +29,13 @@ 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);
 
@@ -98,26 +101,25 @@ public class DeclareDocxToExportinvoiceConvert extends AbstractConvertPlugIn {
 //            }
 
             calculatePremium(dataEntity);
-            for (ExtendedDataEntity findByname : findBynames) {
-                List<DynamicObject> 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<DynamicObject> 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);
+            List<DynamicObject> 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);
             }
+            findBynames.set("yem_shipports", userColl);
+            List<DynamicObject> 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);