diff --git a/pom.xml b/pom.xml
index 589d24f..950dfb5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
5.3.39
5.8.27
1.18.30
- 3.7.0
+ 2.0.0
3.5.2
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);
+ }
}
}
}