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 ++++++++++++++++-
 src/main/java/com/zy/asrs/service/StaDescService.java          |    2 +-
 src/main/java/com/zy/common/web/WcsController.java             |    2 +-
 src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java |    8 ++++----
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/StaDescService.java b/src/main/java/com/zy/asrs/service/StaDescService.java
index 13d18b8..d33cfe6 100644
--- a/src/main/java/com/zy/asrs/service/StaDescService.java
+++ b/src/main/java/com/zy/asrs/service/StaDescService.java
@@ -9,7 +9,7 @@
 
     List<Integer> queryOutStaNosByLocNo(String locNo, Integer typeNo);
 
-    StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo);
+    List<StaDesc> queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo);
 
     StaDesc queryCrnStnAuto(Integer typeNo, Integer crnNo, Integer stnNo);
 
diff --git a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
index 2e4d7bf..47ce3d8 100644
--- a/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/StaDescServiceImpl.java
@@ -30,16 +30,16 @@
     }
 
     @Override
-    public StaDesc queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
+    public List<StaDesc> queryCrnStn(Integer typeNo, Integer crnNo, Integer stnNo) {
         Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>()
                 .eq("type_no", typeNo)
                 .eq("stn_no", stnNo)
                 .eq("crn_no", crnNo);
-        StaDesc staDesc = this.selectOne(wrapper);
-        if (staDesc == null) {
+        List<StaDesc> staDescs = this.selectList(wrapper);
+        if (staDescs.isEmpty()) {
             throw new CoolException("鍑哄簱璺緞涓嶅瓨鍦�");
         }
-        return staDesc;
+        return staDescs;
     }
 
     @Override
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));
 
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index e603183..7adca3c 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -199,7 +199,7 @@
         wrkMast.setIoTime(new Date());
         wrkMast.setWrkSts(2L); // 宸ヤ綔鐘舵�侊細鐢熸垚鍏ュ簱ID
         wrkMast.setIoType(1); // 鍏ュ嚭搴撶姸鎬侊細1.鍏ュ簱
-        wrkMast.setIoPri(13D); // 浼樺厛绾�
+        wrkMast.setIoPri(30D); // 浼樺厛绾�
         wrkMast.setCrnNo(dto.getCrnNo());
         wrkMast.setSourceStaNo(dto.getSourceStaNo());
         wrkMast.setStaNo(dto.getStaNo());

--
Gitblit v1.9.1