From 4f12e174fc86f7661ce25020863b05b079236582 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 06 六月 2025 14:54:56 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/service/CommonService.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index e4003f1..061be6c 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -409,13 +409,13 @@
                             locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                     .eq("loc_no", shallowLoc).eq("loc_sts", "F").eq("whs_type",rowLastnoType.getType().longValue()));
                             if (!Cools.isEmpty(locMast2)) {
-                                locMast = locMast2;
+                                locMast = locMast1;
                                 break;
                             } else {
                                 locMast2 = locMastService.selectOne(new EntityWrapper<LocMast>()
                                         .eq("loc_no", shallowLoc).eq("loc_sts", "D").eq("whs_type",rowLastnoType.getType().longValue()));
                                 if (!Cools.isEmpty(locMast2)) {
-                                    locMast = locMast2;
+                                    locMast = locMast1;
                                     break;
                                 }
                             }

--
Gitblit v1.9.1