From 26e295956b81d6bfe5f181f040bf8ecd0079ba54 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期六, 14 三月 2026 16:21:03 +0800
Subject: [PATCH] feat: 判断是否为BOM的选择产品查询
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java | 43 +++----------------------------------------
1 files changed, 3 insertions(+), 40 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
index b3717ad..49829f7 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
@@ -39,9 +39,7 @@
*/
@Slf4j
@Service
-public class ProductMaterialSkuServiceImpl
- extends ServiceImpl<ProductMaterialSkuMapper, ProductMaterialSku>
- implements ProductMaterialSkuService {
+public class ProductMaterialSkuServiceImpl extends ServiceImpl<ProductMaterialSkuMapper, ProductMaterialSku> implements ProductMaterialSkuService {
@Autowired
private ProductMaterialMapper productMaterialMapper;
@@ -50,43 +48,8 @@
* 鏌ヨ鐗╂枡瑙勬牸鍒楄〃
*/
@Override
- public Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSku> page, ProductMaterialSkuDto dto) {
- LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
- if (dto != null && dto.getMaterialId() != null) {
- queryWrapper.eq(ProductMaterialSku::getMaterialId, dto.getMaterialId())
- .like(StringUtils.isNotBlank(dto.getSpecification()),
- ProductMaterialSku::getSpecification, dto.getSpecification())
- .like(StringUtils.isNotBlank(dto.getMaterialCode()),
- ProductMaterialSku::getMaterialCode, dto.getMaterialCode())
- .orderByAsc(ProductMaterialSku::getId);
- }
- Page<ProductMaterialSku> skuPage = this.page(page, queryWrapper);
- List<ProductMaterialSku> skuList = skuPage.getRecords();
- if (skuList == null || skuList.isEmpty()) {
- return new Page<>();
- }
-
- ProductMaterial material = productMaterialMapper.selectById(dto.getMaterialId());
- String materialName = material != null ? material.getMaterialName() : null;
- String baseUnit = material != null ? material.getBaseUnit() : null;
- List<ProductMaterialSkuDto> result = new ArrayList<>(skuList.size());
- for (ProductMaterialSku sku : skuList) {
- ProductMaterialSkuDto productMaterialSkuDto = new ProductMaterialSkuDto();
- productMaterialSkuDto.setMaterialId(dto.getMaterialId());
- productMaterialSkuDto.setMaterialName(materialName);
- productMaterialSkuDto.setMaterialCode(sku.getMaterialCode());
- productMaterialSkuDto.setBaseUnit(baseUnit);
- productMaterialSkuDto.setSkuId(sku.getId());
- productMaterialSkuDto.setSpecification(sku.getSpecification());
- productMaterialSkuDto.setSupplyType(sku.getSupplyType());
- result.add(productMaterialSkuDto);
- }
- Page<ProductMaterialSkuDto> dtoPage = new Page<>();
- dtoPage.setCurrent(skuPage.getCurrent());
- dtoPage.setSize(skuPage.getSize());
- dtoPage.setTotal(skuPage.getTotal());
- dtoPage.setRecords(result);
- return dtoPage;
+ public Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSkuDto> page, ProductMaterialSkuDto dto, Integer type) {
+ return baseMapper.selectSkuWithMaterialPage(page, dto, type);
}
/**
--
Gitblit v1.9.3