From 7413518e646b9e924ec7e305b282fcb88fc82c1d Mon Sep 17 00:00:00 2001
From: lsh <lsh123456>
Date: 星期六, 04 三月 2023 09:45:10 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/core/thread/SteThread.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/core/thread/SteThread.java b/src/main/java/com/zy/core/thread/SteThread.java
index df50048..e6786c8 100644
--- a/src/main/java/com/zy/core/thread/SteThread.java
+++ b/src/main/java/com/zy/core/thread/SteThread.java
@@ -11,12 +11,16 @@
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasSte;
import com.zy.asrs.entity.BasSteOpt;
+import com.zy.asrs.entity.WrkCharge;
import com.zy.asrs.service.BasSteOptService;
import com.zy.asrs.service.BasSteService;
+import com.zy.common.model.enums.WrkChargeType;
+import com.zy.core.DevpThread;
import com.zy.core.News;
import com.zy.core.ThreadHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.OutputQueue;
+import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.enums.SteStatusType;
import com.zy.core.model.SteSlave;
@@ -175,7 +179,13 @@
steProtocol.setCrnStopRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 38));
steProtocol.setCrnStopFork(siemensS7Net.getByteTransform().TransInt16(result.Content, 40));
steProtocol.setCrnAllowRun(siemensS7Net.getByteTransform().TransInt16(result.Content, 42));
- steProtocol.setChargeStatus(siemensS7Net.getByteTransform().TransInt16(result.Content, 44));
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if (!devpThread.charge0 || devpThread.charge1){
+ steProtocol.setChargeStatus((short)1);
+ }else {
+ steProtocol.setChargeStatus((short)0);
+ }
+
OutputQueue.STE.offer(MessageFormat.format("銆恵0}銆慬id:{1}] <<<<< 瀹炴椂鏁版嵁鏇存柊鎴愬姛",DateUtils.convert(new Date()), slave.getId()));
@@ -286,10 +296,28 @@
News.error("绌挎杞﹀啓鍏ュ懡浠や负绌�");
return false;
}
+ //鍒ゆ柇灏忚溅鏄惁鍦ㄥ厖鐢�
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ if (!devpThread.charge0 || devpThread.charge1){
+ // led 寮傚父鏄剧ず
+ LedThread ledThread1 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
+ LedThread ledThread2 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
+ LedThread ledThread3 = (LedThread) SlaveConnection.get(SlaveType.Led, 1);
+ if (ledThread1 != null && ledThread2 != null && ledThread3 != null) {
+ MessageQueue.offer(SlaveType.Led, 1, new Task(3, "绌挎杞︽鍦ㄥ厖鐢�"));
+ MessageQueue.offer(SlaveType.Led, 2, new Task(3, "绌挎杞︽鍦ㄥ厖鐢�"));
+ MessageQueue.offer(SlaveType.Led, 3, new Task(3, "绌挎杞︽鍦ㄥ厖鐢�"));
+ }
+ News.error("绌挎杞︽鍦ㄥ厖鐢�");
+ return false;
+ }
command.setSteNo(slave.getId());
OperateResult result = null;
// 寮�濮嬩换鍔�
if (!command.getComplete()) {
+ //缁勭粐浠诲姟鍓嶏紝鍏堟竻绌哄啓浠诲姟纭浣嶏紝浠ュ強浠诲姟瀹屾垚纭浣�
+ siemensS7Net.Write("V2000.0", false);
+ siemensS7Net.Write("V2000.1", false);
// 1.浠诲姟鍙�
OperateResult result0 = siemensS7Net.Write("V998", command.getTaskNo().shortValue());
try {
--
Gitblit v1.9.1