diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java
index ae40e71..d0b0863 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/controller/api/WmsPdaApiController.java
@@ -72,7 +72,7 @@ public class WmsPdaApiController extends BaseController {
         if (wmsBaseLocationVo == null) {
             return R.fail("库位条码扫描错误");
         }
-        vo.setWarehouseId(wmsBaseLocationVo.getWarehouseId());
+         vo.setWarehouseId(wmsBaseLocationVo.getWarehouseId());
         Boolean result = apiService.inSubmit(vo);
         return result ? R.ok() : R.fail();
     }
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseLocation.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseLocation.java
index a89d98a..d834d01 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseLocation.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/WmsBaseLocation.java
@@ -27,10 +27,11 @@ public class WmsBaseLocation extends TenantEntity {
     @TableId(type = IdType.AUTO,value = "location_id")
     private Long locationId;
 
-//    /**
-//     * 所属仓库
-//     */
-//    private Long warehouseId;
+    /**
+     * 所属仓库
+     */
+    @TableField(exist = false)
+    private Long warehouseId;
     /**
      * 所属仓库仓库区域
      */
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseLocationVo.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseLocationVo.java
index e999960..cc13abf 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseLocationVo.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/domain/vo/WmsBaseLocationVo.java
@@ -32,11 +32,10 @@ public class WmsBaseLocationVo implements Serializable {
     @ExcelProperty(value = "表主键")
     private Long locationId;
 
-//    /**
-//     * 所属仓库
-//     */
-//    @ExcelProperty(value = "所属仓库")
-//    private Long warehouseId;
+    /**
+     * 所属仓库
+     */
+    private Long warehouseId;//join
     /**
      * 所属仓库仓库区域
      */
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java
index 743b3c3..83cf309 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsBaseLocationServiceImpl.java
@@ -155,8 +155,8 @@ public class WmsBaseLocationServiceImpl implements IWmsBaseLocationService {
 
 //            .select(WmsBaseWarehouse::getWarehouseName,WmsBaseWarehouse::getWarehouseCode)
 //            .leftJoin(WmsBaseWarehouse.class,WmsBaseWarehouse::getWarehouseId,WmsBaseLocation::getWarehouseId)
-            //关联仓库改为关联区域
-            .select(WmsBaseArea::getAreaName, WmsBaseArea::getAreaCode)
+            //关联仓库改为关联区域,通过区域查仓库
+            .select(WmsBaseArea::getAreaName, WmsBaseArea::getAreaCode, WmsBaseArea::getWarehouseId)
             .leftJoin(WmsBaseArea.class,WmsBaseArea::getAreaId,WmsBaseLocation::getAreaId)
 
             .eq( WmsBaseLocation::getLocationCode, code);
diff --git a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
index 33d5b32..14c57e1 100644
--- a/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
+++ b/ruoyi-modules/hwmom-wms/src/main/java/org/dromara/wms/service/impl/WmsPdaApiServiceImpl.java
@@ -44,7 +44,26 @@ public class WmsPdaApiServiceImpl implements IWmsPdaApiService {
 
     @Override
     public WmsOutstockRecordVo returnSelectCode(String code) {
-        MPJLambdaWrapper<WmsOutstockRecord> lqw = JoinWrappers.lambda(WmsOutstockRecord.class).selectAll(WmsOutstockRecord.class).select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName, BaseMaterialInfo::getMaterialUnit, BaseMaterialInfo::getMaterialSpec).leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockRecord::getMaterialId).select(WmsBaseLocation::getWarehouseId).leftJoin(WmsBaseLocation.class, WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode).eq(WmsOutstockRecord::getBatchCode, code).eq(WmsOutstockRecord::getReturnFlag, 0).orderByDesc(WmsOutstockRecord::getCreateTime);
+        MPJLambdaWrapper<WmsOutstockRecord> lqw = JoinWrappers.lambda(WmsOutstockRecord.class)
+            .selectAll(WmsOutstockRecord.class)
+
+            .select(BaseMaterialInfo::getMaterialCode, BaseMaterialInfo::getMaterialName, BaseMaterialInfo::getMaterialUnit, BaseMaterialInfo::getMaterialSpec)
+            .leftJoin(BaseMaterialInfo.class, BaseMaterialInfo::getMaterialId, WmsOutstockRecord::getMaterialId)
+
+//            .select(WmsBaseLocation::getWarehouseId)
+//            .leftJoin(WmsBaseLocation.class, WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode)
+            /*  关联仓库改为关联区域,先查区域再查仓库   */
+            // 关联库位信息获取区域ID
+            .select(WmsBaseLocation::getAreaId)
+            .leftJoin(WmsBaseLocation.class, WmsBaseLocation::getLocationCode, WmsOutstockRecord::getLocationCode)
+            // 关联区域信息获取仓库ID
+            .select(WmsBaseArea::getWarehouseId)
+            .leftJoin(WmsBaseArea.class, WmsBaseArea::getAreaId, WmsBaseLocation::getAreaId)
+
+            .eq(WmsOutstockRecord::getBatchCode, code)
+            .eq(WmsOutstockRecord::getReturnFlag, 0)
+            .orderByDesc(WmsOutstockRecord::getCreateTime);
+
         return wmsOutstockRecordMapper.selectVoOne(lqw);
     }