From 5936220e860f561ff100a9eef4fbd5471c195946 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 08 九月 2025 17:14:39 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java | 33 +++++++++++++++++++++++----------
1 files changed, 23 insertions(+), 10 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..ef92490 100644
--- a/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/CtuMainServiceImpl.java
@@ -148,7 +148,7 @@
if (flag1007 && staProtocol.getWorkNo() > 0 && staProtocol.isAutoing() && !staProtocol.isEmptyMk() && staProtocol.isPakMk()) {
staProtocol.setWorkNo(0);
staProtocol.setStaNo((short) 0);
- boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
log.info("鍙栬蛋鍐欏叆纭浣嶏細{},{}", staProtocol.getWorkNo(), 1007);
}
}
@@ -174,7 +174,7 @@
continue;
}
//&& staProtocol.isOutEnable()
- if (flag1001 && staProtocol.isAutoing() && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999) && staProtocol.isPakMk()) {
+ if (staProtocol.isAutoing() && !staProtocol.isEmptyMk() && (staProtocol.getWorkNo() == 0 || staProtocol.getWorkNo() == 9999) && staProtocol.isPakMk()) {
News.warnNoLog("" + mark + " - 0" + " - 寮�濮嬫墽琛�");
// 鍒ゆ柇閲嶅宸ヤ綔妗�
// 106涔熺畻涓婏紝浠ュ悗106-銆�107鐢ㄤ簬鏇存柊搴撳瓨
@@ -192,6 +192,11 @@
boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
log.info("杈撻�佺嚎涓嬪彂3锛歿},{}", staProtocol.getWorkNo(), 1004);
if (result) {
+ try {
+ Thread.sleep(8000L);
+ } catch (InterruptedException e) {
+ throw new RuntimeException(e);
+ }
setFlag1001(false);
} else {
News.error("" + mark + " - 2" + " - 鍙戝竷鍛戒护鑷宠緭閫佺嚎闃熷垪澶辫触锛侊紒锛� [plc缂栧彿锛歿}]", devp.getId());
@@ -297,12 +302,13 @@
}
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(1001);
- if (i >= 7) {
+ if (i >= 6) {
OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
List<TaskDto> taskList = new ArrayList<>();
TaskDto taskDto = new TaskDto();
- taskDto.setSeqNum(Math.random() * 1000 + "");
+ Random rand = new Random();
+ taskDto.setSeqNum("SSX-CK" + rand.nextInt() * 10000);
taskDto.setOriLoc(getFLoc("1001", "16"));
taskDto.setDestSta("1001");
taskDto.setPriority(123);
@@ -312,7 +318,11 @@
}
}
-
+ /**
+ * 1007鍏ュ簱
+ *
+ * @param mark
+ */
public synchronized void autoIn(Integer mark) {
SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
StaProtocol staProtocol = devpThread.getStation().get(1007);
@@ -328,20 +338,21 @@
if (!staProtocol.isLoading()) {
return;
}
- if (staProtocol.getStaNo() > 0) {
+ if (staProtocol.getStaNo() <= 0) {
return;
}
OpenBusSubmitParam openBusSubmitParam = new OpenBusSubmitParam();
openBusSubmitParam.setBatch(DateUtils.convert(new Date()));
List<TaskDto> taskList = new ArrayList<>();
TaskDto taskDto = new TaskDto();
- taskDto.setSeqNum(Math.random() * 1000 + "");
+ taskDto.setSeqNum("SSX-RK" + staProtocol.getWorkNo());
taskDto.setDestLoc(getFLoc("1007", "15"));
- taskDto.setOriLoc("1007");
+ taskDto.setOriSta("1007");
taskDto.setPriority(123);
taskList.add(taskDto);
openBusSubmitParam.setTaskList(taskList);
sendTask(openBusSubmitParam, staProtocol);
+
}
@@ -360,7 +371,7 @@
}
@Transactional
- public void sendTask(OpenBusSubmitParam openBusSubmitParam, StaProtocol staProtocol) {
+ public boolean sendTask(OpenBusSubmitParam openBusSubmitParam, StaProtocol staProtocol) {
String response = "";
try {
response = new HttpHandler.Builder()
@@ -373,13 +384,15 @@
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("璋冪敤涓嬪彂浠诲姟鎺ュ彛鎶ラ敊");
}
} catch (Exception e) {
- log.error("fail", e);
+ //log.error("fail", e);
}
+ return false;
}
@Transactional
--
Gitblit v1.9.1