From e2aa3f9c79ae688a56ea3bb5bc96ba1600f215de Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期一, 15 十二月 2025 13:35:10 +0800
Subject: [PATCH] 初始化

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 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 2dea637..a6160c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -389,8 +389,6 @@
                             storageEscalationParam.setLocType(1);
                         }else if(staProtocol.isLow()){
                             storageEscalationParam.setLocType(0);
-                        }else if (staProtocol.isCentre()){
-                            storageEscalationParam.setLocType(2);
                         }
 
                         storageEscalationParam.setTerminalNo(staProtocol.getSiteId());
@@ -465,6 +463,7 @@
                                         staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                         devpThread.setPakMk(staProtocol.getSiteId(), false);
                                         MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+                                        log.error("宸叉湁鍏ュ簱浠诲姟,wms--->浠诲姟鍙�:{}",result.getTaskNo());
                                     }
 
                                 } else {
@@ -479,6 +478,7 @@
                                     staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                     devpThread.setPakMk(staProtocol.getSiteId(), false);
                                     MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+                                    log.error("鍏ュ簱寮傚父,wms杩斿洖鍊间笉绗﹀悎鏉′欢,wms--->{}",response);
                                 }
                             }
                         } catch (Exception e) {
@@ -634,6 +634,7 @@
                                     staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                     devpThread.setPakMk(staProtocol.getSiteId(), false);
                                     MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+                                    log.error("浠诲姟宸插瓨鍦�,wms--->浠诲姟鍙�:{}",result.getTaskNo());
                                 }
 
                             } else {
@@ -646,6 +647,7 @@
                                 staProtocol.setStaNo(inSta.getBackSta().shortValue());
                                 devpThread.setPakMk(staProtocol.getSiteId(), false);
                                 MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
+                                log.error("璇锋眰鎺ュ彛寮傚父,wms--->{}",response);
                             }
 
                         } catch (Exception e) {
@@ -1220,11 +1222,13 @@
                         if (!crnProtocol.getStatusType().equals(CrnStatusType.IDLE) || crnProtocol.getTaskNo() != 0) {
                             break;
                         }
-//                        int storeCount = basDevpService.getStoreCount();
-//                        if (storeCount >= maxCount) {
-//                            log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄恵}", storeCount);
-//                            break;
-//                        }
+
+                        //杈撻�佺嚎鍙厑璁稿瓨鍦ㄤ竴涓墭鐩�
+                        int storeCount = basDevpService.getStoreCount();
+                        if (storeCount >= maxCount) {
+                            log.error("杈撻�佺嚎鏆傚瓨鏁拌揪鍒颁笂闄�,褰撳墠杈撻�佺嚎鎵樼洏鏁伴噺:{},鏈�澶ф殏瀛樻暟閲�:{}", storeCount,maxCount);
+                            break;
+                        }
 
 
                         // 宸茬粡瀛樺湪鍚婅溅鎵ц浠诲姟鏃讹紝鍒欒繃婊�

--
Gitblit v1.9.1