diff --git a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java index 16fbe202..dffb399c 100644 --- a/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java +++ b/src/main/java/com/yem/em/task/MatchingPLMChangeUpdateTaskEdit.java @@ -62,7 +62,8 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { Date stoptime = plm.getDate("yem_stoptime"); if (YEM.isEmpty(stoptime)) { plm.set("yem_enablesta", bom_enablesta); - plm.set("yem_stoptime", new Date()); + Date downdate = bom.getDate("yem_downdate"); + plm.set("yem_stoptime", downdate); } else { logger.info("停用_已有时间,不更新,{},{}", plm_billno, plm_parent); } @@ -80,8 +81,9 @@ public class MatchingPLMChangeUpdateTaskEdit extends AbstractTask { logger.info("启用_PLM匹配到BOM,{} {}, {} {}, {} {}, {} {}", plm_billno, bom_billno,plm_after_parent_now, bom_before_parent_no, plm_after_child_now, bom_before_child_no, plm_after_qty, bom_before_qty); Date starttime = plm.getDate("yem_starttime"); if (YEM.isEmpty(starttime)) { + Date enableddate = bom.getDate("yem_enableddate"); plm.set("yem_enablesta", bom_enablesta); - plm.set("yem_starttime", new Date()); + plm.set("yem_starttime", enableddate); } else { logger.info("启用_已有时间,不更新,{},{}", plm_billno, plm_parent); }