From 3ce57820e618b704ce61487b7cdb38fdd6b0f44a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 22 九月 2026 14:06:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_银川_九鸿化工' into dev_银川_九鸿化工
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/ipqc/MesQcIpqcController.java | 30 +-----------------------------
1 files changed, 1 insertions(+), 29 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 39682ab..2030742 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
@@ -15,9 +15,6 @@
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;
@@ -28,9 +25,6 @@
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.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;
@@ -69,12 +63,6 @@
@Resource
private MesQcIpqcService ipqcService;
- @Resource
- private MesProWorkOrderService workOrderService;
- @Resource
- private MesMdWorkstationService workstationService;
- @Resource
- private MesProProcessService processService;
@Resource
private MesMdItemService itemService;
@Resource
@@ -157,15 +145,6 @@
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(
convertSet(list, MesQcIpqcDO::getItemId));
@@ -182,12 +161,6 @@
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(),
@@ -289,8 +262,7 @@
vo.setDocName(ipqc.getName());
MesMdItemDO 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