From 41254cb6289ac8f52b03c3526d73993211b37309 Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期四, 16 四月 2026 15:46:43 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index bff9634..8e17f45 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -212,8 +212,10 @@
                     .eq("deleted", 0)
                     .eq("whs_type", 1)
                     .orderBy("lev1,bay1"));
-            if (Cools.isEmpty(locMasts) || locMasts.size() > 15) {
-                locMast = locMasts.get(0);
+            if (!Cools.isEmpty(locMasts)) {
+                if (locMasts.size() > 15) {
+                    locMast = locMasts.get(0);
+                }
             }
         }
         int crnNo1 = crnNo + 1;
@@ -253,6 +255,7 @@
         startupDto.setCrnNo(crnNo);
         startupDto.setSourceStaNo(sourceStaNo);
         startupDto.setLocNo(locNo);
+        startupDto.setStaNo(staDesc.getCrnStn());
         return startupDto;
     }
 

--
Gitblit v1.9.1