From 08001726c8b946ff4e9ac0a74f933197ad3c4fe2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 13 三月 2026 10:25:16 +0800
Subject: [PATCH] Merge branch 'dev_宁夏_中盛建材' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_宁夏_中盛建材
---
src/main/java/com/ruoyi/production/service/impl/ProductMaterialSkuServiceImpl.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 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..e29b78c 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;
@@ -49,37 +50,45 @@
* 鏌ヨ鐗╂枡瑙勬牸鍒楄〃
*/
@Override
- public List<ProductMaterialSkuDto> productMaterialSkuList(Long materialId) {
-
- if (materialId == null) {
- return Collections.emptyList();
+ public Page<ProductMaterialSkuDto> productMaterialSkuList(Page<ProductMaterialSku> page, ProductMaterialSkuDto dto) {
+ if (dto == null || dto.getMaterialId() == null) {
+ return new Page<>();
}
-
LambdaQueryWrapper<ProductMaterialSku> queryWrapper = new LambdaQueryWrapper<>();
- queryWrapper.eq(ProductMaterialSku::getMaterialId, materialId)
+ 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);
- List<ProductMaterialSku> skuList = this.list(queryWrapper);
- if (skuList == null || skuList.isEmpty()) {
- return Collections.emptyList();
- }
- // 鏌ヨ鐗╂枡淇℃伅
- ProductMaterial material = productMaterialMapper.selectById(materialId);
+ 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 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);
+ 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);
}
-
- return result;
+ Page<ProductMaterialSkuDto> dtoPage = new Page<>();
+ dtoPage.setCurrent(skuPage.getCurrent());
+ dtoPage.setSize(skuPage.getSize());
+ dtoPage.setTotal(skuPage.getTotal());
+ dtoPage.setRecords(result);
+ return dtoPage;
}
/**
--
Gitblit v1.9.3