From 89f95a24f1c3981f3f5ae250d2452ba66f95d743 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 05 九月 2025 17:00:05 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
index bf00720..e26b268 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -312,7 +312,11 @@
}
}
-
+ /**
+ * 1007鍏ュ簱
+ *
+ * @param mark
+ */
public synchronized void autoIn(Integer mark) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(1007);
@@ -341,7 +345,12 @@
taskDto.setPriority(123);
taskList.add(taskDto);
openBusSubmitParam.setTaskList(taskList);
- sendTask(openBusSubmitParam, staProtocol);
+ if (sendTask(openBusSubmitParam, staProtocol)) {
+ staProtocol.setWorkNo(0);
+ staProtocol.setStaNo((short) 0);
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ log.info("涓嬪彂缁檙cs鎴愬姛锛歿},{}", 0, 0);
+ }
}
@@ -360,7 +369,7 @@
}
@Transactional
- public void sendTask(OpenBusSubmitParam openBusSubmitParam, StaProtocol staProtocol) {
+ public boolean sendTask(OpenBusSubmitParam openBusSubmitParam, StaProtocol staProtocol) {
String response = "";
try {
response = new HttpHandler.Builder()
@@ -373,6 +382,7 @@
JSONObject jsonObject = JSON.parseObject(response);
if (jsonObject.getInteger("code").equals(200)) {
log.info("涓嬪彂浠诲姟杩斿洖鏁版嵁锛歿}", response);
+ return true;
} else {
log.error("璇锋眰鎺ュ彛澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ctuUrl + sendTask, JSON.toJSONString(openBusSubmitParam), response);
throw new CoolException("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊");
@@ -380,6 +390,7 @@
} catch (Exception e) {
log.error("fail", e);
}
+ return false;
}
@Transactional
--
Gitblit v1.9.1