From de0202274ed147e89fdbba0a953936a3b9997ec7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 17:37:50 +0800
Subject: [PATCH] feat(mes): 更新IPQC过程检验功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/qc/MesQcReportApiImpl.java | 50 +++++++++++++++++++-------------------------------
1 files changed, 19 insertions(+), 31 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/qc/MesQcReportApiImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/qc/MesQcReportApiImpl.java
index f936cca..715068f 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/qc/MesQcReportApiImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/api/qc/MesQcReportApiImpl.java
@@ -4,10 +4,12 @@
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
+import cn.iocoder.yudao.module.mdm.api.item.MdmItemApi;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
+import cn.iocoder.yudao.module.mdm.api.unit.MdmUnitMeasureApi;
+import cn.iocoder.yudao.module.mdm.api.unit.dto.MdmUnitMeasureRespDTO;
import cn.iocoder.yudao.module.mes.api.qc.dto.MesQcReportItemRespDTO;
import cn.iocoder.yudao.module.mes.api.qc.dto.MesQcReportRespDTO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicator.MesQcIndicatorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicatorresult.MesQcIndicatorResultDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.indicatorresult.MesQcIndicatorResultDetailDO;
@@ -19,15 +21,11 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcLineDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.rqc.MesQcRqcLineDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcIndicatorItemTypeEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcResultValueTypeEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcStatusEnum;
import cn.iocoder.yudao.module.mes.enums.qc.MesQcTypeEnum;
-import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
-import cn.iocoder.yudao.module.mes.service.md.unitmeasure.MesMdUnitMeasureService;
-import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.qc.indicator.MesQcIndicatorService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcLineService;
@@ -102,11 +100,9 @@
private MesQcIndicatorService indicatorService;
@Resource
- private MesMdItemService itemService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdUnitMeasureService unitMeasureService;
- @Resource
- private MesProWorkOrderService workOrderService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private AdminUserApi adminUserApi;
@Resource
@@ -144,7 +140,7 @@
order.getSourceDocType(), order.getSourceDocCode(), order.getItemId(), order.getCheckQuantity(),
order.getQualifiedQuantity(), order.getUnqualifiedQuantity(), order.getCheckResult(),
order.getInspectDate(), order.getStatus(), order.getRemark());
- resp.setWorkOrderCode(workOrderCode(order.getWorkOrderId()));
+ resp.setBatchCode(defaultStr(order.getBatchCode()));
lines = loadIpqcLines(qcId);
inspectorUserId = order.getInspectorUserId();
} else if (Objects.equals(qcType, MesQcTypeEnum.OQC.getType())) {
@@ -176,17 +172,17 @@
throw new IllegalArgumentException("鏆備笉鏀寔 qcType=" + qcType);
}
- // 鐗╂枡涓庡崟浣嶏細鍗曚綅浼樺厛鍙栬涓婄殑锛堟楠屾椂瀹為檯鐢ㄧ殑鍗曚綅锛夛紝缂哄け鎵嶅洖閫�鐗╂枡鐨勯粯璁ゅ崟浣�
- MesMdItemDO item = resp.getItemId() == null ? null
- : itemService.getItemMap(Collections.singletonList(resp.getItemId())).get(resp.getItemId());
+ // 鐗╂枡涓庡崟浣嶏細鐗╂枡 ID 鏉ヨ嚜 MDM锛涘崟浣嶄紭鍏堝彇琛屼笂鐨勶紙妫�楠屾椂瀹為檯鐢ㄧ殑鍗曚綅锛夛紝缂哄け鎵嶅洖閫�鐗╂枡鐨勯粯璁ゅ崟浣�
+ MdmItemRespDTO item = resp.getItemId() == null ? null
+ : mdmItemApi.getItemMap(Collections.singletonList(resp.getItemId())).get(resp.getItemId());
if (item != null) {
resp.setItemCode(defaultStr(item.getCode()));
resp.setItemName(defaultStr(item.getName()));
resp.setItemSpecification(defaultStr(item.getSpecification()));
}
- Map<Long, MesMdUnitMeasureDO> unitMap = unitMapOf(lines, item);
+ Map<Long, MdmUnitMeasureRespDTO> unitMap = unitMapOf(lines, item);
if (item != null) {
- MesMdUnitMeasureDO itemUnit = unitMap.get(item.getUnitMeasureId());
+ MdmUnitMeasureRespDTO itemUnit = unitMap.get(item.getUnitMeasureId());
resp.setUnitName(itemUnit == null ? "" : defaultStr(itemUnit.getName()));
}
resp.setInspectorName(userName(inspectorUserId));
@@ -235,7 +231,7 @@
* 锛堢粍鍚嶄笌鍏紡鏄垎缁勬楠岄」鏈�涓嶈涓㈢殑涓ゆ牱涓滆タ锛夈��
*/
private BuiltItems buildItems(Long qcId, Integer qcType, List<LineRow> lines,
- Map<Long, MesMdUnitMeasureDO> unitMap, MesMdItemDO item) {
+ Map<Long, MdmUnitMeasureRespDTO> unitMap, MdmItemRespDTO item) {
if (CollUtil.isEmpty(lines)) {
return new BuiltItems(Collections.emptyList(), Collections.emptyList(), Collections.emptyList(), 0);
}
@@ -408,7 +404,7 @@
private List<MesQcReportItemRespDTO> expandRows(MesQcIndicatorDO indicator, LineRow line,
List<MesQcIndicatorResultDO> samples,
Map<Long, List<MesQcIndicatorResultDetailDO>> detailMap,
- Map<Long, MesMdUnitMeasureDO> unitMap, MesMdItemDO item) {
+ Map<Long, MdmUnitMeasureRespDTO> unitMap, MdmItemRespDTO item) {
List<MesQcReportItemRespDTO> rows = new ArrayList<>();
for (MesQcIndicatorResultDO sample : samples) {
for (MesQcIndicatorResultDetailDO detail : detailMap.getOrDefault(sample.getId(),
@@ -441,9 +437,9 @@
}
private MesQcReportItemRespDTO toItem(MesQcIndicatorDO indicator, LineRow line, String sampleCode, String value,
- String detailRemark, Map<Long, MesMdUnitMeasureDO> unitMap,
- MesMdItemDO item) {
- MesMdUnitMeasureDO unit = unitMap.get(line.unitMeasureId());
+ String detailRemark, Map<Long, MdmUnitMeasureRespDTO> unitMap,
+ MdmItemRespDTO item) {
+ MdmUnitMeasureRespDTO unit = unitMap.get(line.unitMeasureId());
if (unit == null && item != null) {
unit = unitMap.get(item.getUnitMeasureId());
}
@@ -524,7 +520,7 @@
// ==================== 鍏宠仈鍚嶇О ====================
- private Map<Long, MesMdUnitMeasureDO> unitMapOf(List<LineRow> lines, MesMdItemDO item) {
+ private Map<Long, MdmUnitMeasureRespDTO> unitMapOf(List<LineRow> lines, MdmItemRespDTO item) {
List<Long> unitIds = new ArrayList<>();
for (LineRow line : lines) {
if (line.unitMeasureId() != null) {
@@ -534,7 +530,7 @@
if (item != null && item.getUnitMeasureId() != null) {
unitIds.add(item.getUnitMeasureId());
}
- return unitIds.isEmpty() ? Collections.emptyMap() : unitMeasureService.getUnitMeasureMap(unitIds);
+ return unitIds.isEmpty() ? Collections.emptyMap() : mdmUnitMeasureApi.getUnitMeasureMap(unitIds);
}
private String supplierName(Long vendorId) {
@@ -552,14 +548,6 @@
}
CrmCustomerRespDTO client = customerApi.getCustomerMap(Collections.singleton(clientId)).get(clientId);
return client == null ? "" : defaultStr(client.getName());
- }
-
- private String workOrderCode(Long workOrderId) {
- if (workOrderId == null) {
- return "";
- }
- MesProWorkOrderDO workOrder = workOrderService.getWorkOrder(workOrderId);
- return workOrder == null ? "" : defaultStr(workOrder.getCode());
}
private String userName(Long userId) {
--
Gitblit v1.9.3