From 8ec375a6fab78e088b3c05e550c0581c9c57152e Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期六, 14 三月 2026 15:31:37 +0800
Subject: [PATCH] 原料检测
---
src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
index 555763c..23f3587 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
@@ -1,25 +1,33 @@
package com.ruoyi.quality.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.collaborativeApproval.dto.DutyPlanDTO;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.ProductMapper;
+import com.ruoyi.basic.mapper.ProductModelMapper;
+import com.ruoyi.basic.pojo.Product;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.common.enums.RawMaterialCheckResult;
import com.ruoyi.common.enums.RawMaterialCheckType;
import com.ruoyi.common.enums.RawMaterialInspectState;
-import com.ruoyi.production.mapper.ProductProcessRouteMapper;
+import com.ruoyi.common.utils.bean.BeanUtils;
+import com.ruoyi.inspectiontask.mapper.QualityInspectItemMapper;
+import com.ruoyi.inspectiontask.pojo.QualityInspectItem;
import com.ruoyi.quality.dto.RawMaterialDto;
-import com.ruoyi.quality.mapper.RawMaterialQualityInspectItemMapper;
-import com.ruoyi.quality.pojo.RawMaterial;
import com.ruoyi.quality.mapper.RawMaterialMapper;
+import com.ruoyi.quality.pojo.RawMaterial;
import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
import com.ruoyi.quality.service.RawMaterialQualityInspectItemService;
import com.ruoyi.quality.service.RawMaterialService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
+import org.apache.commons.collections4.CollectionUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@@ -38,33 +46,106 @@
private RawMaterialQualityInspectItemService rawMaterialQualityInspectItemService;
+ private QualityInspectItemMapper qualityInspectItemMapper;
+
+ private ProductModelMapper productModelMapper;
+
+ private ProductMapper productMapper;
+
@Override
public IPage<RawMaterialDto> listPage(Page page, RawMaterialDto rawMaterialDto) {
- IPage<RawMaterialDto> rawMaterials = rawMaterialMapper.listPage(page, rawMaterialDto);
- for (RawMaterialDto rawMaterial : rawMaterials.getRecords()) {
- rawMaterial.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
- rawMaterial.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
- rawMaterial.setInspectStateText(RawMaterialInspectState.fromValue(rawMaterial.getInspectState()).getValue());
+ IPage<RawMaterialDto> pageRes = rawMaterialMapper.listPage(page, rawMaterialDto);
+ List<RawMaterialDto> rawMaterials = pageRes.getRecords();
+ Map<Long, ProductModel> productModelMap = new HashMap<>();
+ Map<Long, Product> productMap = new HashMap<>();
+ if (CollectionUtils.isNotEmpty(rawMaterials)) {
+ List<Long> productModelIds = rawMaterials.stream().map(RawMaterialDto::getProductModelId).collect(Collectors.toList());
+ List<ProductModel> productModels = productModelMapper.selectList(new LambdaQueryWrapper<ProductModel>()
+ .in(ProductModel::getId, productModelIds));
+ productModelMap = productModels.stream().collect(Collectors.toMap(ProductModel::getId, productModel -> productModel));
+ List<Long> productIds = productModels.stream().map(ProductModel::getProductId).collect(Collectors.toList());
+ List<Product> products = productMapper.selectList(new LambdaQueryWrapper<Product>()
+ .in(Product::getId, productIds));
+ productMap = products.stream().collect(Collectors.toMap(Product::getId, product -> product));
}
- return rawMaterials;
+
+ for (RawMaterialDto rawMaterial : pageRes.getRecords()) {
+ rawMaterial.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()) == null ? "" : RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
+ rawMaterial.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()) == null ? "" : RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
+ rawMaterial.setInspectStateText(RawMaterialInspectState.fromValue(rawMaterial.getInspectState()) == null ? "" : RawMaterialInspectState.fromValue(rawMaterial.getInspectState()).getValue());
+ rawMaterial.setProductName(productMap.get(productModelMap.get(rawMaterial.getProductModelId()).getProductId()).getProductName());
+ rawMaterial.setModel(productModelMap.get(rawMaterial.getProductModelId()).getModel());
+ rawMaterial.setProductId(productModelMap.get(rawMaterial.getProductModelId()).getProductId());
+ }
+ return pageRes;
+ }
+
+ @Override
+ public RawMaterialDto detail(Long id) {
+ RawMaterial rawMaterial = rawMaterialMapper.selectById(id);
+ RawMaterialDto rawMaterialDto = new RawMaterialDto();
+ BeanUtils.copyBeanProp(rawMaterialDto, rawMaterial);
+ // 鑾峰彇妫�娴嬮」鍏宠仈鍏崇郴
+ List<RawMaterialQualityInspectItem> rawQualityList = rawMaterialQualityInspectItemService.list(new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
+ .eq(RawMaterialQualityInspectItem::getRawMaterialId, id));
+ Map<Long, RawMaterialQualityInspectItem> map = rawQualityList.stream().collect(Collectors.toMap(RawMaterialQualityInspectItem::getQualityInspectItemId, qualityInspectItem -> qualityInspectItem));
+ // 鑾峰彇妫�楠岄」鐩�
+ List<QualityInspectItem> qualityInspectItems = qualityInspectItemMapper.selectList(new LambdaQueryWrapper<QualityInspectItem>()
+ .in(QualityInspectItem::getId, rawQualityList.stream().map(RawMaterialQualityInspectItem::getQualityInspectItemId).collect(Collectors.toList())));
+ // 鏇挎崲鍖栭獙鍊�
+ qualityInspectItems.forEach(qualityInspectItem -> {
+ qualityInspectItem.setTestValue(map.get(qualityInspectItem.getId()).getTestValue());
+ });
+ rawMaterialDto.setQualityInspectItem(qualityInspectItems);
+
+ // 鏌ヨ浜у搧id
+ ProductModel productModel = productModelMapper.selectById(rawMaterialDto.getProductModelId());
+ rawMaterialDto.setProductId(productModel.getProductId());
+ rawMaterialDto.setUnit(productModel.getUnit());
+ return rawMaterialDto;
}
@Override
@Transactional(rollbackFor = Exception.class)
public boolean add(RawMaterialDto rawMaterialDto) {
+ rawMaterialDto.setInspectState(RawMaterialInspectState.RawMaterialInspectStateUnsubmitted.getCode());
+ // 鏂板鍘熸枡
+ int i = rawMaterialMapper.insert(rawMaterialDto);
// 鏂板妫�娴嬮」鍏宠仈鍏崇郴
- if (rawMaterialDto.getQualityInspectItemIds() != null && !rawMaterialDto.getQualityInspectItemIds().isEmpty()) {
- List<RawMaterialQualityInspectItem> rawMaterialQualityInspectItems = rawMaterialDto.getQualityInspectItemIds().stream()
- .map(id -> {
+ if (CollectionUtils.isNotEmpty(rawMaterialDto.getQualityInspectItem())) {
+ List<RawMaterialQualityInspectItem> rawMaterialQualityInspectItems = rawMaterialDto.getQualityInspectItem().stream()
+ .map(qualityInspectItem -> {
RawMaterialQualityInspectItem item = new RawMaterialQualityInspectItem();
item.setRawMaterialId(rawMaterialDto.getId());
- item.setQualityInspectItemId(id);
+ item.setQualityInspectItemId(qualityInspectItem.getId());
+ item.setTestValue(qualityInspectItem.getTestValue());
return item;
})
.collect(Collectors.toList());
rawMaterialQualityInspectItemService.saveBatch(rawMaterialQualityInspectItems);
}
- // 鏂板鍘熸枡
- return rawMaterialMapper.insert(rawMaterialDto) > 0;
+ return i > 0;
+ }
+
+ @Override
+ public boolean update(RawMaterialDto rawMaterialDto) {
+ // 鍒犻櫎鎵�鏈夊叧鑱旈」鐩噸鏂板姞杞�
+ rawMaterialQualityInspectItemService.remove(new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
+ .eq(RawMaterialQualityInspectItem::getRawMaterialId, rawMaterialDto.getId()));
+ int i = rawMaterialMapper.updateById(rawMaterialDto);
+ // 鏂板妫�娴嬮」鍏宠仈鍏崇郴
+ if (CollectionUtils.isNotEmpty(rawMaterialDto.getQualityInspectItem())) {
+ List<RawMaterialQualityInspectItem> rawMaterialQualityInspectItems = rawMaterialDto.getQualityInspectItem().stream()
+ .map(qualityInspectItem -> {
+ RawMaterialQualityInspectItem item = new RawMaterialQualityInspectItem();
+ item.setRawMaterialId(rawMaterialDto.getId());
+ item.setQualityInspectItemId(qualityInspectItem.getId());
+ item.setTestValue(qualityInspectItem.getTestValue());
+ return item;
+ })
+ .collect(Collectors.toList());
+ rawMaterialQualityInspectItemService.saveBatch(rawMaterialQualityInspectItems);
+ }
+ return i > 0;
}
}
--
Gitblit v1.9.3