From 12ef5e75adbba166b4c6fdaf4b1ea624dc30b22b Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期二, 06 一月 2026 14:34:03 +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 2c2f6a3..29de1be 100644
--- a/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java
@@ -2270,7 +2270,7 @@
                         param.setLocType1(locTypeDto.getLocType1());
                         String path = "/rpc/pakin/loc/v1";
 
-                        if (staProtocol.getStaNo()==1908){
+                        if (emptyInSta.getStaNo()==1908){
                             param.setRgvNo(1);
                             path = "/rpc/pakin/empty/loc/v1";
                         }
@@ -2284,7 +2284,7 @@
                         if (jsonObject.getInteger("code").equals(200)) {
                             StartupDto dto = jsonObject.getObject("data", StartupDto.class);
                             Integer staNo = dto.getStaNo();
-                            if (staProtocol.getStaNo()==1908){
+                            if (emptyInSta.getStaNo()==1908){
                                 staNo = 1907;
                             }
                             // 鏇存柊绔欑偣淇℃伅 涓� 涓嬪彂plc鍛戒护
@@ -3796,7 +3796,7 @@
                         case 5:////婊″彇
                             signWork = rgvRunWrkMastEmptyStaTakeFull(rgvSlave);
                             break;
-                        case 6:////鎻愬崌
+                        case 6:////鎻愬崌4 绉诲姩
 //                            signWork = qwe();
                             signWork = rgvRunWrkMastMove(rgvSlave);
                             break;
@@ -4022,7 +4022,7 @@
                     if (!basDevp.getAutoing().equals("Y")){
                         continue;
                     }
-                    if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
+                    if (basDevp.getDevNo()>119 && basDevp.getDevNo()<122){
                         if (basDevp.getEmptyMk().equals("Y")){
                             continue;
                         }

--
Gitblit v1.9.1