From 007bb91e70a5129304de1837f60161c6f5f3ad4f Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期四, 31 十月 2024 10:25:41 +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/p206V1_0_0/TkFindP206V1_0_0.java |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
index c4ced6b..0783065 100644
--- a/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
+++ b/pipIrr-platform/pipIrr-mw/pipIrr-mw-rtu/src/main/java/com/dy/rtuMw/server/rtuData/p206V1_0_0/TkFindP206V1_0_0.java
@@ -1,8 +1,6 @@
 package com.dy.rtuMw.server.rtuData.p206V1_0_0;
 
 
-import com.dy.common.mw.protocol.p206V1_0_0.DataV1_0_1;
-import com.dy.common.mw.protocol.p206V1_0_0.upVos.DataCd02Vo;
 import com.dy.rtuMw.server.rtuData.TaskSurpport;
 import com.dy.common.mw.protocol.Data;
 import com.dy.common.mw.protocol.p206V1_0_0.ProtocolConstantV206V1_0_0;
@@ -21,18 +19,7 @@
 		Data d = (Data)data ;
 		if(d.getProtocol() != null && d.getProtocol().equals(ProtocolConstantV206V1_0_0.protocolName)){
 			//璇嗗埆鍑烘槸P206V1.0.0鍗忚鏁版嵁
-			//鏃犲懡浠D
-			boolean toNext = true ;
-			if(d.getSubData() != null) {
-				DataV1_0_1 dataV1_0_1 = (DataV1_0_1)d.getSubData() ;
-				if(dataV1_0_1 != null && dataV1_0_1.subData != null && dataV1_0_1.subData instanceof DataCd02Vo){
-					//杩囨护鎺夊績璺虫暟鎹�
-					toNext = false ;
-				}
-			}
-			if(toNext){
-				this.toNextTasks(data);
-			}
+			this.toNextTasks(data);
 		}else{
 			//涓嶆槸鏈崗璁殑鏁版嵁
 		}

--
Gitblit v1.8.0