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 attachControl = getAttachControl(parentFormName); + Set 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 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> attachs = panel.getAttachmentData(); - DynamicObjectCollection entry = model.getEntryEntity("yem_entryentity"); - for (Map 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> attachs = panel.getAttachmentData(); + DynamicObjectCollection entry = model.getEntryEntity("yem_entryentity"); + for (Map 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); + } } } }