From ce29fad83efedb218c2359da83a419384ca07f73 Mon Sep 17 00:00:00 2001
From: liuhanqing <liuhanqing1@bonc.com.cn>
Date: Tue, 20 Jan 2026 13:39:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=96=E8=B4=A7=E5=87=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20=E6=89=8B=E5=8A=A8=E5=AE=8C=E6=88=90=E4=BF=A1=E5=8F=B7?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pom.xml                                                     | 2 +-
 .../java/com/ruoyi/schedule/plcRead/ddj/PlcDdjRead.java     | 2 +-
 .../com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java  | 6 ++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 589d24f..950dfb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <spring-framework.version>5.3.39</spring-framework.version>
         <hutool.version>5.8.27</hutool.version>
         <lombok.version>1.18.30</lombok.version>
-        <HslCommunication.version>3.7.0</HslCommunication.version>
+        <HslCommunication.version>2.0.0</HslCommunication.version>
         <mybatis-plus.version>3.5.2</mybatis-plus.version>
 
     </properties>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdjRead.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdjRead.java
index cb5af2c..f680318 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdjRead.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdjRead.java
@@ -126,7 +126,7 @@ public class PlcDdjRead extends Thread {
 
     void closeServer() {
         if (readWriteNet != null) {
-            readWriteNet.ConnectClose();
+            siemensS7Net.ConnectClose();
         }
         setIsConnect(false);
     }
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
index b223c5a..aff8c5e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
@@ -417,6 +417,7 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
          */
         if (ddj.getCzfs() == 5 && ddj.getSbzt() == 0 && ddj.getJdbz() == 5) {
             Long rwh = ddj.getRwh();
+            Integer hczt = ddj.getHczt();
             //完成作业
             DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId());
             if (ObjUtil.isNotNull(ddjDeviceExecutionQueue)) {
@@ -428,6 +429,11 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
                     }
                 } else if (ddjDeviceExecutionQueue.getRwlx() == 4) {
                     ddjTaskFinish(rwh, ddj.getId(), 2);
+                } else if (ddjDeviceExecutionQueue.getRwlx() == 1) {
+                    if (hczt==0){
+                        //回传完成信号
+                        ddjTaskFinish(rwh, ddj.getId(), 2);
+                    }
                 }
             }
         }