| | |
|---|
| | | @Transactional(rollbackFor = Exception.class) |
|---|
| | | public int deal(QualityUnqualified qualityUnqualified) { |
|---|
| | | QualityUnqualified unqualified = qualityUnqualifiedMapper.selectById(qualityUnqualified.getId()); |
|---|
| | | QualityInspect qualityInspect = qualityInspectService.getById(unqualified.getInspectId()); |
|---|
| | | QualityInspect qualityInspect = unqualified.getInspectId() == null ? null |
|---|
| | | : qualityInspectService.getById(unqualified.getInspectId()); |
|---|
| | | // 报工计数区分直接产生的返工待处理单（无检验单，仅有 productMainId），按报工处理闭环执行。 |
|---|
| | | if (qualityInspect == null && unqualified.getProductMainId() != null) { |
|---|
| | | ProductionProductMain reportSourceMain = productionProductMainMapper.selectById(unqualified.getProductMainId()); |
|---|
| | | if ("报工".equals(qualityUnqualified.getDealResult())) { |
|---|
| | | handleProductionReportResult(qualityUnqualified, unqualified, reportSourceMain); |
|---|
| | | } |
|---|
| | | qualityUnqualified.setInspectState(1); |
|---|
| | | return qualityUnqualifiedMapper.updateById(qualityUnqualified); |
|---|
| | | } |
|---|
| | | String batchNo = qualityInspect == null ? null |
|---|
| | | : resolveProductionBatchNo(qualityInspect.getProductMainId(), qualityInspect.getId(), qualityInspect.getProductModelId()); |
|---|
| | | if (ObjectUtils.isNotNull(qualityInspect) && qualityInspect.getInspectType() != 0) { |
|---|
