From 24521db25a2841447bb46ca647e4ebdb6155d642 Mon Sep 17 00:00:00 2001
From: gongbaoxiong <751575283@qq.com>
Date: Tue, 17 Mar 2026 17:18:35 +0800
Subject: [PATCH] =?UTF-8?q?opt:=E4=BC=98=E5=8C=96=E8=BD=BD=E5=85=B7?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dao/MdPbStoragevehicletype.java      |  2 +-
 .../impl/MdPbStoragevehicletypeServiceImpl.java  | 16 +++++++++++-----
 .../service/impl/SchBaseRegionServiceImpl.java   |  5 +++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java
index 8725530..8279f5d 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/dao/MdPbStoragevehicletype.java
@@ -24,7 +24,7 @@ public class MdPbStoragevehicletype {
     private String storagevehicle_btype;
     private String storagevehicle_size;
     /**
-     * 1.RT16  2.PS20  3.RT16和PS20
+     * 1.RT16（3层）  2.PS20(四层）  3.RT16和PS20
      */
     private String suitable_car;
     private String storagevehicle_name;
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java
index abd8a32..2d06099 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/basedata_manage/service/impl/MdPbStoragevehicletypeServiceImpl.java
@@ -11,17 +11,23 @@ import org.nl.wms.basedata_manage.service.dao.MdPbStoragevehicletype;
 import org.nl.wms.basedata_manage.service.dao.mapper.MdPbStoragevehicletypeMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class MdPbStoragevehicletypeServiceImpl extends ServiceImpl<MdPbStoragevehicletypeMapper, MdPbStoragevehicletype> implements IMdPbStoragevehicletypeService {
     @Override
     public MdPbStoragevehicletype getByCode(String storagevehicle_stype) {
-        MdPbStoragevehicletype one = this.getOne(
+        List<MdPbStoragevehicletype> list = this.list(
                 new QueryWrapper<MdPbStoragevehicletype>().lambda()
-                        .eq(MdPbStoragevehicletype::getStoragevehicle_stype, storagevehicle_stype)
-        );
-        if (ObjectUtil.isEmpty(one)) {
+                        .and(wrapper -> wrapper
+                                .eq(MdPbStoragevehicletype::getStoragevehicle_stype, storagevehicle_stype)
+                                .or()
+                                .eq(MdPbStoragevehicletype::getStoragevehicle_btype, storagevehicle_stype)
+                        ));
+        if (ObjectUtil.isEmpty(list)) {
             throw new BadRequestException("载具类型为【"+storagevehicle_stype+"】的不存在!");
         }
-        return one;
+        return list.get(0);
     }
+
 }
diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java
index 5d816bf..c1571a7 100644
--- a/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java
+++ b/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch_manage/service/impl/SchBaseRegionServiceImpl.java
@@ -82,6 +82,11 @@ public class SchBaseRegionServiceImpl extends ServiceImpl<SchBaseRegionMapper, S
         schBaseRegionMapper.deleteBatchIds(ids);
     }
 
+    @Override
+    public void relse() {
+
+    }
+
     @Override
     public List<SchBaseRegion> getRegionList(SchBaseRegion region) {
         return schBaseRegionMapper.selectList(new LambdaQueryWrapper<SchBaseRegion>()