From 8d350dd25ee243a711351fabbec1caf6933e4f17 Mon Sep 17 00:00:00 2001 From: zzs Date: Mon, 6 Jan 2025 09:56:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:PLM=E5=90=AF=E7=94=A8=E3=80=81=E5=81=9C?= =?UTF-8?q?=E7=94=A8=E5=8C=B9=E9=85=8D=E5=88=B0=E6=9B=B4=E6=96=B0=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E7=8A=B6=E6=80=81=E3=80=81=E6=89=A7=E8=A1=8C=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../em/task/MatchingPLMChangeUpdateTaskEdit.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) 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); + } } } }