From 3b17ccf3fd001cbec7a8bac368f07cd9237faae8 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 27 十月 2025 12:54:36 +0800
Subject: [PATCH] 侧面出库完成上报执行状态替代plc码盘完成信号交互
---
src/main/java/com/zy/asrs/task/TaskReportScheduler.java | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
index f0a65bf..ae33dcd 100644
--- a/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
+++ b/src/main/java/com/zy/asrs/task/TaskReportScheduler.java
@@ -86,8 +86,8 @@
add(301);add(302);add(303);add(304);add(305);add(306);add(307);add(308);
}};
- // 渚ч潰鐮佺洏瀹屾垚涓婃姤wms
- @Scheduled(cron = "0/3 * * * * ? ")
+ // 渚ч潰鐮佺洏瀹屾垚涓婃姤wms -寮冪敤锛屽嚭搴撳畬鎴愭椂鍊欎笂鎶ョ姸鎬�
+// @Scheduled(cron = "0/3 * * * * ? ")
public synchronized void reportPalletizingCompleted() {
DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, 1);
if (devpThread != null) {
@@ -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 && taskWrk.getMpCompletedReport() == 0) {
// 璇锋眰浣�
JSONObject request = new JSONObject();
@@ -142,8 +142,6 @@
, bool
);
}
- } else {
- log.error("渚ч潰鐮佺洏瀹屾垚涓婃姤wms娌℃湁鎵惧埌璇ヤ换鍔★紝绔欑偣锛歿}锛屼换鍔″彿锛歿}", site, staProtocol.getWorkNo());
}
}
}
--
Gitblit v1.9.1