From c6f3e3c081009b4503b9c666dfe8d6643b1d2bfb Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 03 九月 2026 11:56:33 +0800
Subject: [PATCH] fix(quality): 中间工序报工质检都不入库
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 41 insertions(+), 4 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 328c358..1d90048 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -1,7 +1,6 @@
package com.ruoyi.quality.service.impl;
-import cn.hutool.core.lang.Assert;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -9,10 +8,14 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.deepoove.poi.XWPFTemplate;
import com.deepoove.poi.config.Configure;
+import com.ruoyi.basic.enums.ApplicationTypeEnum;
+import com.ruoyi.basic.enums.RecordTypeEnum;
+import com.ruoyi.basic.utils.FileUtil;
import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.HackLoopTableRenderPolicy;
+import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.procurementrecord.service.ProcurementRecordService;
@@ -21,15 +24,19 @@
import com.ruoyi.quality.mapper.QualityInspectMapper;
import com.ruoyi.quality.mapper.QualityTestStandardMapper;
import com.ruoyi.quality.mapper.QualityUnqualifiedMapper;
+import com.ruoyi.quality.mapper.QualityUnqualifiedOrderMapper;
import com.ruoyi.quality.pojo.QualityInspect;
import com.ruoyi.quality.pojo.QualityInspectParam;
import com.ruoyi.quality.pojo.QualityUnqualified;
+import com.ruoyi.quality.pojo.QualityUnqualifiedOrder;
import com.ruoyi.stock.pojo.StockInRecord;
import com.ruoyi.stock.service.StockInRecordService;
import com.ruoyi.quality.service.IQualityInspectParamService;
import com.ruoyi.quality.service.IQualityInspectService;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
import com.ruoyi.stock.dto.StockInventoryDto;
+import com.ruoyi.stock.pojo.StockInRecord;
+import com.ruoyi.stock.service.StockInRecordService;
import com.ruoyi.stock.service.StockInventoryService;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
@@ -56,6 +63,7 @@
private final StockUtils stockUtils;
private final StockInventoryService stockInventoryService;
private final StockInRecordService stockInRecordService;
+ private final FileUtil fileUtil;
private QualityInspectMapper qualityInspectMapper;
private IQualityInspectParamService qualityInspectParamService;
@@ -63,6 +71,8 @@
private QualityTestStandardMapper qualityTestStandardMapper;
private QualityUnqualifiedMapper qualityUnqualifiedMapper;
+
+ private QualityUnqualifiedOrderMapper qualityUnqualifiedOrderMapper;
private SalesLedgerProductMapper salesLedgerProductMapper;
@@ -78,6 +88,8 @@
qualityInspectParam.setInspectId(qualityInspect.getId());
}
qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
+ // 淇濆瓨闄勪欢
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.QUALITY_INSPECT, qualityInspect.getId(), qualityInspectDto.getStorageBlobDTOs());
return 0;
}
@@ -88,6 +100,8 @@
QualityInspectDto qualityInspectDto = new QualityInspectDto();
BeanUtils.copyProperties(qualityInspect, qualityInspectDto);
qualityInspectDto.setQualityInspectParams(qualityInspectParams);
+ // 鏌ヨ闄勪欢
+ qualityInspectDto.setStorageBlobVOs(fileUtil.getStorageBlobVOsByRecordTypeAndRecordId(RecordTypeEnum.QUALITY_INSPECT, qualityInspect.getId()));
return qualityInspectDto;
}
@@ -119,8 +133,8 @@
qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
}
- // 鍚堟牸鐩存帴鍏ュ簱
- if(qualityInspect.getQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0){
+ // 鍚堟牸鐩存帴鍏ュ簱(杩囩▼妫�涓嶅叆搴�)
+ if(qualityInspect.getQualifiedQuantity().compareTo(BigDecimal.ZERO) > 0 && qualityInspect.getInspectType()!=1){
//浠呮坊鍔犲叆搴撹褰�
StockInventoryDto stockInventoryDto = new StockInventoryDto();
//濡傛灉鏄噰璐川妫�鍚堟牸鍏ュ簱閫夌敤CUSTOMIZATION_UNSTOCK_OUT,鍏朵綑鍚堟牸鍏ュ簱閫夌敤QUALITYINSPECT_STOCK_IN
@@ -153,6 +167,26 @@
qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
qualityUnqualified.setInspectId(qualityInspect.getId());
qualityUnqualifiedMapper.insert(qualityUnqualified);
+
+ // 鑷姩鍒涘缓涓嶅悎鏍煎搧澶勭悊鍗曪紝娴佸叆鏂版ā鍧�
+ QualityUnqualifiedOrder order = new QualityUnqualifiedOrder();
+ order.setUnqualifiedId(qualityUnqualified.getId());
+ order.setUnqualifiedProcess(qualityInspect.getInspectType() + 1);
+ order.setUnqualifiedQuantity(qualityInspect.getUnqualifiedQuantity());
+ order.setQuantity(qualityInspect.getQuantity());
+ order.setProductModelId(qualityInspect.getProductModelId());
+ order.setInspectorName(qualityInspect.getCheckName());
+ if (qualityInspect.getCheckTime() != null) {
+ order.setInspectDate(new java.util.Date(qualityInspect.getCheckTime().getTime()));
+ }
+ order.setSupplierName(qualityInspect.getSupplier());
+ order.setSpecificationModel(qualityInspect.getModel());
+ order.setProblemDescription(qualityInspect.getDefectivePhenomena());
+ order.setStatus(0);
+ String orderNo = OrderUtils.countTodayByCreateTime(
+ qualityUnqualifiedOrderMapper, "BHG", "order_no", LocalDateTime.now());
+ order.setOrderNo(orderNo);
+ qualityUnqualifiedOrderMapper.insert(order);
}
qualityInspect.setInspectState(1);//宸叉彁浜�
@@ -286,7 +320,10 @@
}
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
- return qualityInspectMapper.updateById(qualityInspect);
+ int result = qualityInspectMapper.updateById(qualityInspect);
+ // 淇濆瓨闄勪欢
+ fileUtil.saveStorageAttachment(ApplicationTypeEnum.FILE, RecordTypeEnum.QUALITY_INSPECT, qualityInspectDto.getId(), qualityInspectDto.getStorageBlobDTOs());
+ return result;
}
@Override
--
Gitblit v1.9.3