From 8fa3135b2765893e56dd8f913e27d47e6f63d429 Mon Sep 17 00:00:00 2001 From: wuzeyu <1223318623@qq.com> Date: 星期五, 05 七月 2024 13:59:10 +0800 Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV --- pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java index 0a0723a..33c8cb4 100644 --- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java +++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V202404/TkDealControllerNoTrampV202404.java @@ -1,8 +1,12 @@ package com.dy.rtuMw.server.rtuData.p206V202404; +import com.dy.pipIrrGlobal.pojoPr.PrControllerTramp; import com.dy.rtuMw.server.rtuData.TaskSurpport; +import com.dy.rtuMw.server.rtuData.dbSv.DbSv; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; + +import java.util.Date; /** * @Author liurunyu @@ -22,7 +26,10 @@ */ @Override public void execute(Object data) { - //姝や换鍔℃棤鍏蜂綋涓氬姟閫昏緫锛屽彧鏄湪浠诲姟xml閰嶇疆鏂囦欢涓紝妗嗕綇鍏跺瓙浠诲姟鑺傜偣 - this.toNextTasks(data); + Object[] objs = this.getTaskResults(TkPreGenObjsV202404.taskId) ; + PrControllerTramp tramp = (PrControllerTramp)objs[2] ; + if(tramp == null){ + this.toNextTasks(data); + } } } -- Gitblit v1.8.0