diff --git a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
index 8fd1ab54..c2776ede 100644
--- a/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
+++ b/src/main/java/com/yem/em/task/GenerateReplaceRelationshipTaskEdit.java
@@ -196,14 +196,14 @@ public class GenerateReplaceRelationshipTaskEdit extends AbstractTask {
                 addNew.set("yem_parentname", entry.getString("yem_name_newparent"));//替换后-父项名称
                 addNew.set("yem_subno", entry.getString("yem_child_now"));//替换后-子件编码
                 addNew.set("yem_subname", entry.getString("yem_name_newchild"));//替换后-子件名称
-                addNew.set("yem_subenname", "yem_englishname");//替换后-子件英文名称
+                addNew.set("yem_subenname", entry.getString("yem_englishname"));//替换后-子件英文名称
                 addNew.set("yem_qty", entry.getBigDecimal("yem_qty_new"));//替换后-数量
             } 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_subenname", entry.getString("yem_englishname_before"));//替换前-子件英文名称
                 addNew.set("yem_qty", entry.getBigDecimal("yem_qty_before"));//替换前-数量
             }
 
diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java
index 3066a7f4..1cfe994e 100644
--- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java
+++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java
@@ -51,30 +51,38 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
                         String plm_parent = plm.getString("yem_textfield");//总成编码
                         String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
                         Date bom_completetime = bom.getDate("yem_completetime");
+                        String exestate = bom.getString("yem_exestate");
+                        Date invoktime = plm.getDate("yem_invoktime");//执行时间
                         Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm);
+                        exestate = "30".equals(exestate) ? "B" : "A";
                         if (plmMatchBom != null && !plmMatchBom) {
-                            Date stoptime = plm.getDate("yem_stoptime");
-                            if (YEM.isEmpty(stoptime)) {
-                                Date downdate = bom.getDate("yem_downdate");
+//                            Date stoptime = plm.getDate("yem_stoptime");
+                            Date downdate = bom.getDate("yem_downdate");
+                            if (YEM.isNotEmpty(downdate)) {
                                 plm.set("yem_enablestatus_before", bom_enablesta);
                                 plm.set("yem_stoptime", downdate);
-                                plm.set("yem_invoktime", bom_completetime);
-                                plm.set("yem_invokstatus", "B");
+//                                plm.set("yem_invoktime", bom_completetime);
+//                                plm.set("yem_invokstatus", exestate);
                             } else {
-                                logger.info("停用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
+                                logger.info("停用_无时间，不更新，{}，{}", plm_billno, plm_parent);
                             }
                         }
 
                         if (plmMatchBom != null && plmMatchBom) {
-                            Date starttime = plm.getDate("yem_starttime");
-                            if (YEM.isEmpty(starttime)) {
-                                Date enableddate = bom.getDate("yem_enableddate");
+//                            Date starttime = plm.getDate("yem_starttime");
+                            Date enableddate = bom.getDate("yem_enableddate");
+                            if (YEM.isNotEmpty(enableddate)) {
                                 plm.set("yem_enablesta", bom_enablesta);
                                 plm.set("yem_starttime", enableddate);
-                                plm.set("yem_invoktime", bom_completetime);
-                                plm.set("yem_invokstatus", "B");
+//                                plm.set("yem_invoktime", bom_completetime);
+//                                plm.set("yem_invokstatus", exestate);
+
+                                if (YEM.isNotEmpty(bom_completetime)) {
+                                    plm.set("yem_invoktime", bom_completetime);
+                                    plm.set("yem_invokstatus", exestate);
+                                }
                             } else {
-                                logger.info("启用_已有时间，不更新，{}，{}", plm_billno, plm_parent);
+                                logger.info("启用_无时间，不更新，{}，{}", plm_billno, plm_parent);
                             }
                         }
                     }