From fcd35daf35247eb3c0b087f2042de1fd9013b5b6 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 06 八月 2025 14:27:50 +0800
Subject: [PATCH] 1

---
 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java |   16 ++++++----------
 1 files changed, 6 insertions(+), 10 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 45865c7..d2a15f0 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -340,17 +340,12 @@
             // 鑾峰彇璺緞
             List<StaDesc> staDescs = staDescService.queryCrnStn(ioType, locMast.getCrnNo(), outSta);
             StaDesc staDesc = staDescs.get(0);
+            Integer crnStn = staDesc.getCrnStn();
             if (locMast.getCrnNo() == 1) {
-                int finalCrnStn = 1016;
                 if (locMast.getRow1() <= 3) {
-                    finalCrnStn = 1013;
-                }
-
-                for (StaDesc desc : staDescs) {
-                    if (desc.getCrnStn() == finalCrnStn) {
-                        staDesc = desc;
-                        break;
-                    }
+                    crnStn = 1013;
+                }else {
+                    crnStn = 1016;
                 }
             }
 
@@ -378,7 +373,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(dto.getLocNo()); // 婧愬簱浣�
             wrkMast.setFullPlt("Y"); // 婊℃澘锛歒
@@ -542,6 +537,7 @@
             wrkDetl.setStockNum(locDetl.getAnfme());//搴撳瓨
             wrkDetl.setStockNum2(locDetl.getWeight());//杈呭簱瀛�
             wrkDetl.setKpCstmrName(orderPakout.getKpCstmrName());
+            wrkDetl.setCstateid(locDetl.getCstateid());
 
             //璁$畻杈呮暟閲�
             Double weight = MatUtils.calcWeight(wrkDetl.getMatnr(), wrkDetl.getAnfme());

--
Gitblit v1.9.1