From 564726280b0af07ba780b8274bdb470d3cd6495d Mon Sep 17 00:00:00 2001 From: ck-chenkang Date: Wed, 29 Apr 2026 18:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E7=89=A9=E6=96=99=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=A2=9E=E5=8A=A0=E7=BC=96=E7=A0=81=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../product/vo/product/ErpProductPageReqVO.java | 5 ++++- .../erp/dal/mysql/product/ErpProductMapper.java | 14 ++++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-) 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 9b0b53b0b..03366d081 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,7 +27,10 @@ public class ErpProductPageReqVO extends PageParam { @Schema(description = "产品编号", example = "11161") private String code; + @Schema(description = "产品编码", example = "P-001") + private String barCode; + @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 0a39d3189..a6508130b 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 @@ -27,10 +27,17 @@ import java.util.List; @Mapper public interface ErpProductMapper extends BaseMapperX { + // 适配barCode和code两种情况 + default String resolveCode(ErpProductPageReqVO reqVO){ + String barCode = StringUtils.hasText(reqVO.getBarCode()) ? reqVO.getBarCode() : reqVO.getCode(); + return barCode; + } + default PageResult selectPage(ErpProductPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() .likeIfPresent(ErpProductDO::getName, reqVO.getName()) - .likeIfPresent(ErpProductDO::getBarCode, reqVO.getCode()) + .likeIfPresent(ErpProductDO::getBarCode, resolveCode(reqVO)) .eqIfPresent(ErpProductDO::getCategoryId, reqVO.getCategoryId()) .betweenIfPresent(ErpProductDO::getCreateTime, reqVO.getCreateTime()) .orderByDesc(ErpProductDO::getId)); @@ -47,9 +54,10 @@ public interface ErpProductMapper extends BaseMapperX { } default PageResult selectProductCodeExist(ErpProductPageReqVO reqVO) { + return selectPage(reqVO, new LambdaQueryWrapperX() .eqIfPresent(ErpProductDO::getName, reqVO.getName()) - .eqIfPresent(ErpProductDO::getBarCode, reqVO.getCode()) + .eqIfPresent(ErpProductDO::getBarCode, resolveCode(reqVO)) .orderByAsc(ErpProductDO::getId)); } @@ -62,9 +70,7 @@ public interface ErpProductMapper extends BaseMapperX { Long count = selectCount(new LambdaQueryWrapper() .eq(ErpProductDO::getName, reqVO.getName()) .eq(ErpProductDO::getStandard, reqVO.getStandard())); - return count > 0; - } default Long selectCountByCategoryId(Long categoryId) {