From 1bc0ec629b23e000be7817c0b9434aacddb3ed45 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期一, 29 十二月 2025 12:19:31 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 8fea465..b27eb0d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -1374,7 +1374,7 @@
     public synchronized void crnRebackHp(CrnProtocol crnProtocol, CrnThread crnThread,String staNo) {
         if(staNo == null){
             if (crnProtocol.getStatusType() == CrnStatusType.IDLE && crnProtocol.getTaskNo() == 0 && crnProtocol.getModeType() == CrnModeType.AUTO) {
-                if (crnProtocol.getBay() == 121 || crnProtocol.getBay() == 1) {
+                if (crnProtocol.getBay() == 121 ) {
                     return;
                 }
                 int x=1;
@@ -1396,9 +1396,9 @@
                 }
 
                 //杈撻�佺嚎娌℃湁鍏ュ簱浠诲姟锛岃繃婊�2
-                if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) != null) {
-                    return;
-                }
+//                if (wrkMastMapper.selectDevWorking(crnProtocol.getCrnNo()) != null) {
+//                    return;
+//                }
                 News.info("鍫嗗灈鏈哄彫鍥炲師鐐�==>>" + crnProtocol.getCrnNo() + "鍙峰爢鍨涙満鏈夊叆搴撲换鍔�,鍙洖鍘熺偣");
                 // 鍛戒护涓嬪彂鍖� --------------------------------------------------------------------------
                 CrnCommand crnCommand = new CrnCommand();

--
Gitblit v1.9.1