From bf45b4a613f0c1fa723e1d03b16cd7d1c79f1f04 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 12 八月 2025 08:34:58 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   27 ++++++++++++++++++++++++++-
 1 files changed, 26 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 7f833a0..46e6205 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -466,6 +466,15 @@
         OrderPakout orderPakout = orderPakOutService.selectByNo(orderNo);
         int ioType = orderPakout.getDocType() == 8 ? 107 : (taskDto.isAll() ? 101 : 103);
         StaDesc staDesc = staDescService.queryCrnStnAuto(ioType, locMast.getCrnNo(), staNo.getDevNo(),locMast.getRow1());
+        Integer crnStn = staDesc.getCrnStn();
+        if (locMast.getCrnNo() == 1) {
+            if (locMast.getRow1() <= 3) {
+                crnStn = 1013;
+            }else {
+                crnStn = 1016;
+            }
+        }
+
         // 鐢熸垚宸ヤ綔鍙�
         int workNo = commonService.getWorkNo(WorkNoType.getWorkNoType(ioType));
         // 鐢熸垚宸ヤ綔妗�
@@ -476,7 +485,7 @@
         wrkMast.setIoType(ioType); // 鍏ュ嚭搴撶姸鎬�
         wrkMast.setIoPri(13D); // 浼樺厛绾э細13
         wrkMast.setCrnNo(locMast.getCrnNo());
-        wrkMast.setSourceStaNo(staDesc.getCrnStn()); // 婧愮珯
+        wrkMast.setSourceStaNo(crnStn); // 婧愮珯
         wrkMast.setStaNo(staDesc.getStnNo()); // 鐩爣绔�
         wrkMast.setSourceLocNo(taskDto.getLocNo()); // 婧愬簱浣�
         wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -665,6 +674,14 @@
             if (Cools.isEmpty(sourceStaNo)) {
                 throw new CoolException("妫�绱㈡簮绔欏け璐�");
             }
+            if (locMast.getCrnNo() == 1) {
+                if (locMast.getRow1() <= 3) {
+                    sourceStaNo = 1013;
+                }else {
+                    sourceStaNo = 1016;
+                }
+            }
+
             Date now = new Date();
             // 淇濆瓨宸ヤ綔妗�
             WrkMast wrkMast = new WrkMast();
@@ -727,6 +744,14 @@
             if (Cools.isEmpty(sourceStaNo)) {
                 throw new CoolException("妫�绱㈡簮绔欏け璐�");
             }
+            if (locMast.getCrnNo() == 1) {
+                if (locMast.getRow1() <= 3) {
+                    sourceStaNo = 1013;
+                }else {
+                    sourceStaNo = 1016;
+                }
+            }
+
             Date now = new Date();
             // 淇濆瓨宸ヤ綔妗�
 

--
Gitblit v1.9.1