From 58bb9d3e0a8d8c385085f8cce3492eccf5448ec4 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 10 九月 2025 16:20:12 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/controller/OpenController.java | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 9c5c79c..8c26564 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -81,10 +81,10 @@
*/
@RequestMapping("/task/sync/v1")
public R taskSync(@RequestBody TaskReportParam param) {
- if (param == null || param.getSeqNum() == null || param.getQrCode() == null) {
+ if (param == null || param.getSeqNum() == null) {
return R.error("鍙傛暟涓虹┖");
}
- if ((param.getQrCode().equals("00001547") || param.getQrCode().equals("1001")) && param.getTaskSts() == 15) {
+ if (param.getTaskSts() == 15 && (param.getQrCode().equals("00001547") || param.getQrCode().equals("1001"))) {
log.info("1001浠诲姟鐘舵�佷笂鎶ユ帴鏀讹細{}", param);
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
Map<Integer, StaProtocol> station = devpThread.getStation();
@@ -94,6 +94,9 @@
} else {
staProtocol = staProtocol.clone();
}
+ if (!staProtocol.isLoading()) {
+ return R.error("绔欑偣鏃犵墿");
+ }
Random rand = new Random();
staProtocol.setWorkNo(rand.nextInt(1000));
staProtocol.setStaNo((short) 1004);
@@ -101,9 +104,20 @@
if (result) {
log.info("涓嬪彂鎴愬姛锛歿},{}", staProtocol.getWorkNo(), 1004);
}
- } else if (param.getQrCode().equals("00001612") && param.getTaskSts() == 5) {
+ } else if (param.getTaskSts() == 5) {
log.info("1007浠诲姟鐘舵�佷笂鎶ユ帴鏀讹細{}", param);
-
+ DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ Map<Integer, StaProtocol> station = devpThread.getStation();
+ StaProtocol staProtocol = station.get(1007);
+ if (staProtocol == null) {
+ return R.error("鏈壘鍒扮珯鐐�");
+ } else {
+ staProtocol = staProtocol.clone();
+ }
+ boolean result = MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ if (result) {
+ log.info("涓嬪彂鎴愬姛锛歿},{}", staProtocol.getWorkNo(), 1007);
+ }
}
return R.ok();
}
--
Gitblit v1.9.1