宁夏三级mom后端
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
云
9 小时以前 5072520172e8f45e3ccb8afc26cf0c8186ba4cdd 
 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/seedquality/MesQcSeedQualityServiceImpl.java


@@ -22,11 +22,14 @@


import cn.iocoder.yudao.module.mes.dal.dataobject.wm.materialstockbag.MesWmMaterialStockBagDO;


import cn.iocoder.yudao.module.mes.dal.mysql.wm.materialstockbag.MesWmMaterialStockBagMapper;


import cn.iocoder.yudao.module.mes.enums.pro.MesProBagCodeQcStatusEnum;


import cn.iocoder.yudao.module.mes.enums.qc.MesQcApproveNodeEnum;


import cn.iocoder.yudao.module.mes.enums.qc.MesQcApprovalTypeEnum;


import cn.iocoder.yudao.module.mes.enums.wm.MesWmStockStateEnum;


import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;


import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;


import cn.iocoder.yudao.module.mes.enums.wm.MesWmWarehouseTypeEnum;


import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;


import cn.iocoder.yudao.module.mes.service.qc.approver.MesQcApproverService;


import cn.iocoder.yudao.module.mes.service.wm.materialstockbag.MesWmMaterialStockBagService;


import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;


import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;


@@ -52,9 +55,10 @@


@Service @Validated @Slf4j


public class MesQcSeedQualityServiceImpl implements MesQcSeedQualityService {


    private static final Set<String> REQUIRED = Set.of("purity", "cleanliness", "germination_rate", "moisture");


    private static final int WAIT_RETEST = 10, WAIT_PROCESS = 20, WAIT_COMPANY = 30,


            RELEASED = 40, WAIT_PROCESS_FAIL = 50, WAIT_COMPANY_FAIL = 60, SCRAPPED = 70;


    private static final int WAIT_RETEST = 10, WAIT_PROCESS = 20, WAIT_INITIAL_FAIL_REVIEW = 25, WAIT_COMPANY = 30,


            RELEASED = 40, WAIT_INITIAL_RECHECK = 50, WAIT_COMPANY_FAIL = 60, SCRAPPED = 70;


    @Resource private MesQcSeedQualityMapper qualityMapper;


    @Resource private MesQcApproverService approverService;


    @Resource private MesQcSeedQualityActionMapper actionMapper;


    @Resource private MesQcSeedQualityIndicatorMapper indicatorMapper;


    @Resource private MesProBagCodeMapper bagCodeMapper;


@@ -210,8 +214,13 @@


                .inspectedAt(LocalDateTime.now()).build();


        qualityMapper.insert(quality);


        for (MesQcSeedQualitySubmitReqVO.Indicator item : reqVO.getIndicators()) {


            if (item == null || item.getCode() == null || item.getValue() == null || item.getMinValue() == null || item.getMaxValue() == null)


                throw new IllegalArgumentException("四项指标的实测值和本次合格范围必须完整");


            if (!REQUIRED.contains(item.getCode()) || !codes.add(item.getCode())) throw new IllegalArgumentException("指标必须为纯度、净度、发芽率、水分且不可重复");


            if (item.getMinValue().compareTo(item.getMaxValue()) > 0) throw new IllegalArgumentException("指标下限不能大于上限");


            if (item.getValue().compareTo(BigDecimal.ZERO) < 0 || item.getValue().compareTo(new BigDecimal("100")) > 0


                    || item.getMinValue().compareTo(BigDecimal.ZERO) < 0 || item.getMaxValue().compareTo(new BigDecimal("100")) > 0)


                throw new IllegalArgumentException("百分比指标必须处于 0–100");


            if (item.getValue().compareTo(item.getMinValue()) < 0 || item.getValue().compareTo(item.getMaxValue()) > 0) passed = false;


            indicatorMapper.insert(MesQcSeedQualityIndicatorDO.builder().qualityId(quality.getId()).indicatorCode(item.getCode())


                    .value(item.getValue()).minValue(item.getMinValue()).maxValue(item.getMaxValue()).build());


@@ -219,10 +228,10 @@


        if (!codes.equals(REQUIRED)) throw new IllegalArgumentException("四项指标不完整");


        if (!passed && StrUtil.isBlank(reqVO.getReason())) throw new IllegalArgumentException("质检不合格必须填写原因");


        quality.setResult(passed ? 1 : 2);


        quality.setWorkflowStatus(passed ? WAIT_PROCESS : WAIT_RETEST);


        quality.setWorkflowStatus(passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW);


        qualityMapper.updateById(quality);


        recordAction(quality.getId(), "INITIAL", quality.getResult(), reqVO.getReason(), reqVO.getIndicators());


        // 初检仅记录结论；袋仍留在暂存库，待复检及两级审批后再放行或报废。


        // 初检仅记录结论；袋仍留在暂存库，待初检审核、复检及最终审核后再放行或报废。


        return quality.getId();


    }




@@ -310,15 +319,24 @@




    @Override @Transactional(rollbackFor = Exception.class)


    public void retest(Long id, cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityRetestReqVO req) {


        MesQcSeedQualityDO quality = requireStatus(id, WAIT_RETEST);


        if (!Objects.equals(quality.getCode(), req.getCode())) throw new IllegalArgumentException("复检袋码与原质检记录不一致");


        MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);


        if (quality == null || !Set.of(WAIT_RETEST, WAIT_INITIAL_RECHECK).contains(quality.getWorkflowStatus()))


            throw new IllegalArgumentException("当前状态不能提交复检，请刷新后重试");


        boolean initialRecheck = Objects.equals(quality.getWorkflowStatus(), WAIT_INITIAL_RECHECK);


        if (!Objects.equals(quality.getCode(), req.getCode())) throw new IllegalArgumentException("检验袋码与原质检记录不一致");


        boolean passed = validateIndicators(req.getIndicators());


        if (!passed && StrUtil.isBlank(req.getReason())) throw new IllegalArgumentException("复检不合格必须填写原因");


        recordAction(id, "RETEST", passed ? 1 : 2, req.getReason(), req.getIndicators());


        qualityMapper.updateById(MesQcSeedQualityDO.builder().id(id).result(passed ? 1 : 2)


                .reason(passed ? "" : req.getReason().trim()).retestResult(passed ? 1 : 2).retestedAt(LocalDateTime.now())


        if (!passed && StrUtil.isBlank(req.getReason())) throw new IllegalArgumentException("检验不合格必须填写原因");


        recordAction(id, initialRecheck ? "INITIAL_RECHECK" : "RETEST", passed ? 1 : 2, req.getReason(), req.getIndicators());


        MesQcSeedQualityDO update = MesQcSeedQualityDO.builder().id(id).result(passed ? 1 : 2)


                .reason(passed ? "" : req.getReason().trim())


                .inspectorId(getLoginUserId()).inspectedAt(LocalDateTime.now())


                .workflowStatus(passed ? WAIT_PROCESS : WAIT_PROCESS_FAIL).build());


                .workflowStatus(initialRecheck ? (passed ? WAIT_PROCESS : WAIT_INITIAL_FAIL_REVIEW)


                        : (passed ? WAIT_COMPANY : WAIT_COMPANY_FAIL)).build();


        if (!initialRecheck) {


            update.setRetestResult(passed ? 1 : 2);


            update.setRetestedAt(LocalDateTime.now());


        }


        qualityMapper.updateById(update);


        // 页面、公开追溯读取主指标表；同步为最新一次测值，历次测值在操作留痕表保留。


        Map<String, MesQcSeedQualityIndicatorDO> existing = new HashMap<>();


        for (MesQcSeedQualityIndicatorDO indicator : indicatorMapper.selectListByQualityId(id))


@@ -332,12 +350,108 @@


    }




    @Override @Transactional(rollbackFor = Exception.class)


    public void retestBatch(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityBatchRetestReqVO req) {


        List<Long> ids = approvalIds(req.getIds());


        String batchCode = null;


        Integer workflowStatus = null;


        boolean first = true;


        List<MesQcSeedQualityDO> qualities = new ArrayList<>();


        for (Long id : ids) {


            MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);


            if (quality == null || !Set.of(WAIT_RETEST, WAIT_INITIAL_RECHECK).contains(quality.getWorkflowStatus()))


                throw new IllegalArgumentException("所选记录包含不可检验的状态，请刷新后重试");


            if (StrUtil.isBlank(quality.getBatchCode()))


                throw new IllegalArgumentException("记录缺少生产批次，不能批量质检");


            if (first) {


                batchCode = quality.getBatchCode();


                workflowStatus = quality.getWorkflowStatus();


                first = false;


            } else if (!Objects.equals(batchCode, quality.getBatchCode()) || !Objects.equals(workflowStatus, quality.getWorkflowStatus())) {


                throw new IllegalArgumentException("批量质检只允许同生产批次、同流程状态的记录");


            }


            qualities.add(quality);


        }


        for (MesQcSeedQualityDO quality : qualities) {


            cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityRetestReqVO single =


                    new cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityRetestReqVO();


            single.setCode(quality.getCode());


            single.setIndicators(req.getIndicators());


            single.setReason(req.getReason());


            retest(quality.getId(), single);


        }


    }




    private void checkRetestScanType(String scanType) {


        if (!Set.of("PALLET", "BATCH").contains(scanType))


            throw new IllegalArgumentException("批量质检只支持托盘码或生产批次码");


    }




    @Override


    public Map<String, Object> resolveRetestScope(String code, String scanType) {


        checkRetestScanType(scanType);


        Scope scope = scope(code, scanType, false);


        if (scope.canceled()) throw new IllegalArgumentException("质检对象已作废");


        List<String> codes = scope.bags().stream().filter(b -> !Integer.valueOf(30).equals(b.getStatus()) && b.getInboundEventId() != null)


                .map(MesProBagCodeDO::getCode).toList();


        List<MesQcSeedQualityDO> qualities = codes.isEmpty() ? List.of() : qualityMapper.selectListByCodes(codes);


        List<Long> retestIds = qualities.stream().filter(q -> Objects.equals(q.getWorkflowStatus(), WAIT_RETEST))


                .map(MesQcSeedQualityDO::getId).sorted().toList();


        List<Long> initialRecheckIds = qualities.stream().filter(q -> Objects.equals(q.getWorkflowStatus(), WAIT_INITIAL_RECHECK))


                .map(MesQcSeedQualityDO::getId).sorted().toList();


        long pendingProcessCount = qualities.stream().filter(q -> Objects.equals(q.getWorkflowStatus(), WAIT_PROCESS)


                || Objects.equals(q.getWorkflowStatus(), WAIT_INITIAL_FAIL_REVIEW)).count();


        long pendingCompanyCount = qualities.stream().filter(q -> Objects.equals(q.getWorkflowStatus(), WAIT_COMPANY)


                || Objects.equals(q.getWorkflowStatus(), WAIT_COMPANY_FAIL)).count();


        Map<String, Object> result = new HashMap<>();


        result.put("code", scope.code()); result.put("scanType", scanType); result.put("batchCode", scope.batchCode());


        result.put("totalCount", codes.size()); result.put("retestIds", retestIds);


        result.put("initialRecheckIds", initialRecheckIds);


        result.put("pendingProcessCount", pendingProcessCount);


        result.put("pendingCompanyCount", pendingCompanyCount);


        return result;


    }




    @Override @Transactional(rollbackFor = Exception.class)


    public Map<String, Object> retestScope(cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityScopeRetestReqVO req) {


        checkRetestScanType(req.getScanType());


        if (!Set.of(WAIT_RETEST, WAIT_INITIAL_RECHECK).contains(req.getWorkflowStatus()))


            throw new IllegalArgumentException("批量质检状态无效");


        List<Long> confirmed = approvalIds(req.getQualityIds());


        Scope scope = scope(req.getCode(), req.getScanType(), true);


        if (scope.canceled()) throw new IllegalArgumentException("质检对象已作废");


        List<MesProBagCodeDO> effective = scope.bags().stream()


                .filter(b -> !Integer.valueOf(30).equals(b.getStatus()) && b.getInboundEventId() != null).toList();


        if (effective.isEmpty()) throw new IllegalArgumentException("当前范围没有已入库的有效袋码");


        List<MesProBagCodeDO> locked = bagCodeMapper.selectListByIdsForUpdate(effective.stream().map(MesProBagCodeDO::getId).toList());


        if (locked.size() != effective.size() || locked.stream().anyMatch(b -> Integer.valueOf(30).equals(b.getStatus()) || b.getInboundEventId() == null))


            throw new IllegalArgumentException("袋码状态已变化，请重新扫描");


        Scope current = scope(req.getCode(), req.getScanType(), false);


        Set<Long> currentIds = current.bags().stream().filter(b -> !Integer.valueOf(30).equals(b.getStatus()) && b.getInboundEventId() != null)


                .map(MesProBagCodeDO::getId).collect(java.util.stream.Collectors.toSet());


        if (!currentIds.equals(new HashSet<>(locked.stream().map(MesProBagCodeDO::getId).toList())))


            throw new IllegalArgumentException("袋码归属已变化，请重新扫描");


        List<MesQcSeedQualityDO> qualities = qualityMapper.selectListByCodesForUpdate(locked.stream().map(MesProBagCodeDO::getCode).toList());


        List<MesQcSeedQualityDO> pending = qualities.stream().filter(q -> Objects.equals(q.getWorkflowStatus(), req.getWorkflowStatus()))


                .sorted(Comparator.comparing(MesQcSeedQualityDO::getId)).toList();


        if (pending.isEmpty() || !confirmed.equals(pending.stream().map(MesQcSeedQualityDO::getId).toList()))


            throw new IllegalArgumentException("待质检清单已变化，请重新扫描核对");


        for (MesQcSeedQualityDO quality : pending) {


            var single = new cn.iocoder.yudao.module.mes.controller.admin.qc.seedquality.vo.MesQcSeedQualityRetestReqVO();


            single.setCode(quality.getCode()); single.setIndicators(req.getIndicators()); single.setReason(req.getReason());


            retest(quality.getId(), single);


        }


        return Map.of("processedCount", pending.size());


    }




    @Override @Transactional(rollbackFor = Exception.class)


    public void processApprove(Long id, boolean approved, String opinion) {


        MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);


        if (quality == null || !Set.of(WAIT_PROCESS, WAIT_PROCESS_FAIL).contains(quality.getWorkflowStatus()))


            throw new IllegalArgumentException("当前状态不能进行加工部审批");


        if (StrUtil.isBlank(opinion)) throw new IllegalArgumentException("请填写审批意见");


        int next = approved ? (quality.getWorkflowStatus() == WAIT_PROCESS ? WAIT_COMPANY : WAIT_COMPANY_FAIL) : WAIT_RETEST;


        if (quality == null || !Set.of(WAIT_PROCESS, WAIT_INITIAL_FAIL_REVIEW).contains(quality.getWorkflowStatus()))


            throw new IllegalArgumentException("当前状态不能进行初检审核");


        approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),


                MesQcApproveNodeEnum.PROCESS.getNode(), getLoginUserId());


        if (!approved && StrUtil.isBlank(opinion)) throw new IllegalArgumentException("驳回时请填写审批意见");


        int next = approved ? WAIT_RETEST : WAIT_INITIAL_RECHECK;


        qualityMapper.updateById(MesQcSeedQualityDO.builder().id(id).workflowStatus(next)


                .processApprovedAt(LocalDateTime.now()).build());


        recordAction(id, approved ? "PROCESS_APPROVE" : "PROCESS_REJECT", quality.getResult(), opinion, null);


@@ -347,8 +461,10 @@


    public void companyApprove(Long id, boolean approved, String opinion) {


        MesQcSeedQualityDO quality = qualityMapper.selectByIdForUpdate(id);


        if (quality == null || !Set.of(WAIT_COMPANY, WAIT_COMPANY_FAIL).contains(quality.getWorkflowStatus()))


            throw new IllegalArgumentException("当前状态不能进行公司质检审批");


        if (StrUtil.isBlank(opinion)) throw new IllegalArgumentException("请填写审批意见");


            throw new IllegalArgumentException("当前状态不能进行复检审核");


        approverService.validateApprover(MesQcApprovalTypeEnum.SEED_QUALITY.getType(),


                MesQcApproveNodeEnum.COMPANY.getNode(), getLoginUserId());


        if (!approved && StrUtil.isBlank(opinion)) throw new IllegalArgumentException("驳回时请填写审批意见");


        if (approved) finalizeStock(quality, quality.getWorkflowStatus() == WAIT_COMPANY);


        int next = approved ? (quality.getWorkflowStatus() == WAIT_COMPANY ? RELEASED : SCRAPPED) : WAIT_RETEST;


        qualityMapper.updateById(MesQcSeedQualityDO.builder().id(id).workflowStatus(next)


@@ -390,6 +506,9 @@


                    || item.getValue() == null || item.getMinValue() == null || item.getMaxValue() == null)


                throw new IllegalArgumentException("指标必须为纯度、净度、发芽率、水分且不可重复");


            if (item.getMinValue().compareTo(item.getMaxValue()) > 0) throw new IllegalArgumentException("指标下限不能大于上限");


            if (item.getValue().compareTo(BigDecimal.ZERO) < 0 || item.getValue().compareTo(new BigDecimal("100")) > 0


                    || item.getMinValue().compareTo(BigDecimal.ZERO) < 0 || item.getMaxValue().compareTo(new BigDecimal("100")) > 0)


                throw new IllegalArgumentException("百分比指标必须处于 0–100");


            if (item.getValue().compareTo(item.getMinValue()) < 0 || item.getValue().compareTo(item.getMaxValue()) > 0) passed = false;


        }


        return passed;