From f25bbbc769f14d18c39f11ba0e395a9f09431148 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期日, 11 五月 2025 12:13:06 +0800
Subject: [PATCH] #调试

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    6 +++---
 1 files changed, 3 insertions(+), 3 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 f02e02d..0aa5cf6 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -411,7 +411,7 @@
                 StaProtocol staProtocol = devpThread.getStation().get(pickSta.getStaNo());
 
                 if(staProtocol == null) {
-                    News.error("绔欑偣淇℃伅鏈幏寰�");
+//                    News.error("绔欑偣淇℃伅鏈幏寰�");
                     continue;
                 }
                 // 灏哄妫�娴嬪紓甯�
@@ -1103,7 +1103,7 @@
             crnCommand.setDestinationPosX((short) (locMast.getRow1() + slave.getOffset()));     // 鐩爣搴撲綅鎺�
             crnCommand.setDestinationPosY((short) (locMast.getBay1() + slave.getOffset()));     // 鐩爣搴撲綅鍒�
             crnCommand.setDestinationPosZ((short) (locMast.getLev1() + slave.getOffset()));     // 鐩爣搴撲綅灞�
-            crnCommand.setTraySize(locMast.getLocType1() == 2);
+//            crnCommand.setTraySize(locMast.getLocType1() == 2);
             if (!MessageQueue.offer(SlaveType.Crn, wrkMast.getCrnNo(), new Task(2, crnCommand))) {
                 News.error("" + mark + " - 1" + " - 16" + " - 鍫嗗灈鏈哄懡浠や笅鍙戝け璐ワ紝鍫嗗灈鏈哄彿={}锛屼换鍔℃暟鎹�={}", wrkMast.getCrnNo(), JSON.toJSON(crnCommand));
             } else {
@@ -1689,8 +1689,8 @@
 
                     try {
                         LocTypeDto locTypeDto = new LocTypeDto(staProtocol);
-
                         SearchLocParam param = new SearchLocParam();
+                        locTypeDto.setLocType1((short) 1);
                         param.setIoType(10);
                         param.setSourceStaNo(emptyInSta.getStaNo());
                         param.setLocType1(locTypeDto.getLocType1());

--
Gitblit v1.9.1