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

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);
     }

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);
+                    }
                 }
             }
         }