package cn.iocoder.yudao.module.mes.service.qc.oqc;
|
|
import cn.hutool.core.collection.CollUtil;
|
import cn.hutool.core.util.ObjUtil;
|
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.framework.common.util.object.BeanUtils;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcImportExcelVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcPageReqVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO;
|
import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcImportRespVO;
|
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
|
import cn.iocoder.yudao.module.mes.enums.md.autocode.MesMdAutoCodeRuleCodeEnum;
|
import cn.iocoder.yudao.module.mes.service.qc.imports.MesQcImportHelper;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.defectrecord.MesQcDefectRecordDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.template.MesQcTemplateItemDO;
|
import cn.iocoder.yudao.module.mes.dal.mysql.qc.oqc.MesQcOqcMapper;
|
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.qc.defectrecord.MesQcDefectRecordService;
|
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.service.wm.productsales.MesWmProductSalesLineService;
|
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.enums.qc.MesQcCheckResultEnum;
|
import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesDO;
|
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productsales.MesWmProductSalesLineDO;
|
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
|
import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
|
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
|
import jakarta.annotation.Resource;
|
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 出货检验单（OQC） Service 实现类
|
*
|
* @author 超级管理员
|
*/
|
@Service
|
@Validated
|
public class MesQcOqcServiceImpl implements MesQcOqcService {
|
|
@Resource
|
private MesQcOqcMapper oqcMapper;
|
|
@Resource
|
private MesQcTemplateItemService templateItemService;
|
@Resource
|
private MesQcOqcLineService oqcLineService;
|
@Resource
|
@Lazy
|
private MesQcDefectRecordService defectRecordService;
|
@Resource
|
@Lazy
|
private MesWmProductSalesLineService productSalesLineService;
|
@Resource
|
@Lazy
|
private MesWmProductSalesService productSalesService;
|
@Resource
|
@Lazy
|
private MesQcIndicatorResultService indicatorResultService;
|
|
@Resource
|
private AdminUserApi adminUserApi;
|
@Resource
|
private MdmItemApi mdmItemApi;
|
@Resource
|
private CrmCustomerApi customerApi;
|
|
@Resource
|
@Lazy
|
private MesQcNcrService ncrService;
|
|
@Resource
|
private MesQcImportHelper qcImportHelper;
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public Long createOqc(MesQcOqcSaveReqVO createReqVO) {
|
// 1.1 校验数据
|
validateOqcSaveData(createReqVO);
|
// 1.2 校验来源单据参数，并验证数据存在
|
String sourceDocCode = validateAndGetSourceDocCode(
|
createReqVO.getSourceDocType(), createReqVO.getSourceLineId());
|
// 1.3 根据产品 + OQC 类型查找可用质检方案（支持前端显式指定）
|
List<MesQcTemplateItemDO> templateItems = templateItemService.getTemplateItemList(
|
createReqVO.getItemId(), MesQcTypeEnum.OQC.getType(), null, null);
|
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();
|
|
// 2. 插入主表
|
MesQcOqcDO oqc = BeanUtils.toBean(createReqVO, MesQcOqcDO.class)
|
.setTemplateId(templateId)
|
.setSourceDocCode(sourceDocCode)
|
.setStatus(MesQcStatusEnum.DRAFT.getStatus());
|
oqcMapper.insert(oqc);
|
|
// 3. 从模板指标自动生成检验行
|
oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
|
return oqc.getId();
|
}
|
|
@Override
|
public void updateOqc(MesQcOqcSaveReqVO updateReqVO) {
|
// 1.1 校验存在 + 草稿状态
|
validateOqcStatusPrepare(updateReqVO.getId());
|
// 1.2 校验数据
|
validateOqcSaveData(updateReqVO);
|
|
// 2. 更新
|
MesQcOqcDO updateObj = BeanUtils.toBean(updateReqVO, MesQcOqcDO.class);
|
updateObj.setSourceDocType(null).setSourceDocId(null).setSourceLineId(null); // 不允许修改来源单据
|
updateObj.setTemplateId(null); // 不允许修改模板
|
updateObj.setItemId(null); // 不允许修改物料
|
oqcMapper.updateById(updateObj);
|
}
|
|
private void validateOqcSaveData(MesQcOqcSaveReqVO reqVO) {
|
// 校验编号唯一
|
validateOqcCodeUnique(reqVO.getId(), reqVO.getCode());
|
// 校验物料、检测人员存在
|
// 注：物料 ID 来自 MDM，客户 ID 来自 CRM
|
mdmItemApi.validateItemExists(reqVO.getItemId());
|
adminUserApi.validateUser(reqVO.getInspectorUserId());
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public void finishOqc(Long id) {
|
// 1.1 校验存在 + 草稿状态
|
MesQcOqcDO oqc = validateOqcStatusPrepare(id);
|
// 1.2 校验检测结论必填
|
if (oqc.getCheckResult() == null) {
|
throw exception(QC_OQC_CHECK_RESULT_EMPTY);
|
}
|
// 1.3 校验至少存在一条检测结果
|
indicatorResultService.validateIndicatorResultExistsByQcIdAndType(id, MesQcTypeEnum.OQC.getType());
|
|
// 2. 更新状态为已完成
|
MesQcOqcDO updateObj = new MesQcOqcDO()
|
.setId(id).setStatus(MesQcStatusEnum.FINISHED.getStatus());
|
oqcMapper.updateById(updateObj);
|
|
// 3. 不合格时自动创建 NCR
|
generateNcrIfNeeded(oqc);
|
|
// 4. 回写来源单据
|
writeBackSourceDoc(oqc);
|
}
|
|
/**
|
* 不合格时自动创建 NCR（不合格品处理单）
|
*
|
* @param oqc 出货检验单
|
*/
|
private void generateNcrIfNeeded(MesQcOqcDO oqc) {
|
BigDecimal unqualifiedQty = oqc.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.OQC.getType());
|
saveReqVO.setQcId(oqc.getId());
|
saveReqVO.setItemId(oqc.getItemId());
|
saveReqVO.setUnqualifiedQuantity(unqualifiedQty);
|
saveReqVO.setDefectDescription("由出货检验(" + oqc.getCode() + ")自动生成");
|
ncrService.createNcr(saveReqVO);
|
}
|
|
/**
|
* 回写来源单据（OQC 完成后）
|
*
|
* <p>当来源为销售出库单时，调用
|
* {@link MesWmProductSalesLineService#updateProductSalesLineWhenOqcFinish}
|
* 回写行的 oqcId、qualityStatus，并由该方法内部联动检查出库单整体状态
|
*
|
* @param oqc 出货检验单
|
*/
|
private void writeBackSourceDoc(MesQcOqcDO oqc) {
|
if (oqc.getSourceDocType() == null) {
|
return;
|
}
|
if (oqc.getSourceLineId() == null) {
|
throw new IllegalArgumentException(
|
"OQC 单[" + oqc.getId() + "] sourceDocType 非空但 sourceLineId 为空");
|
}
|
|
if (Objects.equals(oqc.getSourceDocType(), MesBizTypeConstants.WM_PRODUCT_SALES)) {
|
productSalesLineService.updateProductSalesLineWhenOqcFinish(
|
oqc.getSourceLineId(), oqc.getId(), oqc.getCheckResult());
|
} else {
|
throw new IllegalArgumentException(
|
"OQC 单[" + oqc.getId() + "] sourceDocType=" + oqc.getSourceDocType() + " 无法识别，无法回写来源单据");
|
}
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public void deleteOqc(Long id) {
|
// 1. 校验存在 + 草稿状态
|
validateOqcStatusPrepare(id);
|
|
// 2.1 删除主表
|
oqcMapper.deleteById(id);
|
// 2.2 级联删除行
|
oqcLineService.deleteByOqcId(id);
|
// 2.3 级联删除缺陷记录
|
defectRecordService.deleteListByQcTypeAndQcId(MesQcTypeEnum.OQC.getType(), id);
|
}
|
|
@Override
|
public MesQcOqcDO validateOqcExists(Long id) {
|
MesQcOqcDO oqc = oqcMapper.selectById(id);
|
if (oqc == null) {
|
throw exception(QC_OQC_NOT_EXISTS);
|
}
|
return oqc;
|
}
|
|
/**
|
* 校验出货检验单存在且为草稿状态
|
*/
|
private MesQcOqcDO validateOqcStatusPrepare(Long id) {
|
MesQcOqcDO oqc = validateOqcExists(id);
|
if (ObjUtil.notEqual(oqc.getStatus(), MesQcStatusEnum.DRAFT.getStatus())) {
|
throw exception(QC_OQC_NOT_PREPARE);
|
}
|
return oqc;
|
}
|
|
private void validateOqcCodeUnique(Long id, String code) {
|
MesQcOqcDO oqc = oqcMapper.selectByCode(code);
|
if (oqc == null) {
|
return;
|
}
|
if (ObjUtil.notEqual(oqc.getId(), id)) {
|
throw exception(QC_OQC_CODE_DUPLICATE);
|
}
|
}
|
|
/**
|
* 校验来源单据参数，并验证数据存在
|
*
|
* @param sourceDocType 来源单据类型
|
* @param sourceLineId 来源单据行 ID
|
* @return 来源单据编号
|
*/
|
private String validateAndGetSourceDocCode(Integer sourceDocType, Long sourceLineId) {
|
if (sourceDocType == null || sourceLineId == null) {
|
return null;
|
}
|
if (Objects.equals(sourceDocType, MesBizTypeConstants.WM_PRODUCT_SALES)) {
|
MesWmProductSalesLineDO salesLine = productSalesLineService.validateProductSalesLineExists(sourceLineId);
|
if (salesLine.getSalesId() != null) {
|
MesWmProductSalesDO sales = productSalesService.getProductSales(salesLine.getSalesId());
|
return sales != null ? sales.getCode() : null;
|
}
|
return null;
|
}
|
// 未知来源类型应报错，而不是静默忽略
|
throw exception(QC_OQC_SOURCE_DOC_TYPE_UNKNOWN);
|
}
|
|
@Override
|
public MesQcOqcDO getOqc(Long id) {
|
return oqcMapper.selectById(id);
|
}
|
|
@Override
|
public PageResult<MesQcOqcDO> getOqcPage(MesQcOqcPageReqVO pageReqVO) {
|
// 获取用户有权限的客户 ID 列表
|
List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
|
return oqcMapper.selectPage(pageReqVO, permittedClientIds);
|
}
|
|
@Override
|
public void recalculateDefectStats(Long oqcId, List<MesQcDefectRecordDO> records) {
|
// 1. 行级缺陷统计
|
oqcLineService.recalculateLineDefectStats(oqcId, records);
|
|
// 2.1 汇总主表的缺陷数量
|
int totalCritical = 0, totalMajor = 0, 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 计算缺陷率
|
MesQcOqcDO oqc = validateOqcExists(oqcId);
|
BigDecimal criticalRate = BigDecimal.ZERO;
|
BigDecimal majorRate = BigDecimal.ZERO;
|
BigDecimal minorRate = BigDecimal.ZERO;
|
if (oqc.getCheckQuantity() != null && oqc.getCheckQuantity().compareTo(BigDecimal.ZERO) > 0) {
|
BigDecimal checkQty = oqc.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 更新主表
|
MesQcOqcDO updateOqc = new MesQcOqcDO().setId(oqcId)
|
.setCriticalQuantity(totalCritical).setMajorQuantity(totalMajor).setMinorQuantity(totalMinor)
|
.setCriticalRate(criticalRate).setMajorRate(majorRate).setMinorRate(minorRate);
|
oqcMapper.updateById(updateOqc);
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public Long createOqcFromProductSales(Long salesId, MesWmProductSalesLineDO line, String salesCode, Long clientId) {
|
// 1. 校验物料是否配置了 OQC 检验模板
|
MesQcTemplateItemDO templateItem;
|
try {
|
templateItem = templateItemService.getRequiredTemplateByItemIdAndType(
|
line.getItemId(), MesQcTypeEnum.OQC.getType());
|
} catch (Exception e) {
|
// 获取物料信息，提供更明确的错误提示
|
String itemInfo = getItemInfo(line.getItemId());
|
throw exception(QC_NO_TEMPLATE_FOR_ITEM, itemInfo);
|
}
|
Long templateId = templateItem.getTemplateId();
|
|
// 2. 生成检验单编码
|
String code = "OQC" + System.currentTimeMillis();
|
|
// 3. 创建 OQC 主表（待检验状态，初始数量为 0）
|
MesQcOqcDO oqc = new MesQcOqcDO();
|
oqc.setCode(code);
|
oqc.setName(salesCode + "-出货检验");
|
oqc.setTemplateId(templateId);
|
oqc.setSourceDocType(MesBizTypeConstants.WM_PRODUCT_SALES);
|
oqc.setSourceDocId(salesId);
|
oqc.setSourceLineId(line.getId());
|
oqc.setSourceDocCode(salesCode);
|
oqc.setClientId(clientId);
|
oqc.setItemId(line.getItemId());
|
oqc.setBatchCode(line.getBatchCode());
|
oqc.setOutQuantity(line.getQuantity());
|
oqc.setCheckQuantity(BigDecimal.ZERO); // 待填写
|
oqc.setQualifiedQuantity(BigDecimal.ZERO); // 待填写
|
oqc.setUnqualifiedQuantity(BigDecimal.ZERO); // 待填写
|
oqc.setOutDate(java.time.LocalDateTime.now());
|
oqc.setStatus(MesQcStatusEnum.DRAFT.getStatus());
|
oqcMapper.insert(oqc);
|
|
// 4. 从模板指标自动生成检验行
|
oqcLineService.createLinesFromTemplate(oqc.getId(), templateId);
|
|
return oqc.getId();
|
}
|
|
/**
|
* 获取物料信息（编码+名称）
|
*/
|
private String getItemInfo(Long itemId) {
|
if (itemId == null) {
|
return "未知物料";
|
}
|
try {
|
cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO item = mdmItemApi.getItem(itemId).getCheckedData();
|
if (item != null) {
|
return item.getCode() + "-" + item.getName();
|
}
|
} catch (Exception e) {
|
// 忽略异常
|
}
|
return "物料ID:" + itemId;
|
}
|
|
@Override
|
@Transactional(rollbackFor = Exception.class)
|
public MesQcImportRespVO importOqcList(List<MesQcOqcImportExcelVO> 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++) {
|
MesQcOqcImportExcelVO 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(createOqcByImport(row));
|
firstRowNoByKey.putIfAbsent(importKey, i + 2);
|
} catch (Exception ex) {
|
respVO.getFailureList().put(label, MesQcImportHelper.resolveImportErrorMessage(ex));
|
}
|
}
|
return respVO;
|
}
|
|
private boolean isImportRowEmpty(MesQcOqcImportExcelVO row) {
|
return row == null || (StrUtil.isBlank(row.getCode()) && StrUtil.isBlank(row.getName())
|
&& StrUtil.isBlank(row.getItemCode()) && StrUtil.isBlank(row.getClientName())
|
&& StrUtil.isBlank(row.getBatchCode()) && StrUtil.isBlank(row.getTemplateName())
|
&& row.getOutQuantity() == null && row.getCheckQuantity() == null
|
&& row.getQualifiedQuantity() == null && row.getUnqualifiedQuantity() == null
|
&& StrUtil.isBlank(row.getCheckResult()) && StrUtil.isBlank(row.getInspectorName())
|
&& StrUtil.isBlank(row.getInspectDate()) && StrUtil.isBlank(row.getOutDate())
|
&& StrUtil.isBlank(row.getRemark()));
|
}
|
|
/**
|
* 依据导入行创建一张出货检验单：状态为「待检验」，检验行由质检方案自动生成
|
*
|
* @return 检验单编号
|
*/
|
private String createOqcByImport(MesQcOqcImportExcelVO row) {
|
MesQcOqcSaveReqVO reqVO = new MesQcOqcSaveReqVO();
|
// 1. 检验单编号：填写则使用，留空自动生成
|
String code = StrUtil.isNotBlank(row.getCode()) ? row.getCode().trim()
|
: qcImportHelper.generateCode(MesMdAutoCodeRuleCodeEnum.QC_OQC_CODE.getCode());
|
if (oqcMapper.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.setItemId(qcImportHelper.resolveItemId(row.getItemCode()));
|
Long clientId = qcImportHelper.resolveClientId(row.getClientName());
|
qcImportHelper.validateClientPermission(clientId, row.getClientName().trim());
|
reqVO.setClientId(clientId);
|
reqVO.setBatchCode(StrUtil.trimToNull(row.getBatchCode()));
|
reqVO.setTemplateId(qcImportHelper.resolveTemplateId(row.getTemplateName()));
|
// 3. 数量：合格品 + 不合格品 必须等于检测数量（检测数量留空则自动合计）
|
reqVO.setOutQuantity(qcImportHelper.resolveQuantity(row.getOutQuantity(), "本次出货数量", true));
|
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, "检测数量"));
|
// 4. 检验信息
|
reqVO.setCheckResult(qcImportHelper.resolveDictValue(row.getCheckResult(),
|
DictTypeConstants.MES_QC_CHECK_RESULT, "检测结果", false));
|
reqVO.setInspectorUserId(qcImportHelper.resolveInspectorUserId(row.getInspectorName()));
|
reqVO.setInspectDate(qcImportHelper.parseRequiredDateTime(row.getInspectDate(), "检测日期"));
|
reqVO.setOutDate(qcImportHelper.parseRequiredDateTime(row.getOutDate(), "出货日期"));
|
reqVO.setRemark(StrUtil.trimToNull(row.getRemark()));
|
// 5. 去重：同一 物料 + 客户 + 批次号 + 出货日期 的出货检验单不可重复导入
|
MesQcOqcDO duplicate = CollUtil.getFirst(oqcMapper.selectListByImportKey(reqVO.getItemId(), reqVO.getClientId(),
|
reqVO.getBatchCode(), reqVO.getOutDate()));
|
if (duplicate != null) {
|
throw MesQcImportHelper.duplicateExistingException(buildImportKeyDesc(row), "出货检验单",
|
duplicate.getCode(), "质量管理-出货检验");
|
}
|
// 6. 复用创建逻辑：校验物料/人员、按物料匹配质检方案、生成检验行
|
try {
|
createOqc(reqVO);
|
} catch (ServiceException ex) {
|
MesQcImportHelper.rethrowTemplateError(ex, row.getItemCode(), "出货检验(OQC)");
|
}
|
return code;
|
}
|
|
/**
|
* 导入去重键：同一 物料 + 客户 + 批次号 + 出货日期 视为同一批出货检验数据
|
*/
|
private String buildImportKey(MesQcOqcImportExcelVO row) {
|
return String.join("|", StrUtil.trimToEmpty(row.getItemCode()), StrUtil.trimToEmpty(row.getClientName()),
|
StrUtil.trimToEmpty(row.getBatchCode()), StrUtil.trimToEmpty(row.getOutDate()));
|
}
|
|
private String buildImportKeyDesc(MesQcOqcImportExcelVO row) {
|
return "物料[" + MesQcImportHelper.describeImportValue(row.getItemCode())
|
+ "]、客户[" + MesQcImportHelper.describeImportValue(row.getClientName())
|
+ "]、批次号[" + MesQcImportHelper.describeImportValue(row.getBatchCode())
|
+ "]、出货日期[" + MesQcImportHelper.describeImportValue(row.getOutDate()) + "]";
|
}
|
|
}
|
