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/service/impl/MainServiceImpl.java |   12 +++++++-----
 1 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 786c08c..ddf611e 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -182,7 +182,7 @@
                         storageEscalationParam.setBarcode(BoxNo);
                         storageEscalationParam.setMatIdList(staProtocol.getMatIdList());
                         storageEscalationParam.setFullPlt(staProtocol.isFullPlt() ? 1 : 0);
-                        storageEscalationParam.setMpHigh(staProtocol.getMpHigh());
+                        storageEscalationParam.setMpHigh((short) (staProtocol.getSiteId() < 200 ? 1 :staProtocol.isHigh() ? 2 : staProtocol.isLow() ? 1 : 0));    // 楂樺害锛屼晶闈㈢爜鐩樼殑楂樺害 浣�1锛岄珮2
                         log.info("缁勬墭鍏ュ簱={}", storageEscalationParam);
                         TaskWrk taskWrk = toWmsService.getLocNoFromWms(storageEscalationParam);
                         if (taskWrk == null) {
@@ -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);

--
Gitblit v1.9.1