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/service/impl/MainServiceImpl.java |   11 ++++++-----
 1 files changed, 6 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..2a5315b 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,10 @@
                             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));
+//                                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);
@@ -269,7 +269,8 @@
                                 taskWrk.setWrkSts(14);
                                 taskWrk.setCompleteTime(new Date());
                                 taskWrkService.updateById(taskWrk);
-
+                                // 渚ч潰鍑哄簱瀹屾垚 涓婃姤鎵ц鐘舵��
+                                toWmsService.executionStatusReport(taskWrk.getTaskNo(), taskWrk.getWrkSts());
                             } else {
                                 log.error("涓嬪彂杈撻�佺嚎浠诲姟澶辫触锛歵askWrk:" + JSON.toJSONString(taskWrk));
                             }

--
Gitblit v1.9.1