From ffca46b39d25439a06a27cafda2ec523a3fb67cf Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 27 十月 2026 17:53:02 +0800
Subject: [PATCH] feat(mes): 增加盘号字段支持和优化报工质检流程
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/pendinginspect/MesQcPendingInspectServiceImpl.java | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/pendinginspect/MesQcPendingInspectServiceImpl.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/pendinginspect/MesQcPendingInspectServiceImpl.java
index 091e519..3f8f060 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/pendinginspect/MesQcPendingInspectServiceImpl.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/qc/pendinginspect/MesQcPendingInspectServiceImpl.java
@@ -5,6 +5,7 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.pendinginspect.vo.MesQcPendingInspectRespVO;
import cn.iocoder.yudao.module.mes.dal.mysql.qc.pendinginspect.MesQcPendingInspectMapper;
+import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import com.baomidou.mybatisplus.core.metadata.IPage;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -19,6 +20,8 @@
@Resource
private MesQcPendingInspectMapper pendingInspectMapper;
+ @Resource
+ private MesProWorkOrderService workOrderService;
@Override
public PageResult<MesQcPendingInspectRespVO> getPendingInspectPage(MesQcPendingInspectPageReqVO pageReqVO) {
@@ -26,6 +29,15 @@
IPage<MesQcPendingInspectRespVO> page = MyBatisUtils.buildPage(pageReqVO);
pendingInspectMapper.selectQcPendingPage(page,
pageReqVO.getSourceDocCode(), pageReqVO.getQcType(), pageReqVO.getItemId());
+ var orderIds = page.getRecords().stream().map(MesQcPendingInspectRespVO::getWorkOrderId)
+ .filter(java.util.Objects::nonNull).collect(java.util.stream.Collectors.toSet());
+ if (!orderIds.isEmpty()) {
+ var orders = workOrderService.getWorkOrderMap(orderIds);
+ page.getRecords().forEach(row -> {
+ var order = row.getWorkOrderId() == null ? null : orders.get(row.getWorkOrderId());
+ if (order != null) row.setReelNo(order.getReelNo());
+ });
+ }
// 杩斿洖缁撴灉
return new PageResult<>(page.getRecords(), page.getTotal());
}
--
Gitblit v1.9.3