From 92deba199598dd5c483fa1e9fff0a857483e5564 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 30 五月 2025 15:25:08 +0800
Subject: [PATCH] #移库找库位优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java |   17 ++++++++++++-----
 1 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
index 6868f52..3950c36 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/WcsServiceImpl.java
@@ -516,7 +516,13 @@
                             .in(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_D.type, LocStsType.LOC_STS_TYPE_F.type)
                             .eq(Loc::getAreaId, area)
                     );
+
                     if (!Cools.isEmpty(locMast2)) {
+                        if (null != orgMoveLoc){
+                            if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
+                                break;
+                            }
+                        }
                         loc = locMast1;
                         break;
                     } else {
@@ -525,12 +531,13 @@
                                 .eq(Loc::getUseStatus, LocStsType.LOC_STS_TYPE_O.type)
                                 .eq(Loc::getAreaId, area)
                         );
-                        if (null != orgMoveLoc){
-                            if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
-                                break;
-                            }
-                        }
+
                         if (!Cools.isEmpty(locMast2)) {
+                            if (null != orgMoveLoc){
+                                if (!locMast2.getChannel().equals(orgMoveLoc.getChannel())) {
+                                    break;
+                                }
+                            }
                             loc = locMast2;
                             break;
                         }

--
Gitblit v1.9.1