✨ feat(mes): 优化库存选择器和退货明细表单布局

调整库存选择器为下拉选择组件，支持前端过滤，提升用户体验。更新退货明细表单，增加库存记录选择，优化表单布局，确保信息展示更为清晰。

✨ feat(mes): 优化库存选择器和退货明细表单布局
调整库存选择器为下拉选择组件，支持前端过滤，提升用户体验。更新退货明细表单，增加库存记录选择，优化表单布局，确保信息展示更为清晰。
YunaiV
1 parent 8ac57045
Showing 32 changed files with 130 additions and 62 deletions
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/machinery/MesDvMachineryController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/dv/subject/MesDvSubjectController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/tm/tool/MesTmToolController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/batch/MesWmBatchController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/materialstock/MesWmMaterialStockController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/packages/MesWmPackageController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/detail/MesWmReturnVendorDetailSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineRespVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/returnvendor/vo/line/MesWmReturnVendorLineSaveReqVO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseAreaController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/warehouse/MesWmWarehouseLocationController.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/dal/dataobject/wm/returnvendor/MesWmReturnVendorLineDO.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/machinery/MesDvMachineryServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/dv/subject/MesDvSubjectServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolService.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/tm/tool/MesTmToolServiceImpl.java
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchService.java
@@ -112,7 +112,7 @@ public class MesDvMachineryController {
     @Operation(summary = "获得设备精简列表", description = "主要用于前端的下拉选项")
     @PreAuthorize("@ss.hasPermission('mes:dv-machinery:query')")
     public CommonResult<List<MesDvMachineryRespVO>> getMachinerySimpleList() {
-        List<MesDvMachineryDO> list = machineryService.getMachinerySimpleList();
+        List<MesDvMachineryDO> list = machineryService.getMachineryList();
         return success(BeanUtils.toBean(list, MesDvMachineryRespVO.class));
     }
  
@@ -81,7 +81,7 @@ public class MesDvSubjectController {
     @Operation(summary = "获得点检保养项目精简列表", description = "主要用于前端的下拉选项")
     @PreAuthorize("@ss.hasPermission('mes:dv-subject:query')")
     public CommonResult<List<MesDvSubjectRespVO>> getSubjectSimpleList() {
-        List<MesDvSubjectDO> list = subjectService.getSubjectSimpleList();
+        List<MesDvSubjectDO> list = subjectService.getSubjectList();
         return success(BeanUtils.toBean(list, MesDvSubjectRespVO.class));
     }
  
@@ -113,7 +113,7 @@ public class MesTmToolController {
     @Operation(summary = "获得工具精简列表")
     @PreAuthorize("@ss.hasPermission('mes:tm-tool:query')")
     public CommonResult<List<MesTmToolRespVO>> getToolSimpleList() {
-        List<MesTmToolDO> list = toolService.getToolSimpleList();
+        List<MesTmToolDO> list = toolService.getToolList();
         return success(BeanUtils.toBean(list, MesTmToolRespVO.class));
     }
  
@@ -96,6 +96,13 @@ public class MesWmBatchController {
         return success(buildBatchRespVOList(list));
     }
  
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得批次精简列表", description = "主要用于前端下拉")
+    public CommonResult<List<MesWmBatchRespVO>> getBatchSimpleList() {
+        List<MesWmBatchDO> list = batchService.getBatchList();
+        return success(BeanUtils.toBean(list, MesWmBatchRespVO.class));
+    }
+
     // ==================== 拼接 VO ====================
  
     private List<MesWmBatchRespVO> buildBatchRespVOList(List<MesWmBatchDO> list) {
@@ -113,6 +113,15 @@ public class MesWmMaterialStockController {
                 buildRespVOList(pageResult.getList()));
     }
  
+    @GetMapping("/simple-list")
+    @Operation(summary = "获得库存精简列表", description = "主要用于前端下拉，可按 itemId 过滤")
+    @Parameter(name = "itemId", description = "物料编号", example = "1")
+    public CommonResult<List<MesWmMaterialStockRespVO>> getMaterialStockSimpleList(
+            @RequestParam(value = "itemId", required = false) Long itemId) {
+        List<MesWmMaterialStockDO> list = materialStockService.getMaterialStockList(itemId);
+        return success(buildRespVOList(list));
+    }
+
     // ==================== 拼接 VO ====================
  
     private List<MesWmMaterialStockRespVO> buildRespVOList(List<MesWmMaterialStockDO> list) {
@@ -129,7 +129,7 @@ public class MesWmPackageController {
     @Operation(summary = "可添加为子箱的装箱单精简列表")
     @PreAuthorize("@ss.hasPermission('mes:wm-package:query')")
     public CommonResult<List<MesWmPackageRespVO>> getChildablePackageSimpleList() {
-        List<MesWmPackageDO> list = packageService.getChildablePackageSimpleList();
+        List<MesWmPackageDO> list = packageService.getChildablePackageList();
         return success(buildRespVOList(list));
     }
  
@@ -26,6 +26,9 @@ public class MesWmReturnVendorDetailSaveReqVO {
     @NotNull(message = "物料编号不能为空")
     private Long itemId;
  
+    @Schema(description = "库存记录编号", example = "1")
+    private Long materialStockId;
+
     @Schema(description = "退货数量", requiredMode = Schema.RequiredMode.REQUIRED, example = "300.00")
     @NotNull(message = "退货数量不能为空")
     @DecimalMin(value = "0", inclusive = false, message = "退货数量必须大于 0")
@@ -37,6 +37,9 @@ public class MesWmReturnVendorLineRespVO {
     @Schema(description = "批次ID", example = "1")
     private Long batchId;
  
+    @Schema(description = "批次号", example = "BATCH20260101001")
+    private String batchCode;
+
     @Schema(description = "备注", example = "备注")
     private String remark;
  
@@ -30,6 +30,9 @@ public class MesWmReturnVendorLineSaveReqVO {
     @Schema(description = "批次ID", example = "1")
     private Long batchId;
  
+    @Schema(description = "批次号", example = "BATCH20260101001")
+    private String batchCode;
+
     @Schema(description = "备注", example = "备注")
     private String remark;
  
@@ -26,7 +26,6 @@ import org.springframework.web.bind.annotation.*;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
  
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
@@ -94,7 +93,7 @@ public class MesWmWarehouseAreaController {
     @Operation(summary = "获得库位精简列表", description = "可按库区过滤")
     public CommonResult<List<MesWmWarehouseAreaRespVO>> getWarehouseAreaSimpleList(
             @Parameter(name = "locationId", description = "库区编号") @RequestParam(value = "locationId", required = false) Long locationId) {
-        List<MesWmWarehouseAreaDO> list = areaService.getWarehouseAreaSimpleList(locationId);
+        List<MesWmWarehouseAreaDO> list = areaService.getWarehouseAreaList(locationId);
         return success(buildWarehouseAreaRespVOList(list));
     }
  
@@ -74,7 +74,7 @@ public class MesWmWarehouseController {
     @GetMapping("/simple-list")
     @Operation(summary = "获得仓库精简列表", description = "主要用于前端下拉")
     public CommonResult<List<MesWmWarehouseRespVO>> getWarehouseSimpleList() {
-        List<MesWmWarehouseDO> list = warehouseService.getWarehouseSimpleList();
+        List<MesWmWarehouseDO> list = warehouseService.getWarehouseList();
         return success(BeanUtils.toBean(list, MesWmWarehouseRespVO.class));
     }
  
@@ -90,7 +90,7 @@ public class MesWmWarehouseLocationController {
     @Operation(summary = "获得库区精简列表", description = "可按仓库过滤")
     public CommonResult<List<MesWmWarehouseLocationRespVO>> getWarehouseLocationSimpleList(
             @Parameter(name = "warehouseId", description = "仓库编号") @RequestParam(value = "warehouseId", required = false) Long warehouseId) {
-        List<MesWmWarehouseLocationDO> list = locationService.getWarehouseLocationSimpleList(warehouseId);
+        List<MesWmWarehouseLocationDO> list = locationService.getWarehouseLocationList(warehouseId);
         return success(buildWarehouseLocationRespVOList(list));
     }
  
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor;
  
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -45,9 +46,17 @@ public class MesWmReturnVendorLineDO extends BaseDO {
     private BigDecimal quantity;
     /**
      * 批次 ID
+     *
+     * 关联 {@link MesWmBatchDO#getId()}
      */
     private Long batchId;
     /**
+     * 批次号
+     *
+     * 关联 {@link MesWmBatchDO#getCode()}
+     */
+    private String batchCode;
+    /**
      * 备注
      */
     private String remark;
@@ -73,11 +73,11 @@ public interface MesDvMachineryService {
     void validateMachineryExists(Long id);
  
     /**
-     * 获得设备精简列表（下拉选项用）
+     * 获得设备列表
      *
      * @return 设备列表
      */
-    List<MesDvMachineryDO> getMachinerySimpleList();
+    List<MesDvMachineryDO> getMachineryList();
  
     /**
      * 获得设备列表
@@ -127,7 +127,7 @@ public class MesDvMachineryServiceImpl implements MesDvMachineryService {
     }
  
     @Override
-    public List<MesDvMachineryDO> getMachinerySimpleList() {
+    public List<MesDvMachineryDO> getMachineryList() {
         return machineryMapper.selectList();
     }
  
@@ -65,11 +65,11 @@ public interface MesDvSubjectService {
     void validateSubjectExists(Long id);
  
     /**
-     * 获得点检保养项目精简列表（下拉选项用）
+     * 获得点检保养项目列表
      *
      * @return 项目列表
      */
-    List<MesDvSubjectDO> getSubjectSimpleList();
+    List<MesDvSubjectDO> getSubjectList();
  
     /**
      * 获得点检保养项目列表
@@ -93,7 +93,7 @@ public class MesDvSubjectServiceImpl implements MesDvSubjectService {
     }
  
     @Override
-    public List<MesDvSubjectDO> getSubjectSimpleList() {
+    public List<MesDvSubjectDO> getSubjectList() {
         return subjectMapper.selectList();
     }
  
@@ -54,10 +54,10 @@ public interface MesTmToolService {
     PageResult<MesTmToolDO> getToolPage(MesTmToolPageReqVO pageReqVO);
  
     /**
-     * 获得工具精简列表
+     * 获得工具列表
      *
      * @return 工具列表
      */
-    List<MesTmToolDO> getToolSimpleList();
+    List<MesTmToolDO> getToolList();
  
 }
@@ -119,7 +119,7 @@ public class MesTmToolServiceImpl implements MesTmToolService {
     }
  
     @Override
-    public List<MesTmToolDO> getToolSimpleList() {
+    public List<MesTmToolDO> getToolList() {
         return toolMapper.selectList();
     }
  
@@ -68,4 +68,11 @@ public interface MesWmBatchService {
      */
     List<MesWmBatchDO> getBackwardBatchList(String code);
  
+    /**
+     * 获取批次列表
+     *
+     * @return 批次列表
+     */
+    List<MesWmBatchDO> getBatchList();
+
 }
@@ -220,4 +220,9 @@ public class MesWmBatchServiceImpl implements MesWmBatchService {
         return results;
     }
  
+    @Override
+    public List<MesWmBatchDO> getBatchList() {
+        return batchMapper.selectList();
+    }
+
 }
@@ -29,19 +29,6 @@ public interface MesWmMaterialStockService {
     MesWmMaterialStockDO getMaterialStock(Long id);
  
     /**
-     * 按组合键查询库存记录
-     *
-     * @param itemId      物料编号
-     * @param warehouseId 仓库编号
-     * @param locationId  库区编号
-     * @param areaId      库位编号
-     * @param batchId     批次编号
-     * @return 库存记录，不存在返回 null
-     */
-    MesWmMaterialStockDO getMaterialStockByCompositeKey(Long itemId, Long warehouseId, Long locationId,
-                                                        Long areaId, Long batchId);
-
-    /**
      * 查询指定库位的库存记录列表
      *
      * @param areaId 库位编号
@@ -109,6 +96,14 @@ public interface MesWmMaterialStockService {
     }
  
     /**
+     * 获得库存精简列表（用于前端下拉选择）
+     *
+     * @param itemId 物料编号（可为 null）
+     * @return 库存记录列表
+     */
+    List<MesWmMaterialStockDO> getMaterialStockList(Long itemId);
+
+    /**
      * 获取或创建库存记录（按组合键唯一）
      *
      * @param itemId         物料编号
@@ -50,12 +50,6 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService 
     }
  
     @Override
-    public MesWmMaterialStockDO getMaterialStockByCompositeKey(Long itemId, Long warehouseId, Long locationId,
-                                                               Long areaId, Long batchId) {
-        return materialStockMapper.selectByCompositeKey(itemId, warehouseId, locationId, areaId, batchId);
-    }
-
-    @Override
     public List<MesWmMaterialStockDO> getMaterialStockListByAreaId(Long areaId) {
         return materialStockMapper.selectList(MesWmMaterialStockDO::getAreaId, areaId);
     }
@@ -127,6 +121,14 @@ public class MesWmMaterialStockServiceImpl implements MesWmMaterialStockService 
     }
  
     @Override
+    public List<MesWmMaterialStockDO> getMaterialStockList(Long itemId) {
+        if (itemId != null) {
+            return materialStockMapper.selectList(MesWmMaterialStockDO::getItemId, itemId);
+        }
+        return materialStockMapper.selectList();
+    }
+
+    @Override
     public MesWmMaterialStockDO getOrCreateMaterialStock(Long itemId, Long warehouseId, Long locationId, Long areaId,
                                                          Long batchId, String batchCode, Long vendorId, LocalDateTime receiptTime) {
         // 1. 查找已有库存记录
@@ -83,10 +83,10 @@ public interface MesWmPackageService {
     void removeChildPackage(Long childId);
  
     /**
-     * 可添加为子箱的装箱单精简列表（无父箱 + 已完成状态）
+     * 可添加为子箱的装箱单列表（无父箱 + 已完成状态）
      *
      * @return 装箱单列表
      */
-    List<MesWmPackageDO> getChildablePackageSimpleList();
+    List<MesWmPackageDO> getChildablePackageList();
  
 }
@@ -137,7 +137,7 @@ public class MesWmPackageServiceImpl implements MesWmPackageService {
     }
  
     @Override
-    public List<MesWmPackageDO> getChildablePackageSimpleList() {
+    public List<MesWmPackageDO> getChildablePackageList() {
         return packageMapper.selectChildableList();
     }
  
@@ -3,10 +3,12 @@ package cn.iocoder.yudao.module.mes.service.wm.returnvendor;
 import cn.hutool.core.util.ObjUtil;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.mes.controller.admin.wm.returnvendor.vo.detail.MesWmReturnVendorDetailSaveReqVO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstock.MesWmMaterialStockDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorDetailDO;
 import cn.iocoder.yudao.module.mes.dal.dataobject.wm.returnvendor.MesWmReturnVendorLineDO;
 import cn.iocoder.yudao.module.mes.dal.mysql.wm.returnvendor.MesWmReturnVendorDetailMapper;
 import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
+import cn.iocoder.yudao.module.mes.service.wm.materialstock.MesWmMaterialStockService;
 import jakarta.annotation.Resource;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -15,8 +17,7 @@ import org.springframework.validation.annotation.Validated;
 import java.util.List;
  
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_DETAIL_ITEM_MISMATCH;
-import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_RETURN_VENDOR_DETAIL_NOT_EXISTS;
+import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
  
 /**
  * MES 供应商退货明细 Service 实现类
@@ -35,14 +36,13 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
     @Resource
     private MesMdItemService itemService;
  
+    @Resource
+    private MesWmMaterialStockService materialStockService;
+
     @Override
     public Long createReturnVendorDetail(MesWmReturnVendorDetailSaveReqVO createReqVO) {
-        // 校验父数据存在
-        MesWmReturnVendorLineDO line = returnVendorLineService.validateReturnVendorLineExists(createReqVO.getLineId());
-        // 校验物料存在
-        itemService.validateItemExists(createReqVO.getItemId());
-        // 校验物料与行物料一致
-        validateItemConsistency(createReqVO.getItemId(), line);
+        // 校验数据
+        validateDetailSaveData(createReqVO);
  
         // 插入
         MesWmReturnVendorDetailDO detail = BeanUtils.toBean(createReqVO, MesWmReturnVendorDetailDO.class);
@@ -54,18 +54,28 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
     public void updateReturnVendorDetail(MesWmReturnVendorDetailSaveReqVO updateReqVO) {
         // 校验存在
         validateReturnVendorDetailExists(updateReqVO.getId());
-        // 校验父数据存在
-        MesWmReturnVendorLineDO line = returnVendorLineService.validateReturnVendorLineExists(updateReqVO.getLineId());
-        // 校验物料存在
-        itemService.validateItemExists(updateReqVO.getItemId());
-        // 校验物料与行物料一致
-        validateItemConsistency(updateReqVO.getItemId(), line);
+        // 校验数据
+        validateDetailSaveData(updateReqVO);
  
         // 更新
         MesWmReturnVendorDetailDO updateObj = BeanUtils.toBean(updateReqVO, MesWmReturnVendorDetailDO.class);
         returnVendorDetailMapper.updateById(updateObj);
     }
  
+    /**
+     * 校验明细创建/修改的公共数据
+     */
+    private void validateDetailSaveData(MesWmReturnVendorDetailSaveReqVO reqVO) {
+        // 校验父数据（行）存在
+        MesWmReturnVendorLineDO line = returnVendorLineService.validateReturnVendorLineExists(reqVO.getLineId());
+        // 校验物料存在
+        itemService.validateItemExists(reqVO.getItemId());
+        // 校验物料与行物料一致
+        validateItemConsistency(reqVO.getItemId(), line);
+        // 校验库存记录存在且物料一致
+        validateMaterialStock(reqVO.getMaterialStockId(), line);
+    }
+
     @Override
     public void deleteReturnVendorDetail(Long id) {
         // 校验存在
@@ -114,4 +124,20 @@ public class MesWmReturnVendorDetailServiceImpl implements MesWmReturnVendorDeta
         }
     }
  
+    /**
+     * 校验库存记录存在且物料与行物料一致
+     */
+    private void validateMaterialStock(Long materialStockId, MesWmReturnVendorLineDO line) {
+        if (materialStockId == null) {
+            return;
+        }
+        MesWmMaterialStockDO stock = materialStockService.getMaterialStock(materialStockId);
+        if (stock == null) {
+            throw exception(WM_MATERIAL_STOCK_NOT_EXISTS);
+        }
+        if (ObjUtil.notEqual(stock.getItemId(), line.getItemId())) {
+            throw exception(WM_RETURN_VENDOR_DETAIL_ITEM_MISMATCH);
+        }
+    }
+
 }
@@ -64,12 +64,12 @@ public interface MesWmWarehouseAreaService {
     PageResult<MesWmWarehouseAreaDO> getWarehouseAreaPage(MesWmWarehouseAreaPageReqVO pageReqVO);
  
     /**
-     * 按库区获得库位精简列表
+     * 按库区获得库位列表
      *
      * @param locationId 库区编号
      * @return 库位列表
      */
-    List<MesWmWarehouseAreaDO> getWarehouseAreaSimpleList(Long locationId);
+    List<MesWmWarehouseAreaDO> getWarehouseAreaList(Long locationId);
  
     /**
      * 按编号集合获得库位列表
@@ -154,7 +154,7 @@ public class MesWmWarehouseAreaServiceImpl implements MesWmWarehouseAreaService 
     }
  
     @Override
-    public List<MesWmWarehouseAreaDO> getWarehouseAreaSimpleList(Long locationId) {
+    public List<MesWmWarehouseAreaDO> getWarehouseAreaList(Long locationId) {
         return areaMapper.selectSimpleList(locationId);
     }
  
@@ -64,12 +64,12 @@ public interface MesWmWarehouseLocationService {
     PageResult<MesWmWarehouseLocationDO> getWarehouseLocationPage(MesWmWarehouseLocationPageReqVO pageReqVO);
  
     /**
-     * 按仓库获得库区精简列表
+     * 按仓库获得库区列表
      *
      * @param warehouseId 仓库编号
      * @return 库区列表
      */
-    List<MesWmWarehouseLocationDO> getWarehouseLocationSimpleList(Long warehouseId);
+    List<MesWmWarehouseLocationDO> getWarehouseLocationList(Long warehouseId);
  
     /**
      * 按编号集合获得库区列表
@@ -157,7 +157,7 @@ public class MesWmWarehouseLocationServiceImpl implements MesWmWarehouseLocation
     }
  
     @Override
-    public List<MesWmWarehouseLocationDO> getWarehouseLocationSimpleList(Long warehouseId) {
+    public List<MesWmWarehouseLocationDO> getWarehouseLocationList(Long warehouseId) {
         return locationMapper.selectSimpleList(warehouseId);
     }
  
@@ -64,11 +64,11 @@ public interface MesWmWarehouseService {
     PageResult<MesWmWarehouseDO> getWarehousePage(MesWmWarehousePageReqVO pageReqVO);
  
     /**
-     * 获得仓库精简列表
+     * 获得仓库列表
      *
      * @return 仓库列表
      */
-    List<MesWmWarehouseDO> getWarehouseSimpleList();
+    List<MesWmWarehouseDO> getWarehouseList();
  
     /**
      * 按编号集合获得仓库列表
@@ -151,7 +151,7 @@ public class MesWmWarehouseServiceImpl implements MesWmWarehouseService {
     }
  
     @Override
-    public List<MesWmWarehouseDO> getWarehouseSimpleList() {
+    public List<MesWmWarehouseDO> getWarehouseList() {
         return warehouseMapper.selectSimpleList();
     }