package cn.iocoder.yudao.module.mes.service.qc.ipqc;
|
|
import cn.hutool.core.collection.CollUtil;
|
import cn.hutool.core.util.ObjUtil;
|
import cn.hutool.core.util.ObjectUtil;
|
import cn.hutool.core.util.StrUtil;
|
import cn.iocoder.yudao.framework.common.exception.ServiceException;
|
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceLineDO;
|
import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum;
|
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcImportExcelVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcPageReqVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcImportRespVO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.feedback.MesProFeedbackDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.ipqc.MesQcIpqcDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO;
|
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcMapper;
|
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
|
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
|
import cn.iocoder.yudao.module.mes.enums.qc.MesQcDefectLevelEnum;
|
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
|
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
|
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
|
import cn.iocoder.yudao.module.mes.service.pro.feedback.MesProFeedbackService;
|
import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordService;
|
import cn.iocoder.yudao.module.mes.service.qc.imports.MesQcImportHelper;
|
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
|
import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.ncr.vo.MesQcNcrSaveReqVO;
|
import cn.iocoder.yudao.module.mes.service.qc.ncr.MesQcNcrService;
|
import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService;
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
import jakarta.annotation.Resource;
|
import lombok.extern.slf4j.Slf4j;
|
import org.springframework.context.annotation.Lazy;
|
import org.springframework.stereotype.Service;
|
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.validation.annotation.Validated;
|
|
import java.math.BigDecimal;
|
import java.math.RoundingMode;
|
import java.util.ArrayList;
|
import java.util.HashMap;
|
import java.util.LinkedHashMap;
|
import java.util.List;
|
import java.util.Map;
|
import java.util.Objects;
|
|
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
|
import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*;
|
|
/**
|
* MES 过程检验单（IPQC） Service 实现类
|
*
|
* @author 超级管理员
|
*/
|
@Service
|
@Validated
|
@Slf4j
|
public class MesQcIpqcServiceImpl implements MesQcIpqcService {
|
|
@Resource
|
private MesQcIpqcMapper ipqcMapper;
|
|
@Resource
|
private MesQcImportHelper qcImportHelper;
|
|
@Resource
|
private MesQcTemplateItemService templateItemService;
|
@Resource
|
private MesQcIpqcLineService ipqcLineService;
|
@Resource
|
@Lazy
|
private MesQcDefectRecordService defectRecordService;
|
@Resource
|
@Lazy
|
private MesProFeedbackService feedbackService;
|
@Resource
|
@Lazy
|
private MesQcIndicatorResultService indicatorResultService;
|
@Resource
|
@Lazy
|
private MesWmProductProduceLineService productProduceLineService;
|
|
@Resource
|
@Lazy
|
private MesQcNcrService ncrService;
|
|
@Resource
|
private MdmItemApi mdmItemApi;
|
|
@Resource
|
private AdminUserApi adminUserApi;
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public Long createIpqc(MesQcIpqcSaveReqVO createReqVO) {
|
// 1.1 校验数据
|
validateIpqcSaveData(createReqVO);
|
// 1.2 产品物料由前端指定（MDM 物料），校验其存在
|
Long itemId = createReqVO.getItemId();
|
// 1.3 根据物料 + IPQC 类型查找可用质检方案（支持前端显式指定）
|
List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
|
itemId, MesQcTypeEnum.IPQC.getType());
|
if (CollUtil.isEmpty(templateItems)) {
|
throw exception(QC_NO_TEMPLATE);
|
}
|
MesQcTemplateItemDO templateItem = templateItems.get(0);
|
if (createReqVO.getTemplateId() != null) {
|
templateItem = templateItems.stream()
|
.filter(available -> Objects.equals(available.getTemplateId(), createReqVO.getTemplateId()))
|
.findFirst().orElse(null);
|
if (templateItem == null) {
|
throw exception(QC_NO_TEMPLATE); // 指定了方案但不在匹配列表中，拒绝
|
}
|
}
|
Long templateId = templateItem.getTemplateId();
|
// 1.5 获取来源单据编号
|
String sourceDocCode = validateAndGetSourceDocCode(
|
createReqVO.getSourceDocType(), createReqVO.getSourceDocId(), createReqVO.getSourceLineId());
|
|
// 2. 插入主表
|
MesQcIpqcDO ipqc = BeanUtils.toBean(createReqVO, MesQcIpqcDO.class)
|
.setItemId(itemId)
|
.setTemplateId(templateId)
|
.setSourceDocCode(sourceDocCode)
|
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
|
ipqcMapper.insert(ipqc);
|
|
// 3. 从模板指标自动生成检验行
|
ipqcLineService.createLinesFromTemplate(ipqc.getId(), templateId);
|
return ipqc.getId();
|
}
|
|
@Override
|
public void updateIpqc(MesQcIpqcSaveReqVO updateReqVO) {
|
// 1.1 校验存在 + 草稿状态
|
validateIpqcStatusPrepare(updateReqVO.getId());
|
// 1.2 校验数据
|
validateIpqcSaveData(updateReqVO);
|
|
// 2. 更新主表
|
MesQcIpqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcIpqcDO.class);
|
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 不允许修改来源单据
|
updateObj.setTemplateId(null); // 不允许修改模板
|
updateObj.setItemId(null); // 不允许修改物料
|
ipqcMapper.updateById(updateObj);
|
}
|
|
private void validateIpqcSaveData(MesQcIpqcSaveReqVO reqVO) {
|
// 校验编号唯一
|
validateIpqcCodeUnique(reqVO.getId(), reqVO.getCode());
|
// 校验批号非空（VO 层已校验，此处兜底内部/RPC 调用绕过校验的情况）
|
if (StrUtil.isBlank(reqVO.getBatchCode())) {
|
throw exception(QC_IPQC_BATCH_CODE_REQUIRED);
|
}
|
// 校验产品物料存在（物料 ID 来自 MDM）
|
mdmItemApi.validateItemExists(reqVO.getItemId());
|
// 校验检测人员存在
|
adminUserApi.validateUser(reqVO.getInspectorUserId());
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public void finishIpqc(Long id) {
|
// 1.1 校验存在 + 草稿状态
|
MesQcIpqcDO ipqc = validateIpqcStatusPrepare(id);
|
// 1.2 校验检测结论必填
|
if (ipqc.getCheckResult() == null) {
|
throw exception(QC_IPQC_CHECK_RESULT_EMPTY);
|
}
|
// 1.3 校验至少存在一条检测结果
|
indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.IPQC.getType());
|
|
// 2. 更新状态为已完成
|
ipqcMapper.updateById(new MesQcIpqcDO()
|
.setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus()));
|
|
// 3. 不合格时自动创建 NCR
|
generateNcrIfNeeded(ipqc);
|
|
// 4. 回写来源单据
|
writeBackSourceDoc(ipqc);
|
}
|
|
/**
|
* 不合格时自动创建 NCR（不合格品处理单）
|
*
|
* @param ipqc 过程检验单
|
*/
|
private void generateNcrIfNeeded(MesQcIpqcDO ipqc) {
|
BigDecimal unqualifiedQty = ipqc.getUnqualifiedQuantity();
|
if (unqualifiedQty == null || unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
|
return;
|
}
|
String ncrCode = "NCR" + java.time.LocalDateTime.now()
|
.format(java.time.format.DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
|
MesQcNcrSaveReqVO saveReqVO = new MesQcNcrSaveReqVO();
|
saveReqVO.setCode(ncrCode);
|
saveReqVO.setName("不合格品处理单");
|
saveReqVO.setQcType(MesQcTypeEnum.IPQC.getType());
|
saveReqVO.setQcId(ipqc.getId());
|
saveReqVO.setItemId(ipqc.getItemId());
|
saveReqVO.setUnqualifiedQuantity(unqualifiedQty);
|
saveReqVO.setDefectDescription("由过程检验(" + ipqc.getCode() + ")自动生成");
|
ncrService.createNcr(saveReqVO);
|
log.info("[generateNcrIfNeeded] IPQC({}) 不合格，自动创建 NCR", ipqc.getId());
|
}
|
|
/**
|
* 回写来源单据（IPQC 完成后）
|
*
|
* <p>当来源为报工时，拆分待检产出行、完成产出入库、回写报工状态和任务/工单进度
|
*
|
* @param ipqc 过程检验单
|
*/
|
private void writeBackSourceDoc(MesQcIpqcDO ipqc) {
|
// 1. 确定 sourceDocType/sourceDocId
|
Long sourceDocId = ipqc.getSourceDocId();
|
Long sourceLineId = ipqc.getSourceLineId();
|
|
if (sourceDocId == null) {
|
log.warn("[writeBackSourceDoc] IPQC({}) 无法确定来源报工，跳过回写", ipqc.getId());
|
return;
|
}
|
|
// 2. 回写报工
|
feedbackService.updateProFeedbackWhenIpqcFinish(sourceDocId, sourceLineId,
|
ObjectUtil.defaultIfNull(ipqc.getQualifiedQuantity(), BigDecimal.ZERO),
|
ObjectUtil.defaultIfNull(ipqc.getUnqualifiedQuantity(), BigDecimal.ZERO),
|
ObjectUtil.defaultIfNull(ipqc.getLaborScrapQuantity(), BigDecimal.ZERO),
|
ObjectUtil.defaultIfNull(ipqc.getMaterialScrapQuantity(), BigDecimal.ZERO),
|
ObjectUtil.defaultIfNull(ipqc.getOtherScrapQuantity(), BigDecimal.ZERO));
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public void deleteIpqc(Long id) {
|
// 1. 校验存在 + 草稿状态
|
validateIpqcStatusPrepare(id);
|
|
// 2.1 删除主表
|
ipqcMapper.deleteById(id);
|
// 2.2 级联删除行
|
ipqcLineService.deleteListByIpqcId(id);
|
// 2.3 级联删除缺陷记录
|
defectRecordService.deleteListByQcTypeAndQcId(MesQcTypeEnum.IPQC.getType(), id);
|
}
|
|
@Override
|
public MesQcIpqcDO validateIpqcExists(Long id) {
|
MesQcIpqcDO ipqc = ipqcMapper.selectById(id);
|
if (ipqc == null) {
|
throw exception(QC_IPQC_NOT_EXISTS);
|
}
|
return ipqc;
|
}
|
|
/**
|
* 校验过程检验单存在且为草稿状态
|
*
|
* @param id 过程检验单 ID
|
* @return 过程检验单
|
*/
|
private MesQcIpqcDO validateIpqcStatusPrepare(Long id) {
|
MesQcIpqcDO ipqc = validateIpqcExists(id);
|
if (ObjUtil.notEqual(ipqc.getStatus(), MesQcStatusEnum.DRAFT.getStatus())) {
|
throw exception(QC_IPQC_NOT_PREPARE);
|
}
|
return ipqc;
|
}
|
|
private void validateIpqcCodeUnique(Long id, String code) {
|
MesQcIpqcDO ipqc = ipqcMapper.selectByCode(code);
|
if (ipqc == null) {
|
return;
|
}
|
if (ObjUtil.notEqual(ipqc.getId(), id)) {
|
throw exception(QC_IPQC_CODE_DUPLICATE);
|
}
|
}
|
|
private String validateAndGetSourceDocCode(Integer sourceDocType, Long sourceDocId, Long sourceLineId) {
|
if (sourceDocType == null || sourceDocId == null) {
|
return null;
|
}
|
if (Objects.equals(sourceDocType, MesBizTypeConstants.PRO_FEEDBACK)) {
|
MesProFeedbackDO feedback = feedbackService.validateFeedbackExists(sourceDocId);
|
// 校验 sourceLineId 必填
|
if (sourceLineId == null) {
|
throw exception(QC_IPQC_SOURCE_LINE_REQUIRED);
|
}
|
// 校验 sourceLineId 存在，且属于该报工的产出行
|
MesWmProductProduceLineDO targetLine = productProduceLineService
|
.validateProductProduceLineExists(sourceLineId);
|
if (ObjUtil.notEqual(targetLine.getFeedbackId(), sourceDocId)) {
|
throw exception(QC_IPQC_SOURCE_LINE_NOT_BELONG);
|
}
|
// 校验该产出行为待检验状态
|
if (ObjUtil.notEqual(targetLine.getQualityStatus(), MesWmQualityStatusEnum.PENDING.getStatus())) {
|
throw exception(QC_IPQC_SOURCE_LINE_NOT_PENDING);
|
}
|
return feedback.getCode();
|
}
|
// 未知来源类型应报错，而不是静默忽略
|
throw exception(QC_IPQC_SOURCE_DOC_TYPE_UNKNOWN);
|
}
|
|
@Override
|
public MesQcIpqcDO getIpqc(Long id) {
|
return ipqcMapper.selectById(id);
|
}
|
|
@Override
|
public PageResult<MesQcIpqcDO> getIpqcPage(MesQcIpqcPageReqVO pageReqVO) {
|
return ipqcMapper.selectPage(pageReqVO);
|
}
|
|
@Override
|
public void recalculateDefectStats(Long ipqcId, List<MesQcDefectRecordDO> records) {
|
MesQcIpqcDO ipqc = validateIpqcExists(ipqcId);
|
// 1. 行级缺陷统计
|
ipqcLineService.recalculateLineDefectStats(ipqcId, records);
|
|
// 2.1 汇总主表的缺陷数量
|
int totalCritical = 0;
|
int totalMajor = 0;
|
int totalMinor = 0;
|
for (MesQcDefectRecordDO record : records) {
|
int quantity = ObjUtil.defaultIfNull(record.getQuantity(), 1);
|
if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.CRITICAL.getType())) {
|
totalCritical += quantity;
|
} else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MAJOR.getType())) {
|
totalMajor += quantity;
|
} else if (Objects.equals(record.getLevel(), MesQcDefectLevelEnum.MINOR.getType())) {
|
totalMinor += quantity;
|
} else {
|
throw exception(QC_DEFECT_RECORD_LEVEL_UNKNOWN);
|
}
|
}
|
// 2.2 计算缺陷率
|
BigDecimal criticalRate = BigDecimal.ZERO;
|
BigDecimal majorRate = BigDecimal.ZERO;
|
BigDecimal minorRate = BigDecimal.ZERO;
|
if (ipqc.getCheckQuantity() != null && ipqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) {
|
BigDecimal checkQty = ipqc.getCheckQuantity();
|
criticalRate = BigDecimal.valueOf(totalCritical).multiply(BigDecimal.valueOf(100))
|
.divide(checkQty, 2, RoundingMode.HALF_UP);
|
majorRate = BigDecimal.valueOf(totalMajor).multiply(BigDecimal.valueOf(100))
|
.divide(checkQty, 2, RoundingMode.HALF_UP);
|
minorRate = BigDecimal.valueOf(totalMinor).multiply(BigDecimal.valueOf(100))
|
.divide(checkQty, 2, RoundingMode.HALF_UP);
|
}
|
// 2.3 更新主表
|
MesQcIpqcDO updateIpqc = new MesQcIpqcDO().setId(ipqcId)
|
.setCriticalQuantity(totalCritical).setMajorQuantity(totalMajor).setMinorQuantity(totalMinor)
|
.setCriticalRate(criticalRate).setMajorRate(majorRate).setMinorRate(minorRate);
|
ipqcMapper.updateById(updateIpqc);
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public MesQcImportRespVO importIpqcList(List<MesQcIpqcImportExcelVO> importList) {
|
MesQcImportRespVO respVO = MesQcImportRespVO.builder()
|
.createList(new ArrayList<>()).failureList(new LinkedHashMap<>()).build();
|
if (CollUtil.isEmpty(importList)) {
|
return respVO;
|
}
|
qcImportHelper.startImport();
|
Map<String, Integer> firstRowNoByKey = new HashMap<>();
|
for (int i = 0; i < importList.size(); i++) {
|
MesQcIpqcImportExcelVO row = importList.get(i);
|
if (isImportRowEmpty(row)) {
|
continue; // 跳过空行
|
}
|
String label = StrUtil.isNotBlank(row.getCode()) ? "检验单编号 " + row.getCode().trim()
|
: "第 " + (i + 2) + " 行";
|
String importKey = buildImportKey(row);
|
try {
|
Integer firstRowNo = firstRowNoByKey.get(importKey);
|
if (firstRowNo != null) {
|
throw MesQcImportHelper.duplicateRowException(firstRowNo, buildImportKeyDesc(row));
|
}
|
respVO.getCreateList().add(createIpqcByImport(row));
|
firstRowNoByKey.putIfAbsent(importKey, i + 2);
|
} catch (Exception ex) {
|
respVO.getFailureList().put(label, MesQcImportHelper.resolveImportErrorMessage(ex));
|
}
|
}
|
return respVO;
|
}
|
|
private boolean isImportRowEmpty(MesQcIpqcImportExcelVO row) {
|
return row == null || (StrUtil.isBlank(row.getCode()) && StrUtil.isBlank(row.getName())
|
&& StrUtil.isBlank(row.getType()) && StrUtil.isBlank(row.getItemCode())
|
&& StrUtil.isBlank(row.getBatchCode()) && StrUtil.isBlank(row.getTemplateName())
|
&& row.getCheckQuantity() == null && row.getQualifiedQuantity() == null
|
&& row.getUnqualifiedQuantity() == null && row.getLaborScrapQuantity() == null
|
&& row.getMaterialScrapQuantity() == null && row.getOtherScrapQuantity() == null
|
&& StrUtil.isBlank(row.getCheckResult()) && StrUtil.isBlank(row.getInspectorName())
|
&& StrUtil.isBlank(row.getInspectDate()) && StrUtil.isBlank(row.getRemark()));
|
}
|
|
/**
|
* 依据导入行创建一张过程检验单：物料按产品物料编码匹配，批号必填，状态为「待检验」，检验行由质检方案自动生成
|
*
|
* @return 检验单编号
|
*/
|
private String createIpqcByImport(MesQcIpqcImportExcelVO row) {
|
MesQcIpqcSaveReqVO reqVO = new MesQcIpqcSaveReqVO();
|
// 1. 检验单编号：填写则使用，留空自动生成
|
String code = StrUtil.isNotBlank(row.getCode()) ? row.getCode().trim()
|
: qcImportHelper.generateCode(MesMdAutoCodeRuleCodeEnum.QC_IPQC_CODE.getCode());
|
if (ipqcMapper.selectByCode(code) != null) {
|
throw new IllegalArgumentException("检验单编号已存在：" + code
|
+ "。请修改模板中的「检验单编号」，或先在系统中删除该编号的检验单后重新导入");
|
}
|
reqVO.setCode(code);
|
// 2. 名称、检验类型、产品物料、批号、质检方案
|
if (StrUtil.isBlank(row.getName())) {
|
throw new IllegalArgumentException("检验单名称不能为空：请填写模板中该行的「检验单名称」列");
|
}
|
reqVO.setName(row.getName().trim());
|
reqVO.setType(qcImportHelper.resolveDictValue(row.getType(),
|
DictTypeConstants.MES_IPQC_TYPE, "检验类型", true));
|
reqVO.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
|
if (StrUtil.isBlank(row.getBatchCode())) {
|
throw new IllegalArgumentException("批号不能为空：请填写模板中该行的「批号」列");
|
}
|
reqVO.setBatchCode(row.getBatchCode().trim());
|
reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
|
// 3. 数量：合格品 + 不合格品 必须等于检测数量（检测数量留空则自动合计）；工废/料废/其他废留空按 0
|
BigDecimal qualified = qcImportHelper.resolveQuantity(row.getQualifiedQuantity(), "合格品数量", true);
|
BigDecimal unqualified = qcImportHelper.resolveQuantity(row.getUnqualifiedQuantity(), "不合格品数量", true);
|
reqVO.setQualifiedQuantity(qualified);
|
reqVO.setUnqualifiedQuantity(unqualified);
|
reqVO.setCheckQuantity(qcImportHelper.resolveCheckQuantity(
|
row.getCheckQuantity(), qualified, unqualified, "检测数量"));
|
BigDecimal laborScrap = qcImportHelper.resolveQuantity(row.getLaborScrapQuantity(), "工废数量", false);
|
BigDecimal materialScrap = qcImportHelper.resolveQuantity(row.getMaterialScrapQuantity(), "料废数量", false);
|
BigDecimal otherScrap = qcImportHelper.resolveQuantity(row.getOtherScrapQuantity(), "其他废品数量", false);
|
laborScrap = laborScrap != null ? laborScrap : BigDecimal.ZERO;
|
materialScrap = materialScrap != null ? materialScrap : BigDecimal.ZERO;
|
otherScrap = otherScrap != null ? otherScrap : BigDecimal.ZERO;
|
validateScrapQuantity(unqualified, laborScrap, materialScrap, otherScrap);
|
reqVO.setLaborScrapQuantity(laborScrap);
|
reqVO.setMaterialScrapQuantity(materialScrap);
|
reqVO.setOtherScrapQuantity(otherScrap);
|
// 4. 检验信息
|
reqVO.setCheckResult(qcImportHelper.resolveDictValue(row.getCheckResult(),
|
DictTypeConstants.MES_QC_CHECK_RESULT, "检测结果", false));
|
reqVO.setInspectorUserId(qcImportHelper.resolveInspectorUserId(row.getInspectorName()));
|
reqVO.setInspectDate(qcImportHelper.parseDateTime(row.getInspectDate(), "检测日期"));
|
reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
|
// 5. 去重：同一 物料 + 批号 + 检验类型 + 检测日期 的过程检验单不可重复导入
|
MesQcIpqcDO duplicate = CollUtil.getFirst(ipqcMapper.selectListByImportKey(reqVO.getItemId(),
|
reqVO.getBatchCode(), reqVO.getType(), reqVO.getInspectDate()));
|
if (duplicate != null) {
|
throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "过程检验单",
|
duplicate.getCode(), "质量管理-过程检验");
|
}
|
// 6. 复用创建逻辑：校验物料/人员、按物料匹配质检方案、生成检验行
|
try {
|
createIpqc(reqVO);
|
} catch (ServiceException ex) {
|
MesQcImportHelper.rethrowTemplateError(ex, row.getItemCode(), "过程检验(IPQC)");
|
}
|
return code;
|
}
|
|
/**
|
* 校验 工废 + 料废 + 其他废品 不超过不合格品数量
|
*/
|
private void validateScrapQuantity(BigDecimal unqualified, BigDecimal laborScrap,
|
BigDecimal materialScrap, BigDecimal otherScrap) {
|
BigDecimal scrapSum = laborScrap.add(materialScrap).add(otherScrap);
|
if (scrapSum.compareTo(unqualified) <= 0) {
|
return;
|
}
|
throw new IllegalArgumentException("工废、料废、其他废品数量之和不能超过不合格品数量：不合格品数量为 "
|
+ unqualified.stripTrailingZeros().toPlainString() + "，而 工废 " + laborScrap.stripTrailingZeros().toPlainString()
|
+ " + 料废 " + materialScrap.stripTrailingZeros().toPlainString() + " + 其他废品 "
|
+ otherScrap.stripTrailingZeros().toPlainString() + " = " + scrapSum.stripTrailingZeros().toPlainString()
|
+ "。请修改模板中的废品数量或不合格品数量后重新导入");
|
}
|
|
/**
|
* 导入去重键：同一 物料 + 批号 + 检验类型 + 检测日期 视为同一批过程检验数据
|
*/
|
private String buildImportKey(MesQcIpqcImportExcelVO row) {
|
return String.join("|", StrUtil.trimToEmpty(row.getItemCode()), StrUtil.trimToEmpty(row.getBatchCode()),
|
StrUtil.trimToEmpty(row.getType()), StrUtil.trimToEmpty(row.getInspectDate()));
|
}
|
|
private String buildImportKeyDesc(MesQcIpqcImportExcelVO row) {
|
return "物料[" + MesQcImportHelper.describeImportValue(row.getItemCode())
|
+ "]、批号[" + MesQcImportHelper.describeImportValue(row.getBatchCode())
|
+ "]、检验类型[" + MesQcImportHelper.describeImportValue(row.getType())
|
+ "]、检测日期[" + MesQcImportHelper.describeImportValue(row.getInspectDate()) + "]";
|
}
|
|
}
|
