From ed01be06d17f1159d32e7fa2133a32f2986d3b9f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:50:53 +0800
Subject: [PATCH] refactor(mes): 替换物料服务为MDM API并完善质检Word导出功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java | 73 +++++++++++++-----------------------
1 files changed, 27 insertions(+), 46 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
index 1113942..9137da8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java
@@ -13,11 +13,6 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.ipqc.vo.MesQcIpqcSaveReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.vo.MesQcQualityExportVO;
-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.md.workstation.MesMdWorkstationDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.pro.process.MesProProcessDO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
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;
@@ -26,11 +21,10 @@
import cn.iocoder.yudao.module.mes.dal.mysql.qc.ipqc.MesQcIpqcLineMapper;
import cn.iocoder.yudao.module.mes.enums.DictTypeConstants;
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
-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.md.workstation.MesMdWorkstationService;
-import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
-import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
+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.service.qc.indicator.MesQcIndicatorService;
import cn.iocoder.yudao.module.mes.service.qc.indicatorresult.MesQcIndicatorResultService;
import cn.iocoder.yudao.module.mes.service.qc.ipqc.MesQcIpqcService;
@@ -61,6 +55,7 @@
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertSet;
import static cn.iocoder.yudao.framework.common.util.collection.MapUtils.findAndThen;
+
@Tag(name = "绠＄悊鍚庡彴 - MES 杩囩▼妫�楠屽崟锛圛PQC锛�")
@RestController
@RequestMapping("/mes/qc/ipqc")
@@ -70,15 +65,9 @@
@Resource
private MesQcIpqcService ipqcService;
@Resource
- private MesProWorkOrderService workOrderService;
+ private MdmItemApi mdmItemApi;
@Resource
- private MesMdWorkstationService workstationService;
- @Resource
- private MesProProcessService processService;
- @Resource
- private MesMdItemService itemService;
- @Resource
- private MesMdUnitMeasureService unitMeasureService;
+ private MdmUnitMeasureApi mdmUnitMeasureApi;
@Resource
private MesQcIndicatorResultService indicatorResultService;
@Resource
@@ -157,34 +146,23 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 鎵归噺鏌ヨ宸ュ崟
- Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
- convertSet(list, MesQcIpqcDO::getWorkOrderId));
- // 鎵归噺鏌ヨ宸ヤ綅
- Map<Long, MesMdWorkstationDO> workstationMap = workstationService.getWorkstationMap(
- convertSet(list, MesQcIpqcDO::getWorkstationId));
- // 鎵归噺鏌ヨ宸ュ簭
- Map<Long, MesProProcessDO> processMap = processService.getProcessMap(
- convertSet(list, MesQcIpqcDO::getProcessId));
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛圡DM 鐗╂枡锛�
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(list, MesQcIpqcDO::getItemId));
- // 鎵归噺鏌ヨ璁￠噺鍗曚綅锛�
- Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
- // 鎵归噺鏌ヨ妫�娴嬩汉鍛�
- Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
- convertSet(list, MesQcIpqcDO::getInspectorUserId));
+ // 鎵归噺鏌ヨ璁￠噺鍗曚綅
+ Map<Long, MdmUnitMeasureRespDTO> unitMeasureMap = mdmUnitMeasureApi.getUnitMeasureList(
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId)).getCheckedData()
+ .stream().collect(Collectors.toMap(MdmUnitMeasureRespDTO::getId, e -> e));
+ // 鎵归噺鏌ヨ妫�娴�/澶嶆牳/瀹℃牳浜哄憳
+ Set<Long> qcUserIds = new HashSet<>();
+ qcUserIds.addAll(convertSet(list, MesQcIpqcDO::getInspectorUserId));
+ qcUserIds.addAll(convertSet(list, MesQcIpqcDO::getAuditUserId));
+ qcUserIds.addAll(convertSet(list, MesQcIpqcDO::getApproveUserId));
+ Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(qcUserIds);
// 鎵归噺鏌ヨ妫�楠岄」鎸囨爣
Map<Long, String> indicatorSummaryMap = buildIndicatorSummaryMap(list);
// 鎷艰 VO
return BeanUtils.toBean(list, MesQcIpqcRespVO.class, vo -> {
- findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder -> vo
- .setWorkOrderCode(workOrder.getCode()).setWorkOrderName(workOrder.getName()));
- findAndThen(workstationMap, vo.getWorkstationId(),
- ws -> vo.setWorkstationName(ws.getName()));
- findAndThen(processMap, vo.getProcessId(),
- process -> vo.setProcessName(process.getName()));
findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
findAndThen(unitMeasureMap, item.getUnitMeasureId(),
@@ -192,6 +170,10 @@
});
findAndThen(userMap, vo.getInspectorUserId(),
user -> vo.setInspectorNickname(user.getNickname()));
+ findAndThen(userMap, vo.getAuditUserId(),
+ user -> vo.setAuditNickname(user.getNickname()));
+ findAndThen(userMap, vo.getApproveUserId(),
+ user -> vo.setApproveNickname(user.getNickname()));
vo.setIndicatorResultSummary(indicatorSummaryMap.getOrDefault(vo.getId(), ""));
});
}
@@ -262,8 +244,8 @@
// 鎵归噺鏌ヨ妫�娴嬩汉鍛�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesQcIpqcDO::getInspectorUserId));
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛圡DM 鐗╂枡锛�
+ Map<Long, MdmItemRespDTO> itemMap = mdmItemApi.getItemMap(
convertSet(list, MesQcIpqcDO::getItemId));
// 鎵归噺鏌ヨ琛屾槑缁�
List<MesQcIpqcLineDO> lines = ipqcLineMapper.selectListByIpqcIds(convertSet(list, MesQcIpqcDO::getId));
@@ -280,10 +262,9 @@
for (MesQcIpqcDO ipqc : list) {
MesQcQualityExportVO vo = new MesQcQualityExportVO();
vo.setDocName(ipqc.getName());
- MesMdItemDO item = itemMap.get(ipqc.getItemId());
+ MdmItemRespDTO item = itemMap.get(ipqc.getItemId());
vo.setItemName(item != null ? item.getName() : "");
- // IPQC 鏃犳壒娆″彿瀛楁锛屾殏鐢ㄦ潵婧愬崟鎹紪鍙凤紙涓�鑸负鐢熶骇宸ュ崟鍙凤級浣滀负鎵瑰彿
- vo.setBatchNo(ipqc.getSourceDocCode());
+ vo.setBatchNo(ipqc.getBatchCode());
vo.setInspectDate(MesQcQualityExportVO.formatDateTime(ipqc.getInspectDate()));
List<String> indicatorNames = new ArrayList<>();
List<String> judgementSegments = new ArrayList<>();
--
Gitblit v1.9.3