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 | 38 ++++----------------------------------
1 files changed, 4 insertions(+), 34 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 b319f53..49829f7 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java
@@ -1,6 +1,7 @@
package com.ruoyi.production.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
@@ -38,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;
@@ -49,37 +48,8 @@
* 鏌ヨ鐗╂枡瑙勬牸鍒楄〃
*/
@Override
- public List<ProductMaterialSkuDto> productMaterialSkuList(Long materialId) {
-
- if (materialId == null) {
- return Collections.emptyList();
- }
-
- LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProductMaterialSku::getMaterialId, materialId)
- .orderByAsc(ProductMaterialSku::getId);
- List<ProductMaterialSku> skuList = this.list(queryWrapper);
- if (skuList == null || skuList.isEmpty()) {
- return Collections.emptyList();
- }
- // 鏌ヨ鐗╂枡淇℃伅
- ProductMaterial material = productMaterialMapper.selectById(materialId);
-
- 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 dto = new ProductMaterialSkuDto();
- dto.setMaterialId(materialId);
- dto.setMaterialName(materialName);
- dto.setBaseUnit(baseUnit);
- dto.setSkuId(sku.getId());
- dto.setSpecification(sku.getSpecification());
- dto.setSupplyType(sku.getSupplyType());
- result.add(dto);
- }
-
- return result;
+ public Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSkuDto> page, ProductMaterialSkuDto dto, Integer type) {
+ return baseMapper.selectSkuWithMaterialPage(page, dto, type);
}
/**
--
Gitblit v1.9.3