From c215f6c20445b973ff730dcdf4206426992da81d Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 19 十月 2026 11:30:57 +0800
Subject: [PATCH] feat(mes): 完善质检流程功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java
index 98da11f..c02c100 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/trace/MesProTracePublicServiceImpl.java
@@ -22,6 +22,7 @@
import cn.iocoder.yudao.module.mes.enums.pro.MesProPalletStatusEnum;
import cn.iocoder.yudao.module.mes.enums.trace.MesTraceCodeStatusEnum;
import cn.iocoder.yudao.module.mes.framework.qrcode.MesProQrLabelBuilder;
+import cn.iocoder.yudao.module.mes.framework.config.MesProperties;
import cn.iocoder.yudao.module.mes.service.mdm.MesMdmItemService;
import cn.iocoder.yudao.module.mes.service.pro.bagcode.MesProBagCodeService;
import cn.iocoder.yudao.module.mes.service.pro.batch.MesProBatchService;
@@ -100,6 +101,8 @@
private MesTraceIntegrityService integrityService;
@Resource
private MesTraceConsumerScanEventMapper consumerScanEventMapper;
+ @Resource
+ private MesProperties mesProperties;
@Override
public MesProTracePublicRespVO queryTrace(String code) {
@@ -132,7 +135,9 @@
MesProTracePublicConfigRespVO respVO = new MesProTracePublicConfigRespVO();
respVO.setOperatorName(MesProQrLabelBuilder.resolveOperatorName());
respVO.setTraceUrl(MesProQrLabelBuilder.resolveTraceUrl());
+ respVO.setTraceLocationUrl(mesProperties.getTraceLocationUrl());
respVO.setImported(MesProQrLabelBuilder.isImported());
+ respVO.setTraceLocationRequired(mesProperties.isTraceLocationRequired());
return respVO;
}
@@ -373,7 +378,9 @@
}
MesQcSeedQualityDO quality = list.get(0);
MesProTracePublicRespVO.QualityVO vo = new MesProTracePublicRespVO.QualityVO();
- vo.setResult(quality.getResult()).setResultName(qualityResultName(quality.getResult()))
+ Integer finalResult = Integer.valueOf(40).equals(quality.getWorkflowStatus()) ? 1
+ : Integer.valueOf(70).equals(quality.getWorkflowStatus()) ? 2 : 0;
+ vo.setResult(finalResult).setResultName(finalResult == 0 ? "澶嶆鎴栧鎵逛腑" : qualityResultName(finalResult))
.setReason(quality.getReason()).setInspectorName(userName(quality.getInspectorId()))
.setInspectedAt(quality.getInspectedAt());
List<MesQcSeedQualityIndicatorDO> indicators = qcSeedQualityService.getIndicatorsByQualityId(quality.getId());
--
Gitblit v1.9.3