From 8f08766aaa13a0a42db13de67a829ad3d7ad97c3 Mon Sep 17 00:00:00 2001 From: kkk-ops <1050738955@qq.com> Date: Wed, 4 Feb 2026 18:33:26 +0800 Subject: [PATCH] merge --- .../controller/admin/product/ErpProductController.java | 4 ++-- .../admin/product/vo/product/ErpProductPageReqVO.java | 3 +++ .../module/erp/dal/mysql/product/ErpProductMapper.java | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java index 83635f5fc..aa132e962 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java @@ -54,11 +54,11 @@ public class ErpProductController { ErpProductPageReqVO productPageReqVO = new ErpProductPageReqVO(); productPageReqVO.setName(createReqVO.getName()); if (!productMapper.selectProductExist(productPageReqVO).getList().isEmpty()) { - return error(400,"名称不能重复"); + return error(400,"名称+规格不能重复"); } productPageReqVO = new ErpProductPageReqVO(); productPageReqVO.setCode(createReqVO.getBarCode()); - if (!productMapper.selectProductExist(productPageReqVO).getList().isEmpty()) { + if (!productMapper.selectProductCodeExist(productPageReqVO).getList().isEmpty()) { return error(400,"编码不能重复"); } return success(productService.createProduct(createReqVO)); diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java index 4e76ce727..9b0b53b0b 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/vo/product/ErpProductPageReqVO.java @@ -27,4 +27,7 @@ public class ErpProductPageReqVO extends PageParam { @Schema(description = "产品编号", example = "11161") private String code; + @Schema(description = "产品规格", example = "红色") + private String standard; + } \ No newline at end of file diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductMapper.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductMapper.java index 56230c67b..05aaf08bc 100644 --- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductMapper.java +++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/dal/mysql/product/ErpProductMapper.java @@ -29,13 +29,20 @@ public interface ErpProductMapper extends BaseMapperX { .orderByDesc(ErpProductDO::getId)); } - default PageResult selectProductExist(ErpProductPageReqVO reqVO) { + default PageResult selectProductCodeExist(ErpProductPageReqVO reqVO) { return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ErpProductDO::getName, reqVO.getName()) .eqIfPresent(ErpProductDO::getBarCode, reqVO.getCode()) .orderByAsc(ErpProductDO::getId)); } + default PageResult selectProductExist(ErpProductPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() + .eqIfPresent(ErpProductDO::getName, reqVO.getName()) + .eqIfPresent(ErpProductDO::getStandard, reqVO.getStandard()) + .orderByAsc(ErpProductDO::getId)); + } + default Long selectCountByCategoryId(Long categoryId) { return selectCount(ErpProductDO::getCategoryId, categoryId); }