lhq/FT541-WCS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取货出问题 手动完成信号处理

Browse Source
This commit is contained in:
liuhanqing
2026-01-20 13:39:51 +08:00
parent 7bbf25373e
commit ce29fad83e
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@@ -37,7 +37,7 @@
<spring-framework.version>5.3.39</spring-framework.version> <spring-framework.version>5.3.39</spring-framework.version>
<hutool.version>5.8.27</hutool.version> <hutool.version>5.8.27</hutool.version>
<lombok.version>1.18.30</lombok.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> <mybatis-plus.version>3.5.2</mybatis-plus.version>
</properties> </properties>

2
ruoyi-admin/src/main/java/com/ruoyi/schedule/plcRead/ddj/PlcDdjRead.java
View File

@@ -126,7 +126,7 @@ public class PlcDdjRead extends Thread {
void closeServer() { void closeServer() {
if (readWriteNet != null) { if (readWriteNet != null) {
readWriteNet.ConnectClose(); siemensS7Net.ConnectClose();
} }
setIsConnect(false); setIsConnect(false);
} }

6
ruoyi-admin/src/main/java/com/ruoyi/schedule/scheduleTask/ddj/BaseDdjThread.java
View File

@@ -417,6 +417,7 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
*/ */
if (ddj.getCzfs() == 5 && ddj.getSbzt() == 0 && ddj.getJdbz() == 5) { if (ddj.getCzfs() == 5 && ddj.getSbzt() == 0 && ddj.getJdbz() == 5) {
Long rwh = ddj.getRwh(); Long rwh = ddj.getRwh();
Integer hczt = ddj.getHczt();
//完成作业 //完成作业
DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId()); DdjDeviceExecutionQueue ddjDeviceExecutionQueue = ddjDeviceExecutionQueueService.selectDdjDeviceExecutionQueueByRwh(rwh, ddj.getId());
if (ObjUtil.isNotNull(ddjDeviceExecutionQueue)) { if (ObjUtil.isNotNull(ddjDeviceExecutionQueue)) {
@@ -428,6 +429,11 @@ public abstract class BaseDdjThread implements Runnable, DdjThreadInterface {
} }
} else if (ddjDeviceExecutionQueue.getRwlx() == 4) { } else if (ddjDeviceExecutionQueue.getRwlx() == 4) {
ddjTaskFinish(rwh, ddj.getId(), 2); ddjTaskFinish(rwh, ddj.getId(), 2);
} else if (ddjDeviceExecutionQueue.getRwlx() == 1) {
if (hczt==0){
//回传完成信号
ddjTaskFinish(rwh, ddj.getId(), 2);
}
} }
} }
} }