From 4ad03482d2b63cd3265c2b538840dd20e4f72bc0 Mon Sep 17 00:00:00 2001 From: zzs Date: Sat, 23 Nov 2024 11:31:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:PLM=E7=94=9F=E6=88=90=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/GenerateReplaceRelationshipTaskEdit.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index c2776ede..200eb1e6 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -13,6 +13,7 @@ import kd.bos.schedule.executor.AbstractTask; import kd.bos.servicehelper.AttachmentServiceHelper; import kd.bos.servicehelper.BusinessDataServiceHelper; import kd.bos.servicehelper.operation.SaveServiceHelper; +import org.apache.commons.compress.utils.Lists; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -86,6 +87,7 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { */ private void generateReplaceRelation(DynamicObject plmObj, DynamicObjectCollection enabled) { DynamicObjectCollection collection = plmObj.getDynamicObjectCollection("yem_change_detail"); + ArrayList remove = Lists.newArrayList(); // 更新是否资源、是否总成 for (DynamicObject plm : enabled) { @@ -110,9 +112,10 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { logger.info("是否资源：{}，{}", parentno, basemodelib != null); if (!plm.getBoolean("yem_isassy") && !plm.getBoolean("yem_isresource")) { - enabled.remove(plm); + remove.add(plm); } } + collection.removeAll(remove); // 替换关系生成成功之后更新完成时间、状态 Map successMap = new HashMap<>(); DynamicObject bomChange = createBOMChange(plmObj, enabled); @@ -186,6 +189,11 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { bomchange.set("creator", head.getDynamicObject("creator"));//创建人 DynamicObjectCollection detail = bomchange.getDynamicObjectCollection("yem_entryentity"); for (DynamicObject entry : entries) { + + if (!entry.getBoolean("yem_isassy") && !entry.getBoolean("yem_isresource")) { + continue; + } + DynamicObject addNew = detail.addNew(); addNew.set("id", entry.getLong("id")); @@ -262,6 +270,9 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { Date breakpointtime = getBreakPointTime(detail, partno); DynamicObject attachment = AttachmentServiceHelper.getAttCreatorByUID(pictureid); + if (YEM.isEmpty(attachment)) { + continue; + } String url = attachment.getString("ffileid"); String fattachmentsize = attachment.getString("fattachmentsize"); if (YEM.isEmpty(fattachmentsize) || Long.parseLong(fattachmentsize) == 0) {