From 9ca45195f78b74e9181cbbe7e82eb683ee49fabf Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 30 十月 2026 17:54:15 +0800
Subject: [PATCH] 质量管理模块：指标按产品/类别/工序维护与绑定、不合格处理方式、检验提交入库判定
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 146 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 134 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index 889f0a2..e8bfb84 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -3,32 +3,34 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
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.common.exception.base.BaseException;
+import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.procurementrecord.dto.Details;
+import com.ruoyi.procurementrecord.dto.ProcurementAddDto;
+import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
import com.ruoyi.quality.dto.QualityInspectDto;
import com.ruoyi.quality.mapper.QualityInspectMapper;
-import com.ruoyi.quality.mapper.QualityInspectParamMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectParam;
-import com.ruoyi.quality.pojo.QualityTestStandard;
import com.ruoyi.quality.pojo.QualityUnqualified;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
-import com.ruoyi.staff.mapper.StaffJoinLeaveRecordMapper;
-import com.ruoyi.staff.mapper.StaffOnJobMapper;
-import com.ruoyi.staff.pojo.StaffJoinLeaveRecord;
-import com.ruoyi.staff.pojo.StaffOnJob;
-import com.ruoyi.staff.service.IStaffOnJobService;
+import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,7 +38,10 @@
import javax.servlet.http.HttpServletResponse;
import java.io.InputStream;
import java.io.OutputStream;
+import java.math.BigDecimal;
import java.net.URLEncoder;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@@ -54,22 +59,34 @@
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private ProcurementRecordService procurementRecordService;
+
@Override
public int add(QualityInspectDto qualityInspectDto) {
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto,qualityInspect);
qualityInspect.setInspectState(0);//榛樿鏈彁浜�
- qualityInspectMapper.insert(qualityInspect);
+ int inserted = qualityInspectMapper.insert(qualityInspect);
+ if (inserted <= 0 || qualityInspect.getId() == null) {
+ throw new ServiceException("鏂板妫�楠岃褰曞け璐�");
+ }
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
qualityInspectParam.setInspectId(qualityInspect.getId());
}
- qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
- return 0;
+ if (!qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams())) {
+ throw new ServiceException("淇濆瓨妫�楠岄」鐩け璐�");
+ }
+ return inserted;
}
@Override
public QualityInspectDto getDetailById(Integer id) {
QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
+ if (qualityInspect == null) {
+ throw new ServiceException("妫�楠岃褰曚笉瀛樺湪");
+ }
List<QualityInspectParam> qualityInspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
QualityInspectDto qualityInspectDto = new QualityInspectDto();
BeanUtils.copyProperties(qualityInspect,qualityInspectDto);
@@ -80,16 +97,120 @@
//鎻愪氦
@Override
public int submit(QualityInspect inspect) {
+ if (inspect == null || inspect.getId() == null) {
+ throw new ServiceException("妫�楠岃褰旾D涓嶈兘涓虹┖");
+ }
QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
+ if (qualityInspect == null) {
+ throw new ServiceException("妫�楠岃褰曚笉瀛樺湪");
+ }
+ if (Integer.valueOf(1).equals(qualityInspect.getInspectState())) {
+ throw new ServiceException("妫�楠岃褰曞凡鎻愪氦锛岃鍕块噸澶嶆搷浣�");
+ }
+ if (!"鍚堟牸".equals(qualityInspect.getCheckResult())
+ && !"涓嶅悎鏍�".equals(qualityInspect.getCheckResult())) {
+ throw new ServiceException("璇峰厛瀹屾垚妫�楠岀粨鏋滃垽瀹�");
+ }
+ List<QualityInspectParam> inspectParams = qualityInspectParamService.list(
+ Wrappers.<QualityInspectParam>lambdaQuery()
+ .eq(QualityInspectParam::getInspectId, inspect.getId()));
+ if (inspectParams.isEmpty()) {
+ throw new ServiceException("妫�楠岄」鐩负绌猴紝涓嶈兘鎻愪氦");
+ }
+ for (QualityInspectParam parameter : inspectParams) {
+ if (StringUtils.isBlank(parameter.getTestValue())) {
+ throw new ServiceException("妫�楠岄」鐩��" + parameter.getParameterItem() + "鈥濆皻鏈～鍐欐楠屽��");
+ }
+ }
/*鍒ゆ柇涓嶅悎鏍�*/
if (ObjectUtils.isNotNull(qualityInspect.getCheckResult()) && qualityInspect.getCheckResult().equals("涓嶅悎鏍�")){
QualityUnqualified qualityUnqualified = new QualityUnqualified();
BeanUtils.copyProperties(qualityInspect,qualityUnqualified);
qualityUnqualified.setInspectState(0);//寰呭鐞�
- List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
qualityUnqualified.setDefectivePhenomena(text+"杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
qualityUnqualifiedMapper.insert(qualityUnqualified);
+ }
+
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if (qualityInspect.getInspectType() == 0) {
+ // 鍚堟牸涓斿叧鑱斾簡閲囪喘鍗�/浜у搧淇℃伅鏃舵墠鑷姩鍏ュ簱锛屼俊鎭笉鍏ㄦ椂璺宠繃鍏ュ簱浣嗘甯告彁浜�
+ if ("鍚堟牸".equals(qualityInspect.getCheckResult())
+ && qualityInspect.getPurchaseLedgerId() != null) {
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(qualityInspect.getProductId());
+ if (salesLedgerProduct != null) {
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(1);
+ procurementRecordOutAdd.setTypeName("閲囪喘鍘熸潗鏂欐楠屽悎鏍煎叆搴�");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ procurementRecordOutAdd.setPurchaseLedgerId(Math.toIntExact(qualityInspect.getPurchaseLedgerId()));
+
+ ArrayList<Details> detailss = new ArrayList<>();
+ Details details = new Details();
+ details.setId(Math.toIntExact(salesLedgerProduct.getId()));
+ details.setInboundQuantity(qualityInspect.getQuantity());
+ details.setWarnNum(salesLedgerProduct.getWarnNum());
+ details.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
+ details.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details.setProductModelId(qualityInspect.getProductModelId());
+ detailss.add( details);
+ procurementRecordOutAdd.setDetails(detailss);
+ procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
+ procurementRecordService.add(procurementRecordOutAdd);
+ }
+ }
+ }else if (qualityInspect.getInspectType() == 1) {
+ // 杩囩▼妫�楠屼粎鍚堟牸鏃跺叆搴擄紝涓嶅悎鏍煎搧鐢变笂闈㈢殑涓嶅悎鏍肩鐞嗘祦绋嬪鐞�
+ if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(2);
+ procurementRecordOutAdd.setTypeName("鐢熶骇杩囩▼妫�楠屽悎鏍煎叆搴�");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ List<Details> details = new ArrayList<>();
+ Details details1 = new Details();
+ details1.setInboundQuantity(qualityInspect.getQuantity());
+ details1.setProductModelId(qualityInspect.getProductModelId());
+ procurementRecordOutAdd.setDetails(details);
+
+ ProcurementRecordStorage.ProcurementRecordStorageBuilder procurementRecordBuilder = ProcurementRecordStorage.builder()
+ .salesLedgerProductId(0)
+ .inboundBatches( "鐢熶骇鍗婃垚鍝佸叆搴�")
+ .inboundNum(details1.getInboundQuantity())
+ .type(2)
+ .warnNum(new BigDecimal(0))
+ .unitPrice(new BigDecimal(0))
+ .totalPrice(new BigDecimal(0))
+ .createTime(LocalDateTime.now())
+ .createUser(loginUser.getUserId())
+ .updateTime(LocalDateTime.now())
+ .updateUser(loginUser.getUserId())
+ .createBy(procurementRecordOutAdd.getNickName())
+ .productModelId(details1.getProductModelId())
+ .qualityInspectId(qualityInspect.getId());
+ procurementRecordService.save(procurementRecordBuilder.build());
+ }
+ }else if (qualityInspect.getInspectType() == 2) {
+ // 鍑哄巶妫�楠屼粎鍚堟牸鏃跺叆搴擄紝缂哄皯浜у搧淇℃伅鏃惰烦杩囧叆搴撲絾姝ｅ父鎻愪氦
+ if ("鍚堟牸".equals(qualityInspect.getCheckResult())) {
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectSalesLedgerProductByMainId(qualityInspect.getProductMainId());
+ if (salesLedgerProduct != null) {
+ ProcurementAddDto procurementRecordOutAdd = new ProcurementAddDto();
+ procurementRecordOutAdd.setType(2);
+ procurementRecordOutAdd.setTypeName("鐢熶骇鍑哄巶妫�楠屽悎鏍煎叆搴�");
+ procurementRecordOutAdd.setNickName(loginUser.getNickName());
+ List<Details> details = new ArrayList<>();
+ Details details1 = new Details();
+ details1.setInboundQuantity(qualityInspect.getQuantity());
+ details1.setId(Math.toIntExact(salesLedgerProduct.getId()));
+ details1.setUnitPrice(salesLedgerProduct.getTaxInclusiveUnitPrice());
+ details1.setTotalPrice(salesLedgerProduct.getTaxInclusiveTotalPrice());
+ details1.setProductModelId(salesLedgerProduct.getProductModelId());
+ details.add(details1);
+ procurementRecordOutAdd.setDetails(details);
+ procurementRecordOutAdd.setQualityInspectId(qualityInspect.getId());
+ procurementRecordService.add(procurementRecordOutAdd);
+ }
+ }
}
qualityInspect.setInspectState(1);//宸叉彁浜�
return qualityInspectMapper.updateById(qualityInspect);
@@ -133,6 +254,7 @@
response.setContentType("application/msword");
String fileName = URLEncoder.encode(
"妫�楠屾姤鍛�", "UTF-8");
+ response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
response.setHeader("Content-disposition",
"attachment;filename=" + fileName + ".docx");
OutputStream os = response.getOutputStream();
--
Gitblit v1.9.3