From c2ad2126d6f8423e0a5e6e20bbb91ef6bb1cffc0 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 13:26:27 +0800
Subject: [PATCH] fix(approve): 修复审批流程为空时的异常处理
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 255 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 197 insertions(+), 58 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 22055fc..6a8d220 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -2,108 +2,247 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
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.ruoyi.common.exception.base.BaseException;
+import com.deepoove.poi.XWPFTemplate;
+import com.deepoove.poi.config.Configure;
+import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.exception.ServiceException;
+import com.ruoyi.common.utils.DictUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.procurementrecord.service.ProcurementRecordService;
+import com.ruoyi.procurementrecord.utils.StockUtils;
+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 lombok.AllArgsConstructor;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
@AllArgsConstructor
@Service
@Transactional(rollbackFor = Exception.class)
-public class QualityInspectServiceImpl extends ServiceImpl<QualityInspectMapper, QualityInspect> implements IQualityInspectService {
+public class QualityInspectServiceImpl extends ServiceImpl<QualityInspectMapper, QualityInspect> implements IQualityInspectService {
+ private final StockUtils stockUtils;
private QualityInspectMapper qualityInspectMapper;
private IQualityInspectParamService qualityInspectParamService;
private QualityTestStandardMapper qualityTestStandardMapper;
+ private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+
+ private SalesLedgerProductMapper salesLedgerProductMapper;
+
+ private ProcurementRecordService procurementRecordService;
+
@Override
- public int add(QualityInspect qualityInspect) {
- String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
- //鏍规嵁浜у搧id鏌ヨ鎸囨爣缁存姢瀵瑰簲鏂板妫�楠屽弬鏁�
- List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
- .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
- if (qualityTestStandards.size()>0){
- qualityInspectMapper.insert(qualityInspect);
- List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
- QualityInspectParam qualityInspectParam = new QualityInspectParam();
- BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
- qualityInspectParam.setInspectId(qualityInspect.getId());
- return qualityInspectParam;
- }).collect(Collectors.toList());
- qualityInspectParamService.saveBatch(qualityInspectParams);
- }else{
- throw new BaseException("璇ヤ骇鍝佹病鏈夌淮鎶ゆ楠屾寚鏍�,璇锋鏌�!!!!!!!!");
+ public int add(QualityInspectDto qualityInspectDto) {
+ QualityInspect qualityInspect = new QualityInspect();
+ BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
+ validateProcessType(qualityInspect);
+ qualityInspect.setInspectState(0);//榛樿鏈彁浜�
+ qualityInspectMapper.insert(qualityInspect);
+ for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
+ qualityInspectParam.setInspectId(qualityInspect.getId());
}
+ qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
return 0;
}
@Override
- public int updateQualityInspect(QualityInspect qualityInspect) {
- String[] ignoreProperties = {"id"};//鎺掗櫎id灞炴��
- //鍏堝垹闄ゆ墍鏈夋楠屽弬鏁板啀鏂板
- qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery()
- .eq(QualityInspectParam::getInspectId,qualityInspect.getId()));
- //鏍规嵁浜у搧id鏌ヨ鎸囨爣缁存姢瀵瑰簲鏂板妫�楠屽弬鏁�
- List<QualityTestStandard> qualityTestStandards = qualityTestStandardMapper.selectList(Wrappers.<QualityTestStandard>lambdaQuery()
- .eq(QualityTestStandard::getProductId, qualityInspect.getProductId()));
- if (qualityTestStandards.size()>0){
- List<QualityInspectParam> qualityInspectParams = qualityTestStandards.stream().map(qualityTestStandard -> {
- QualityInspectParam qualityInspectParam = new QualityInspectParam();
- BeanUtils.copyProperties(qualityTestStandard, qualityInspectParam,ignoreProperties);
- qualityInspectParam.setInspectId(qualityInspect.getId());
- return qualityInspectParam;
- }).collect(Collectors.toList());
- qualityInspectParamService.saveBatch(qualityInspectParams);
- }else{
- throw new BaseException("璇ヤ骇鍝佹病鏈夌淮鎶ゆ楠屾寚鏍�,璇锋鏌�!!!!!!!!");
+ public QualityInspectDto getDetailById(Integer id) {
+ QualityInspect qualityInspect = qualityInspectMapper.selectById(id);
+ List<QualityInspectParam> qualityInspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, id));
+ QualityInspectDto qualityInspectDto = new QualityInspectDto();
+ BeanUtils.copyProperties(qualityInspect, qualityInspectDto);
+ qualityInspectDto.setQualityInspectParams(qualityInspectParams);
+ return qualityInspectDto;
+ }
+
+ //鎻愪氦
+ @Override
+ public int submit(QualityInspect inspect) {
+ QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
+ //鎻愪氦鍓嶅繀椤诲垽鏂槸鍚﹀悎鏍�
+ if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
+ throw new RuntimeException("璇峰厛鍒ゆ柇鏄惁鍚堟牸");
}
- return qualityInspectMapper.updateById(qualityInspect);
+ /*鍒ゆ柇涓嶅悎鏍�*/
+ if (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 + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
+ qualityUnqualified.setInspectId(qualityInspect.getId());
+ qualityUnqualifiedMapper.insert(qualityUnqualified);
+ } else {
+ //鍚堟牸鐩存帴鍏ュ簱
+ stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(), qualityInspect.getId());
+ }
+ qualityInspect.setInspectState(1);//宸叉彁浜�
+ return qualityInspectMapper.updateById(qualityInspect);
+ }
+
+ /*鐢熸垚妫�楠屾姤鍛�*/
+ @Override
+ public void down(HttpServletResponse response, QualityInspect qualityInspect) {
+ QualityInspect inspect = qualityInspectMapper.selectById(qualityInspect.getId());
+ String inspectType = "";
+ switch (inspect.getInspectType()) {
+ case 0:
+ inspectType = "鍘熸潗鏂欐楠�";
+ break;
+ case 1:
+ inspectType = "杩囩▼妫�楠�";
+ break;
+ case 2:
+ inspectType = "鍑哄巶妫�楠�";
+ break;
+ }
+ List<QualityInspectParam> paramList = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
+ int index = 1;
+ for (QualityInspectParam detail : paramList) {
+ detail.setIndex(index);
+ index++;
+ }
+ InputStream inputStream = this.getClass().getResourceAsStream("/static/report-template.docx");
+ Configure configure = Configure.builder()
+ .bind("paramList", new HackLoopTableRenderPolicy())
+ .build();
+ String finalInspectType = inspectType;
+ XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
+ new HashMap<String, Object>() {{
+ put("inspect", inspect);
+ put("inspectType", finalInspectType);
+ put("paramList", paramList);
+ }});
+
+ try {
+ 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();
+ template.write(os);
+ os.flush();
+ os.close();
+ inputStream.close();
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException("瀵煎嚭澶辫触");
+ }
}
@Override
- public IPage<QualityInspect> qualityInspectListPage(Page page, QualityInspect qualityInspect) {
- return qualityInspectMapper.qualityInspectListPage(page,qualityInspect);
+ public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
+ if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
+ qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, qualityInspectDto.getId()));
+ for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
+ qualityInspectParam.setInspectId(qualityInspectDto.getId());
+ }
+ qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
+ }
+ QualityInspect qualityInspect = new QualityInspect();
+ BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
+ validateProcessType(qualityInspect);
+ return qualityInspectMapper.updateById(qualityInspect);
+ }
+
+ @Override
+ public IPage<QualityInspectDto> qualityInspectListPage(Page page, QualityInspectDto qualityInspect) {
+ return qualityInspectMapper.qualityInspectListPage(page, qualityInspect);
}
@Override
public void qualityInspectExport(HttpServletResponse response, QualityInspect qualityInspect) {
- List<QualityInspect> qualityInspects =qualityInspectMapper.qualityInspectExport(qualityInspect);
- ExcelUtil<QualityInspect> util = new ExcelUtil<QualityInspect>(QualityInspect.class);
- switch (qualityInspect.getInspectType()){
- case 0:
- util.exportExcel(response, qualityInspects, "鍘熸潗鏂欐楠屽鍑�");
- break;
- case 1:
- util.exportExcel(response, qualityInspects, "杩囩▼妫�楠屽鍑�");
- break;
- case 2:
- util.exportExcel(response, qualityInspects, "鍑哄巶妫�楠屽鍑�");
- break;
+ List<QualityInspect> qualityInspects = qualityInspectMapper.qualityInspectExport(qualityInspect);
+ if (qualityInspects != null && !qualityInspects.isEmpty()) {
+ for (QualityInspect inspect : qualityInspects) {
+ if (inspect == null || inspect.getProcessType() == null) {
+ continue;
+ }
+ String processLabel = DictUtils.getDictLabel("product_process_type", String.valueOf(inspect.getProcessType()));
+ if (StringUtils.isNotEmpty(processLabel)) {
+ inspect.setProcess(processLabel);
+ }
+ }
}
+ ExcelUtil<QualityInspect> util = new ExcelUtil<>(QualityInspect.class);
+ String sheetName = "妫�楠屽鍑�";
+ if (qualityInspect != null && qualityInspect.getInspectType() != null) {
+ switch (qualityInspect.getInspectType()) {
+ case 0:
+ util.hideColumn("customer", "process");
+ sheetName = "鍘熸潗鏂欐楠屽鍑�";
+ break;
+ case 1:
+ util.hideColumn("supplier", "customer");
+ sheetName = "杩囩▼妫�楠屽鍑�";
+ break;
+ case 2:
+ util.hideColumn("supplier", "customer", "process");
+ sheetName = "鍑哄巶妫�楠屽鍑�";
+ break;
+ default:
+ break;
+ }
+ }
+ util.exportExcel(response, qualityInspects, sheetName);
+
}
+
+ private void validateProcessType(QualityInspect qualityInspect) {
+ if (qualityInspect == null || qualityInspect.getProcessType() == null) {
+ return;
+ }
+
+ String dictType = "product_process_type";
+ String input = String.valueOf(qualityInspect.getProcessType());
+
+ String dictValue = DictUtils.getDictValue(dictType, input);
+ if (StringUtils.isNotEmpty(dictValue)) {
+ qualityInspect.setProcessType(Integer.valueOf(dictValue));
+ return;
+ }
+ String dictValues = DictUtils.getDictValues(dictType);
+ if (StringUtils.isNotEmpty(dictValues)) {
+ List<String> valueList = Arrays.asList(dictValues.split(DictUtils.SEPARATOR));
+ if (valueList.contains(input)) {
+ return;
+ }
+ }
+
+ throw new ServiceException("宸ュ簭绫诲瀷銆�" + input + "銆戜笉瀛樺湪锛岃濉啓姝ｇ‘鐨勭被鍨嬶細" + DictUtils.getDictLabels(dictType));
+ }
+
+
}
--
Gitblit v1.9.3