diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java index d721eaad..6dd1814f 100644 --- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java +++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java @@ -42,7 +42,13 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { for (DynamicObject plm : collection) { String enablesta = plm.getString("yem_enablesta"); String invokstatus = plm.getString("yem_invokstatus"); - String parentno = plm.getString("yem_textfield"); + String exchangetype = plm.getString("yem_exchangetype"); + String parentno; + if ("D".equals(exchangetype)) {//新增 + parentno = plm.getString("yem_parent_now"); + } else { + parentno = plm.getString("yem_textfield"); + } DynamicObject assatlasdet = seelctDyn("yem_em_assatlasdet", "number", parentno);//父项编码 plm.set("yem_isassy", false); plm.set("yem_isresource", false); @@ -105,14 +111,23 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask { for (DynamicObject entry : entries) { DynamicObject addNew = detail.addNew(); addNew.set("id", entry.getLong("id")); - addNew.set("yem_parentno", entry.getString("yem_textfield"));//父件编码 - addNew.set("yem_parentname", entry.getString("yem_name_parent"));//父项名称 + + String exchangetype = entry.getString("yem_exchangetype"); + + if (exchangetype.equals("D")) { + addNew.set("yem_parentno", entry.getString("yem_parent_now"));//父件编码 + addNew.set("yem_parentname", entry.getString("yem_name_newparent"));//父项名称 + } else { + addNew.set("yem_parentno", entry.getString("yem_textfield"));//父件编码 + addNew.set("yem_parentname", entry.getString("yem_name_parent"));//父项名称 + } + addNew.set("yem_subno", entry.getString("yem_child_before"));//子件编码 addNew.set("yem_subname", entry.getString("yem_name_child"));//子件名称 addNew.set("yem_subenname", "");//子件英文名称 addNew.set("yem_qty", entry.getBigDecimal("yem_qty_before"));//数量 addNew.set("yem_enablesta", entry.getString("yem_enablesta"));//启用停用状态 - addNew.set("yem_replace", entry.getString("yem_exchangetype"));//替换关系 + addNew.set("yem_replace", exchangetype);//替换关系 addNew.set("yem_enableparno", entry.getString("yem_parent_now"));//替换父件编码-父项编码 addNew.set("yem_enableparname", entry.getString("yem_name_newparent"));//替换父件名称-父项名称 addNew.set("yem_enablesubno", entry.getString("yem_child_now"));//替换子件编码-子项编码