From 9e223b67754bbc0e2661d13c00e7ad06d8b84009 Mon Sep 17 00:00:00 2001
From: Administrator <pjb>
Date: 星期三, 22 十月 2025 18:32:59 +0800
Subject: [PATCH] 侧面需要码盘才下发码盘信息
---
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 2 +-
src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
index 8ed5dc1..ddf611e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -255,10 +255,12 @@
boolean offer = false;
try {
offer = MessageQueue.offer(SlaveType.Devp, 1, new Task(2, staProtocol));
- staProtocol.setMp(taskWrk.getMp());
- staProtocol.setLx(taskWrk.getLx());
- staProtocol.setLev(taskWrk.getLev());
- MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ if(taskWrk.getMp() == 1) {
+ staProtocol.setMp(taskWrk.getMp());
+ staProtocol.setLx(taskWrk.getLx());
+ staProtocol.setLev(taskWrk.getLev());
+ MessageQueue.offer(SlaveType.Devp, 1, new Task(3, staProtocol));
+ }
} catch (Exception e) {
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:" + e);
log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛氬紓甯�:offer:" + offer);
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index f0a65bf..c46368b 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -99,7 +99,7 @@
short mpCompletedFlag = staProtocol.getMpCompletedFlag();
if (mpCompletedFlag == 1) {
TaskWrk taskWrk = taskWrkMapper.selectByWrkNo(Integer.valueOf(staProtocol.getWorkNo()));
- if (taskWrk != null) {
+ if (taskWrk != null && taskWrk.getMp() == 1) {
// 璇锋眰浣�
JSONObject request = new JSONObject();
--
Gitblit v1.9.1