From 6a1b04daaa0b144a8a7131e3449db57e185498cc Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 15 七月 2025 14:04:25 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   17 ++++++++++++++++-
 1 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index e81ef2d..ae419d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -338,7 +338,22 @@
 //            }
 
             // 鑾峰彇璺緞
-            StaDesc staDesc = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+            List<StaDesc> staDescs = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
+            StaDesc staDesc = staDescs.get(0);
+            if (locMast.getCrnNo() == 1) {
+                int finalCrnStn = 1016;
+                if (locMast.getRow1() <= 3) {
+                    finalCrnStn = 1013;
+                }
+
+                for (StaDesc desc : staDescs) {
+                    if (desc.getCrnStn() == finalCrnStn) {
+                        staDesc = desc;
+                        break;
+                    }
+                }
+            }
+
             // 鐢熸垚宸ヤ綔鍙�
             int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
 

--
Gitblit v1.9.1