From 1be8074de2176459ccea92115e4adb0704769104 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期一, 16 三月 2026 16:43:40 +0800
Subject: [PATCH] 质量管理：提交原料后，不合格的生成不合格记录；合格则生成审批记录
---
src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java | 82 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 77 insertions(+), 5 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 035648f..d3ce5cd 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/RawMaterialServiceImpl.java
@@ -2,10 +2,13 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
+import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.pojo.Product;
@@ -14,21 +17,22 @@
import com.ruoyi.common.enums.RawMaterialCheckType;
import com.ruoyi.common.enums.RawMaterialInspectState;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.bean.BeanUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.inspectiontask.mapper.QualityInspectItemMapper;
import com.ruoyi.inspectiontask.pojo.QualityInspectItem;
import com.ruoyi.quality.dto.RawMaterialDto;
import com.ruoyi.quality.dto.RawMaterialQualityInspectItemDto;
+import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
import com.ruoyi.quality.mapper.RawMaterialMapper;
-import com.ruoyi.quality.pojo.QualityInspect;
-import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.pojo.RawMaterial;
-import com.ruoyi.quality.pojo.RawMaterialQualityInspectItem;
+import com.ruoyi.quality.pojo.*;
import com.ruoyi.quality.service.RawMaterialQualityInspectItemService;
import com.ruoyi.quality.service.RawMaterialService;
import lombok.AllArgsConstructor;
import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,13 +40,14 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.net.URLEncoder;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
/**
* <p>
- * 鏈嶅姟瀹炵幇绫�
+ * 鏈嶅姟瀹炵幇绫�
* </p>
*
* @author 鑺杞欢锛堟睙鑻忥級鏈夐檺鍏徃
@@ -60,6 +65,11 @@
private ProductModelMapper productModelMapper;
private ProductMapper productMapper;
+
+ private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+
+ @Autowired
+ private ApproveProcessServiceImpl approveProcessService;
@Override
public IPage<RawMaterialDto> listPage(Page page, RawMaterialDto rawMaterialDto) {
@@ -93,6 +103,9 @@
public RawMaterialDto detail(Long id) {
RawMaterial rawMaterial = rawMaterialMapper.selectById(id);
RawMaterialDto rawMaterialDto = new RawMaterialDto();
+ if (rawMaterial == null) {
+ return rawMaterialDto;
+ }
BeanUtils.copyBeanProp(rawMaterialDto, rawMaterial);
// 鑾峰彇妫�娴嬮」鍏宠仈鍏崇郴
List<RawMaterialQualityInspectItem> rawQualityList = rawMaterialQualityInspectItemService.list(new LambdaQueryWrapper<RawMaterialQualityInspectItem>()
@@ -113,13 +126,72 @@
// 鏌ヨ浜у搧id
ProductModel productModel = productModelMapper.selectById(rawMaterialDto.getProductModelId());
+ Product product = productMapper.selectById(productModel.getProductId());
rawMaterialDto.setProductId(productModel.getProductId());
+ rawMaterialDto.setProductName(product.getProductName());
+ rawMaterialDto.setModel(productModel.getModel());
rawMaterialDto.setUnit(productModel.getUnit());
+ rawMaterialDto.setCheckResultText(RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()) == null ? "" : RawMaterialCheckResult.fromValue(rawMaterial.getCheckResult()).getValue());
+ rawMaterialDto.setCheckTypeText(RawMaterialCheckType.fromValue(rawMaterial.getCheckType()) == null ? "" : RawMaterialCheckType.fromValue(rawMaterial.getCheckType()).getValue());
return rawMaterialDto;
}
@Override
@Transactional(rollbackFor = Exception.class)
+ public boolean submit(Long id) {
+ RawMaterial rawMaterial = rawMaterialMapper.selectById(id);
+ if (rawMaterial.getCheckResult() == null) {
+ throw new RuntimeException("璇峰厛鍒ゆ柇鏄惁鍚堟牸");
+ }
+
+ // 涓嶅悎鏍硷細鐢熸垚涓嶅悎鏍艰褰�
+ if (rawMaterial.getCheckResult().equals(RawMaterialCheckResult.RawMaterialCheckResultUnqualified.getCode())) {
+ QualityUnqualified qualityUnqualified = new QualityUnqualified();
+ qualityUnqualified.setInspectId(rawMaterial.getId());//妫�楠宨d
+ qualityUnqualified.setInspectType(rawMaterial.getCheckType());//妫�楠岀被鍨�
+ qualityUnqualified.setInspectState(0);//寰呭鐞�
+ qualityUnqualified.setCheckName(rawMaterial.getCheckUserName());//妫�楠屽憳鍚嶇О
+ qualityUnqualified.setCheckTime(rawMaterial.getCheckTime());//妫�楠屾棩鏈�
+ ProductModel productModel = productModelMapper.selectById(rawMaterial.getProductModelId());
+ Product product = productMapper.selectById(productModel.getProductId());
+ qualityUnqualified.setProductId(productModel.getProductId());//浜у搧id
+ qualityUnqualified.setProductName(product.getProductName());//浜у搧鍚嶇О
+ qualityUnqualified.setModel(productModel.getModel());//瑙勬牸鍨嬪彿
+ qualityUnqualified.setUnit(productModel.getUnit());//鍗曚綅
+ List<RawMaterialQualityInspectItem> inspectParams = rawMaterialQualityInspectItemService.list(Wrappers.<RawMaterialQualityInspectItem>lambdaQuery().eq(RawMaterialQualityInspectItem::getRawMaterialId, rawMaterial.getId()));
+ // 鑾峰彇鍏宠仈鐨凲ualityInspectItem椤圭洰鍚�
+ String text = inspectParams.stream().map(item -> {
+ QualityInspectItem qualityInspectItem = qualityInspectItemMapper.selectById(item.getQualityInspectItemId());
+ return qualityInspectItem != null ? qualityInspectItem.getName() : "";
+ }).collect(Collectors.joining(","));
+ qualityUnqualified.setDefectivePhenomena(text + "杩欎簺椤圭洰涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
+ qualityUnqualifiedMapper.insert(qualityUnqualified);
+ } else {
+ //鍚堟牸: 浜х敓鍘熸枡瀹℃牳璁板綍
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(9);
+ approveProcessVO.setApproveRecordId(rawMaterial.getId());
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason( "鍘熸枡瀹℃牳鎵瑰彿锛�"+rawMaterial.getBatchNo());
+ Long adminUserId = 1L; // todo 鍋囪绗竴涓鐞嗗憳鐨処D涓�1
+ approveProcessVO.setApproveUserIds(String.valueOf(adminUserId));
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ try {
+ approveProcessService.addApprove(approveProcessVO);
+ }catch (Exception e){
+ log.error("RawMaterialServiceImpl error:{}", e);
+ throw new RuntimeException("瀹℃壒澶辫触");
+ }
+ }
+
+ rawMaterial.setInspectState(RawMaterialInspectState.RawMaterialInspectStateSubmitted.getCode());
+ return rawMaterialMapper.updateById(rawMaterial) > 0;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
public boolean add(RawMaterialDto rawMaterialDto) {
rawMaterialDto.setInspectState(RawMaterialInspectState.RawMaterialInspectStateUnsubmitted.getCode());
// 鏂板鍘熸枡
--
Gitblit v1.9.3