From a4df8bd8e99fea62e1c8d2bbc128f196cc1fe2d0 Mon Sep 17 00:00:00 2001
From: bang <bang@work.com>
Date: Sat, 18 Jan 2025 11:54:44 +0800
Subject: [PATCH] =?UTF-8?q?lb=EF=BC=9Apdf=E6=96=87=E4=BB=B6=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attach/dynamic/PDFMergeDynamicPlugin.java | 40 +++++++++----------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/yem-base/yem-base-common/src/main/java/yem/base/common/module/attach/dynamic/PDFMergeDynamicPlugin.java b/yem-base/yem-base-common/src/main/java/yem/base/common/module/attach/dynamic/PDFMergeDynamicPlugin.java
index e83c940..9e1a445 100644
--- a/yem-base/yem-base-common/src/main/java/yem/base/common/module/attach/dynamic/PDFMergeDynamicPlugin.java
+++ b/yem-base/yem-base-common/src/main/java/yem/base/common/module/attach/dynamic/PDFMergeDynamicPlugin.java
@@ -83,7 +83,11 @@ public class PDFMergeDynamicPlugin extends AbstractFormPlugin implements Plugin
         String operateKey = e.getOperateKey();
         switch(operateKey){
             case "refreshentry": // 刷新自动重新从父页面更新PDF文件明细
-                initData();
+                IFormView parentView = this.getView().getParentView();
+                String parentFormName = parentView.getModel().getDataEntity().getDataEntityType().getName();
+                Map<String,String> attachControl = getAttachControl(parentFormName);
+                Set<String> attachControlKey = attachControl.keySet();
+                initData(attachControlKey);
                 break;
             default :
                 break;
@@ -93,30 +97,26 @@ public class PDFMergeDynamicPlugin extends AbstractFormPlugin implements Plugin
     /**
      *  PDF文件合并界面初始化
      * */
-    private void initData(){
+    private void initData(Set<String> attachControlKey){
         IFormView view = this.getView();
         IDataModel model = view.getModel();
         IFormView parentView = this.getView().getParentView();
-        String parentFormName = parentView.getModel().getDataEntity().getDataEntityType().getName();
         // 清除分录
         model.deleteEntryData("yem_entryentity");
-        FormShowParameter formShowParameter = view.getFormShowParameter();
-        String attachKey = formShowParameter.getCustomParam("srcAttachKey");
-        if (YEM.isEmpty(attachKey))return;
-        if (parentView == null) return;
-        DynamicObject dataEntity = parentView.getModel().getDataEntity();// 源单实体
-        // 获取附件
-        AttachmentPanel panel = parentView.getControl(attachKey);
-        List<Map<String, Object>> attachs = panel.getAttachmentData();
-        DynamicObjectCollection entry = model.getEntryEntity("yem_entryentity");
-        for (Map<String, Object>  attach:attachs){
-            String fileName = (String) attach.get("name");
-            String url = (String) attach.get("url");
-            if (YEM.isEmpty(fileName)) continue;
-            if (fileName.endsWith(".pdf") || fileName.endsWith(".PDF")){
-                int row = model.createNewEntryRow("yem_entryentity");
-                model.setValue("yem_attachmentname",fileName,row);
-                model.setValue("yem_url",url,row);
+        for (String attachKey : attachControlKey) {
+            // 获取附件
+            AttachmentPanel panel = parentView.getControl(attachKey);
+            List<Map<String, Object>> attachs = panel.getAttachmentData();
+            DynamicObjectCollection entry = model.getEntryEntity("yem_entryentity");
+            for (Map<String, Object>  attach:attachs){
+                String fileName = (String) attach.get("name");
+                String url = (String) attach.get("url");
+                if (YEM.isEmpty(fileName)) continue;
+                if (fileName.endsWith(".pdf") || fileName.endsWith(".PDF")){
+                    int row = model.createNewEntryRow("yem_entryentity");
+                    model.setValue("yem_attachmentname",fileName,row);
+                    model.setValue("yem_url",url,row);
+                }
             }
         }
     }