diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index fb98395c..83fe97a9 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -55,6 +55,11 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { Date bom_completetime = bom.getDate("yem_completetime"); String exestate = bom.getString("yem_exestate"); Date invoktime = plm.getDate("yem_invoktime");//执行时间 + String invokstatus = plm.getString("yem_invokstatus");//执行状态 + if (YEM.isNotEmpty(invoktime) && "B".equals(invokstatus)) { + //已完成跳过 + continue; + } Boolean plmMatchBom = isPlmMatchBom(plmObj, bom, plm); exestate = "30".equals(exestate) ? "B" : "A"; if (plmMatchBom != null && !plmMatchBom) { @@ -72,15 +77,15 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { if (YEM.isNotEmpty(enableddate)) { plm.set("yem_enablesta", bom_enablesta); plm.set("yem_starttime", enableddate); - - if (YEM.isNotEmpty(bom_completetime)) { - plm.set("yem_invoktime", bom_completetime); - plm.set("yem_invokstatus", exestate); - } } else { logger.info("启用_无时间,不更新,{},{}", plm_billno, plm_parent); } } + + if (plmMatchBom != null && YEM.isNotEmpty(bom_completetime)) { + plm.set("yem_invoktime", bom_completetime); + plm.set("yem_invokstatus", exestate); + } } } }