diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java
index 5ead36f8..f659ee31 100644
--- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java
+++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java
@@ -18,8 +18,7 @@ import java.util.Date;
 import java.util.Map;
 
 /**
- * @Description:
- * 1.根据《PLM变更单》中的
+ * @Description: 1.根据《PLM变更单》中的
  * 【PLM工艺变更单号】+【总成编码】+【子项零件编码】+【子件数量】
  * 匹配《BOM》变更单
  * 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘停用’】更新 《PLM变更单》【启用停用状态】【启用停用时间】；
@@ -28,7 +27,6 @@ import java.util.Map;
  * 【PLM工艺变更单号】+【替换后总成编码】+【替换后子项零件编码】+【替换子件数量】
  * 匹配《BOM》变更单
  * 【更改单号】+【总成编码】+【子项零件编码】+【数量】+【启用停用状态=‘启用’】更新 《PLM变更单》【替换件启用停用状态】【替换件启用停用时间】；
- *
  * @Date: 2024/8/29 15:08
  * @Created: by ZZSLL
  */
@@ -44,37 +42,50 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask {
 
         for (DynamicObject plmObj : plms) {
             DynamicObjectCollection plm_entry = plmObj.getDynamicObjectCollection("yem_change_detail");
-            String plm_billno = plmObj.getString("billno");//PLM工艺变更单号
+            String plm_billno = plmObj.getString("yem_gybg_no");//PLM工艺变更单号
             for (DynamicObject plm : plm_entry) {
-                String plm_parent = plm.getString("yem_materiel_parent.number");//总成编码
-                String plm_child = plm.getString("yem_materiel_child.number");//子项零件编码
+
+                String plm_parent = plm.getString("yem_textfield");//总成编码
+                String plm_child = plm.getString("yem_child_before");//子项零件编码
                 BigDecimal plm_qty = plm.getBigDecimal("yem_qty_before");//子件数量
+
+                String invokstatus = plm.getString("yem_invokstatus");
+                if ("B".equals(invokstatus)) {
+                    logger.info("执行状态为已完成，跳过：{}，父项编码：{}", plm_billno, plm_parent);
+                    continue;
+                }
                 for (DynamicObject bomObj : boms) {
                     DynamicObjectCollection bom_entry = bomObj.getDynamicObjectCollection("yem_entryentity");
                     for (DynamicObject bom : bom_entry) {
                         String bom_billno = bom.getString("yem_changeno");//更改单号
-
-
-                        String bom_parent = bom.getString("yem_parentno.number");//父件编码
+                        String bom_parent = bom.getString("yem_parentno");//父件编码
                         String bom_child = bom.getString("yem_subno");//子项零件编码
                         BigDecimal bom_qty = bom.getBigDecimal("yem_qty");//数量
-                        if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty)) {
-                            logger.info("PLM匹配到BOM，{}-{}, {}-{}, {}-{}, {}-{}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_qty);
-                            String enablesta = bom.getString("yem_enablesta");//启用停用状态
-                            logger.info("BOM 状态为 {}", "A".equals(enablesta) ? "启用" : "停用");
-                            if ("A".equals(enablesta)) {//启用
-                                String plm_enablesta = plm.getString("yem_enablesta");
-                                if ("A".equals(plm_enablesta)) {
-                                    plm.set("yem_starttime", new Date());
-                                }
-                            }
-                            if ("B".equals(enablesta)) {//停用
-                                String plm_enablesta = plm.getString("yem_enablesta");
-                                if ("B".equals(plm_enablesta)) {
-                                    plm.set("yem_stoptime", new Date());
-                                }
-                            }
-                            plm.set("yem_enablesta", enablesta);
+                        String bom_enablesta = bom.getString("yem_enablesta");//启用停用状态
+                        logger.info("停用_compare: {} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_child, bom_enablesta);
+                        if (eq(plm_billno, bom_billno) && eq(plm_parent, bom_parent) && eq(plm_child, bom_child) && eq(plm_qty, bom_qty) && "B".equals(bom_enablesta)) {
+                            logger.info("停用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno, plm_parent, bom_parent, plm_child, bom_child, plm_qty, bom_qty);
+                            plm.set("yem_enablesta", bom_enablesta);
+                            plm.set("yem_stoptime", new Date());
+                            plm.set("yem_invokstatus", "B");
+                            plm.set("yem_invoktime", new Date());
+                        }
+
+                        String plm_after_parent_now = plm.getString("yem_parent_now");//父项编码
+                        String plm_after_child_now = plm.getString("yem_child_now");//子项编码
+                        BigDecimal plm_after_qty = plm.getBigDecimal("yem_qty_new");
+
+                        String bom_after_parent_no = bom.getString("yem_enableparno");//替换后总成编码
+                        String bom_after_child_no = bom.getString("yem_enablesubno");//替换子件编码
+                        BigDecimal bom_after_qty = bom.getBigDecimal("yem_enablesubqty");
+                        logger.info("启用_compare：{} {}, {} {}, {} {}, {} {}, {}", plm_billno, bom_billno,plm_after_parent_now, bom_after_parent_no, plm_after_child_now, bom_after_child_no, plm_after_qty, bom_after_qty, bom_enablesta);
+                        if (eq(plm_billno, bom_billno) && eq(plm_after_parent_now, bom_after_parent_no) && eq(plm_after_child_now, bom_after_child_no) && eq(plm_after_qty, bom_after_qty) && "A".equals(bom_enablesta)) {
+                            logger.info("启用_PLM匹配到BOM，{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno,plm_after_parent_now, bom_after_parent_no, plm_after_child_now, bom_after_child_no, plm_after_qty, bom_after_qty);
+
+                            plm.set("yem_enablesta", bom_enablesta);
+                            plm.set("yem_starttime", new Date());
+                            plm.set("yem_invokstatus", "B");
+                            plm.set("yem_invoktime", new Date());
                         }
                     }
                 }