feat(wms): 拆 simple-list 列表 VO、补首页校验与业务单号搜索框

后端： - 新增 WmsItemListReqVO / WmsMerchantListReqVO，simple-list 接口不再复用分页 PageReqVO，Swagger 上不再误暴露 pageNo/pageSize 字段 - WmsItemController / WmsMerchantController 的 getXxxSimpleList 改用独立 ListReqVO；Mapper.selectList、Service.getXxxList 同步调整签名 - WmsHomeStatisticsServiceImpl 三个查询入口加 validateWarehouseIfPresent，非空 warehouseId 走 warehouseService.validateWarehouseExists 校验，避免前端误传任意 id 直接落到首页 SQL - 新增 sql/mysql/wms/20260515_wms_total_price.sql：幂等给 4 张明细 / 流水表补 total_price 列并按 ROUND(quantity*price, 2) 回填历史数据前端： - receipt/index.vue + shipment/index.vue 搜索栏补 bizOrderNo 输入控件，对齐已声明的 queryParams 与后端 PageReqVO 支持 - WmsHomeOrderSummaryCards.getStatusPercent 改 function 声明，并去掉最小 4% 占比下限，保留真实比例

feat(wms): 拆 simple-list 列表 VO、补首页校验与业务单号搜索框
后端： - 新增 WmsItemListReqVO / WmsMerchantListReqVO，simple-list 接口不再复用分页 PageReqVO，Swagger 上不再误暴露 pageNo/pageSize 字段 - WmsItemController / WmsMerchantController 的 getXxxSimpleList 改用独立 ListReqVO；Mapper.selectList、Service.getXxxList 同步调整签名 - WmsHomeStatisticsServiceImpl 三个查询入口加 validateWarehouseIfPresent，非空 warehouseId 走 warehouseService.validateWarehouseExists 校验，避免前端误传任意 id 直接落到首页 SQL - 新增 sql/mysql/wms/20260515_wms_total_price.sql：幂等给 4 张明细 / 流水表补 total_price 列并按 ROUND(quantity*price, 2) 回填历史数据前端： - receipt/index.vue + shipment/index.vue 搜索栏补 bizOrderNo 输入控件，对齐已声明的 queryParams 与后端 PageReqVO 支持 - WmsHomeOrderSummaryCards.getStatusPercent 改 function 声明，并去掉最小 4% 占比下限，保留真实比例
YunaiV
1 parent a333887b
Showing 16 changed files with 190 additions and 21 deletions
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/item/WmsItemController.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/item/vo/item/WmsItemListReqVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/WmsMerchantController.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/controller/admin/md/merchant/vo/WmsMerchantListReqVO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/dataobject/md/merchant/WmsMerchantDO.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/item/WmsItemBrandMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/item/WmsItemMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/dal/mysql/md/merchant/WmsMerchantMapper.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/enums/ErrorCodeConstants.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/home/WmsHomeStatisticsServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/item/WmsItemBrandServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/item/WmsItemService.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/item/WmsItemServiceImpl.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantService.java
yudao-module-wms/src/main/java/cn/iocoder/yudao/module/wms/service/md/merchant/WmsMerchantServiceImpl.java
yudao-module-wms/src/test/java/cn/iocoder/yudao/module/wms/service/md/item/WmsItemBrandServiceImplTest.java
@@ -8,6 +8,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemPageReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemRespVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemSaveReqVO;
@@ -98,8 +99,8 @@ public class WmsItemController {
     @GetMapping("/simple-list")
     @Operation(summary = "获得商品精简列表")
     @PreAuthorize("@ss.hasPermission('wms:item:query')")
-    public CommonResult<List<WmsItemRespVO>> getItemSimpleList(@Valid WmsItemPageReqVO pageReqVO) {
-        List<WmsItemDO> list = itemService.getItemList(pageReqVO);
+    public CommonResult<List<WmsItemRespVO>> getItemSimpleList(@Valid WmsItemListReqVO listReqVO) {
+        List<WmsItemDO> list = itemService.getItemList(listReqVO);
         return success(buildItemRespVOList(list));
     }
+package cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.time.LocalDateTime;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@Schema(description = "管理后台 - WMS 商品列表 Request VO")
+@Data
+public class WmsItemListReqVO {
+
+    @Schema(description = "商品编号", example = "ITEM001")
+    private String code;
+
+    @Schema(description = "商品名称", example = "华为 nova flip")
+    private String name;
+
+    @Schema(description = "商品分类编号", example = "1024")
+    private Long categoryId;
+
+    @Schema(description = "商品品牌编号", example = "2048")
+    private Long brandId;
+
+    @Schema(description = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime[] createTime;
+
+}
@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantRespVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO;
@@ -80,8 +81,8 @@ public class WmsMerchantController {
     @GetMapping("/simple-list")
     @Operation(summary = "获得往来企业精简列表", description = "主要用于前端下拉")
     @PreAuthorize("@ss.hasPermission('wms:merchant:query')")
-    public CommonResult<List<WmsMerchantRespVO>> getMerchantSimpleList(@Valid WmsMerchantPageReqVO pageReqVO) {
-        List<WmsMerchantDO> list = merchantService.getMerchantList(pageReqVO);
+    public CommonResult<List<WmsMerchantRespVO>> getMerchantSimpleList(@Valid WmsMerchantListReqVO listReqVO) {
+        List<WmsMerchantDO> list = merchantService.getMerchantList(listReqVO);
         return success(BeanUtils.toBean(list, WmsMerchantRespVO.class));
     }
+package cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo;
+
+import cn.iocoder.yudao.framework.common.validation.InEnum;
+import cn.iocoder.yudao.module.wms.enums.md.WmsMerchantTypeEnum;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+
+import java.util.List;
+
+@Schema(description = "管理后台 - WMS 往来企业列表 Request VO")
+@Data
+public class WmsMerchantListReqVO {
+
+    @Schema(description = "往来企业编号", example = "MER001")
+    private String code;
+
+    @Schema(description = "往来企业名称", example = "华为")
+    private String name;
+
+    @Schema(description = "往来企业类型", example = "2")
+    @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}")
+    private Integer type;
+
+    @Schema(description = "往来企业类型数组", example = "2,3")
+    @InEnum(value = WmsMerchantTypeEnum.class, message = "往来企业类型必须是 {value}")
+    private List<Integer> types;
+
+}
@@ -38,8 +38,6 @@ public class WmsMerchantDO extends BaseDO {
     /**
      * 往来企业类型
      *
-     * DONE @AI：枚举类
-     *
      * 枚举 {@link WmsMerchantTypeEnum}
      */
     private Integer type;
@@ -26,4 +26,8 @@ public interface WmsItemBrandMapper extends BaseMapperX&lt;WmsItemBrandDO&gt; {
         return selectOne(WmsItemBrandDO::getCode, code);
     }
+    default WmsItemBrandDO selectByName(String name) {
+        return selectOne(WmsItemBrandDO::getName, name);
+    }
+
 }
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.wms.dal.mysql.md.item;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.item.WmsItemDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -28,7 +29,7 @@ public interface WmsItemMapper extends BaseMapperX&lt;WmsItemDO&gt; {
                 .orderByDesc(WmsItemDO::getId));
     }
-    default List<WmsItemDO> selectList(WmsItemPageReqVO reqVO, Collection<Long> categoryIds) {
+    default List<WmsItemDO> selectList(WmsItemListReqVO reqVO, Collection<Long> categoryIds) {
         return selectList(new LambdaQueryWrapperX<WmsItemDO>()
                 .likeIfPresent(WmsItemDO::getCode, reqVO.getCode())
                 .likeIfPresent(WmsItemDO::getName, reqVO.getName())
@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.wms.dal.mysql.md.merchant;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -26,7 +27,7 @@ public interface WmsMerchantMapper extends BaseMapperX&lt;WmsMerchantDO&gt; {
                 .orderByDesc(WmsMerchantDO::getId));
     }
-    default List<WmsMerchantDO> selectList(WmsMerchantPageReqVO reqVO) {
+    default List<WmsMerchantDO> selectList(WmsMerchantListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<WmsMerchantDO>()
                 .eqIfPresent(WmsMerchantDO::getCode, reqVO.getCode())
                 .likeIfPresent(WmsMerchantDO::getName, reqVO.getName())
@@ -30,6 +30,7 @@ public interface ErrorCodeConstants {
     ErrorCode ITEM_BRAND_NOT_EXISTS = new ErrorCode(1_060_103_000, "商品品牌不存在");
     ErrorCode ITEM_BRAND_HAS_ITEM = new ErrorCode(1_060_103_001, "删除失败！品牌已被商品使用！");
     ErrorCode ITEM_BRAND_CODE_DUPLICATE = new ErrorCode(1_060_103_002, "商品品牌编号重复");
+    ErrorCode ITEM_BRAND_NAME_DUPLICATE = new ErrorCode(1_060_103_003, "商品品牌名称重复");
     // ========== WMS 基础数据-商品 1-060-104-000 ==========
     ErrorCode ITEM_NOT_EXISTS = new ErrorCode(1_060_104_000, "商品不存在");
@@ -10,6 +10,7 @@ import cn.iocoder.yudao.module.wms.controller.admin.home.vo.WmsHomeOrderTrendRes
 import cn.iocoder.yudao.module.wms.dal.mysql.home.WmsHomeStatisticsMapper;
 import cn.iocoder.yudao.module.wms.enums.order.WmsOrderStatusEnum;
 import cn.iocoder.yudao.module.wms.enums.order.WmsOrderTypeEnum;
+import cn.iocoder.yudao.module.wms.service.md.warehouse.WmsWarehouseService;
 import jakarta.annotation.Resource;
 import org.springframework.stereotype.Service;
@@ -37,10 +38,15 @@ public class WmsHomeStatisticsServiceImpl implements WmsHomeStatisticsService {
     @Resource
     private WmsHomeStatisticsMapper homeStatisticsMapper;
+    @Resource
+    private WmsWarehouseService warehouseService;
     @Override
     public List<WmsHomeOrderSummaryRespVO> getOrderSummary(Long warehouseId) {
+        validateWarehouseIfPresent(warehouseId);
+        // 查询单据数量
         List<Map<String, Object>> stats = homeStatisticsMapper.selectOrderCountGroupByTypeAndStatus(warehouseId);
+        // 按照单据类型 + 单据状态分组
         return convertList(WmsOrderTypeEnum.values(), orderTypeEnum -> {
             List<WmsHomeOrderStatusRespVO> statuses = convertList(WmsOrderStatusEnum.values(), statusEnum ->
                     new WmsHomeOrderStatusRespVO().setStatus(statusEnum.getStatus())
@@ -52,6 +58,7 @@ public class WmsHomeStatisticsServiceImpl implements WmsHomeStatisticsService {
     @Override
     public List<WmsHomeOrderTrendRespVO> getOrderTrend(Integer days, Long warehouseId) {
+        validateWarehouseIfPresent(warehouseId);
         // 统计区间为 [今天 - days + 1, 明天)，保证最近 days 天包含今天。
         LocalDate endDate = LocalDate.now().plusDays(1);
         LocalDate startDate = endDate.minusDays(days);
@@ -80,6 +87,7 @@ public class WmsHomeStatisticsServiceImpl implements WmsHomeStatisticsService {
     @Override
     public WmsHomeInventorySummaryRespVO getInventorySummary(Long warehouseId, Integer goodsLimit, Integer warehouseLimit) {
+        validateWarehouseIfPresent(warehouseId);
         BigDecimal totalQuantity = ObjectUtil.defaultIfNull(homeStatisticsMapper.selectInventoryTotalQuantity(warehouseId), BigDecimal.ZERO);
         List<Map<String, Object>> itemRows = homeStatisticsMapper.selectInventoryItemRank(warehouseId, goodsLimit);
         List<Map<String, Object>> warehouseRows = homeStatisticsMapper.selectInventoryWarehouseRank(warehouseId, warehouseLimit);
@@ -90,6 +98,15 @@ public class WmsHomeStatisticsServiceImpl implements WmsHomeStatisticsService {
     // ==================== 工具方法 ====================
+    /**
+     * 仓库编号非空时，校验仓库是否存在，避免前端误传任意 id 直接落到 SQL。
+     */
+    private void validateWarehouseIfPresent(Long warehouseId) {
+        if (warehouseId != null) {
+            warehouseService.validateWarehouseExists(warehouseId);
+        }
+    }
+
     private long getOrderCount(List<Map<String, Object>> stats, Integer orderType, Integer status) {
         for (Map<String, Object> stat : stats) {
             if (ObjectUtil.equal(MapUtil.getInt(stat, "orderType"), orderType)
@@ -19,6 +19,7 @@ import java.util.List;
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.ITEM_BRAND_CODE_DUPLICATE;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.ITEM_BRAND_HAS_ITEM;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.ITEM_BRAND_NAME_DUPLICATE;
 import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.ITEM_BRAND_NOT_EXISTS;
 /**
@@ -37,9 +38,9 @@ public class WmsItemBrandServiceImpl implements WmsItemBrandService {
     @Override
     public Long createItemBrand(WmsItemBrandSaveReqVO createReqVO) {
-        // 校验编号唯一
-        validateBrandCodeUnique(null, createReqVO.getCode());
+        validateBrandSaveData(null, createReqVO);
+        // 新增
         WmsItemBrandDO brand = BeanUtils.toBean(createReqVO, WmsItemBrandDO.class);
         brandMapper.insert(brand);
         return brand.getId();
@@ -49,14 +50,18 @@ public class WmsItemBrandServiceImpl implements WmsItemBrandService {
     public void updateItemBrand(WmsItemBrandSaveReqVO updateReqVO) {
         // 校验存在
         validateItemBrandExists(updateReqVO.getId());
-        // 校验编号唯一
-        validateBrandCodeUnique(updateReqVO.getId(), updateReqVO.getCode());
+        validateBrandSaveData(updateReqVO.getId(), updateReqVO);
         // 更新
         WmsItemBrandDO updateObj = BeanUtils.toBean(updateReqVO, WmsItemBrandDO.class);
         brandMapper.updateById(updateObj);
     }
+    private void validateBrandSaveData(Long id, WmsItemBrandSaveReqVO reqVO) {
+        validateBrandCodeUnique(id, reqVO.getCode());
+        validateBrandNameUnique(id, reqVO.getName());
+    }
+
     private void validateBrandCodeUnique(Long id, String code) {
         WmsItemBrandDO brand = brandMapper.selectByCode(code);
         if (brand == null) {
@@ -71,6 +76,19 @@ public class WmsItemBrandServiceImpl implements WmsItemBrandService {
         }
     }
+    private void validateBrandNameUnique(Long id, String name) {
+        WmsItemBrandDO brand = brandMapper.selectByName(name);
+        if (brand == null) {
+            return;
+        }
+        if (id == null) {
+            throw exception(ITEM_BRAND_NAME_DUPLICATE);
+        }
+        if (ObjectUtil.notEqual(brand.getId(), id)) {
+            throw exception(ITEM_BRAND_NAME_DUPLICATE);
+        }
+    }
+
     @Override
     public void deleteItemBrand(Long id) {
         // 校验存在
 package cn.iocoder.yudao.module.wms.service.md.item;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemPageReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemSaveReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.item.WmsItemDO;
@@ -68,10 +69,10 @@ public interface WmsItemService {
     /**
      * 获得商品列表
      *
-     * @param pageReqVO 查询条件
+     * @param listReqVO 查询条件
      * @return 商品列表
      */
-    List<WmsItemDO> getItemList(WmsItemPageReqVO pageReqVO);
+    List<WmsItemDO> getItemList(WmsItemListReqVO listReqVO);
     /**
      * 按编号集合获得商品列表
@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemPageReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.item.WmsItemSaveReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.item.WmsItemDO;
@@ -132,9 +133,9 @@ public class WmsItemServiceImpl implements WmsItemService {
     }
     @Override
-    public List<WmsItemDO> getItemList(WmsItemPageReqVO pageReqVO) {
-        return itemMapper.selectList(pageReqVO,
-                categoryService.getSelfAndChildItemCategoryIdList(pageReqVO.getCategoryId()));
+    public List<WmsItemDO> getItemList(WmsItemListReqVO listReqVO) {
+        return itemMapper.selectList(listReqVO,
+                categoryService.getSelfAndChildItemCategoryIdList(listReqVO.getCategoryId()));
     }
     @Override
 package cn.iocoder.yudao.module.wms.service.md.merchant;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
@@ -86,10 +87,10 @@ public interface WmsMerchantService {
     /**
      * 获得往来企业列表
      *
-     * @param pageReqVO 查询条件
+     * @param listReqVO 查询条件
      * @return 往来企业列表
      */
-    List<WmsMerchantDO> getMerchantList(WmsMerchantPageReqVO pageReqVO);
+    List<WmsMerchantDO> getMerchantList(WmsMerchantListReqVO listReqVO);
     /**
      * 按编号集合获得往来企业列表
@@ -5,6 +5,7 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantListReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantPageReqVO;
 import cn.iocoder.yudao.module.wms.controller.admin.md.merchant.vo.WmsMerchantSaveReqVO;
 import cn.iocoder.yudao.module.wms.dal.dataobject.md.merchant.WmsMerchantDO;
@@ -119,8 +120,8 @@ public class WmsMerchantServiceImpl implements WmsMerchantService {
     }
     @Override
-    public List<WmsMerchantDO> getMerchantList(WmsMerchantPageReqVO pageReqVO) {
-        return merchantMapper.selectList(pageReqVO);
+    public List<WmsMerchantDO> getMerchantList(WmsMerchantListReqVO listReqVO) {
+        return merchantMapper.selectList(listReqVO);
     }
     @Override
+package cn.iocoder.yudao.module.wms.service.md.item;
+
+import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest;
+import cn.iocoder.yudao.module.wms.controller.admin.md.item.vo.brand.WmsItemBrandSaveReqVO;
+import cn.iocoder.yudao.module.wms.dal.dataobject.md.item.WmsItemBrandDO;
+import cn.iocoder.yudao.module.wms.dal.mysql.md.item.WmsItemBrandMapper;
+import jakarta.annotation.Resource;
+import org.junit.jupiter.api.Test;
+import org.springframework.context.annotation.Import;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
+
+import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
+import static cn.iocoder.yudao.module.wms.enums.ErrorCodeConstants.ITEM_BRAND_NAME_DUPLICATE;
+
+@Import(WmsItemBrandServiceImpl.class)
+public class WmsItemBrandServiceImplTest extends BaseDbUnitTest {
+
+    @Resource
+    private WmsItemBrandServiceImpl brandService;
+
+    @Resource
+    private WmsItemBrandMapper brandMapper;
+
+    @MockitoBean
+    private WmsItemService itemService;
+
+    @Test
+    public void testCreateItemBrand_nameDuplicate() {
+        // mock 数据
+        brandMapper.insert(createBrand("B001", "华为"));
+        WmsItemBrandSaveReqVO reqVO = createBrandSaveReqVO(null, "B002", "华为");
+
+        // 调用，并断言
+        assertServiceException(() -> brandService.createItemBrand(reqVO), ITEM_BRAND_NAME_DUPLICATE);
+    }
+
+    @Test
+    public void testUpdateItemBrand_nameDuplicate() {
+        // mock 数据
+        brandMapper.insert(createBrand("B001", "华为"));
+        WmsItemBrandDO brand = createBrand("B002", "小米");
+        brandMapper.insert(brand);
+        WmsItemBrandSaveReqVO reqVO = createBrandSaveReqVO(brand.getId(), "B002", "华为");
+
+        // 调用，并断言
+        assertServiceException(() -> brandService.updateItemBrand(reqVO), ITEM_BRAND_NAME_DUPLICATE);
+    }
+
+    private static WmsItemBrandDO createBrand(String code, String name) {
+        return WmsItemBrandDO.builder()
+                .code(code)
+                .name(name)
+                .build();
+    }
+
+    private static WmsItemBrandSaveReqVO createBrandSaveReqVO(Long id, String code, String name) {
+        WmsItemBrandSaveReqVO reqVO = new WmsItemBrandSaveReqVO();
+        reqVO.setId(id);
+        reqVO.setCode(code);
+        reqVO.setName(name);
+        return reqVO;
+    }
+
+}