From fd1efdba56dbf07943b82c971694579af034fc5a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 03 十一月 2026 20:10:12 +0800
Subject: [PATCH] feat: 新增废料管理并完善合同导出
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
index 8ddc929..4eb8b36 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/rqc/MesQcRqcController.java
@@ -1,6 +1,8 @@
package cn.iocoder.yudao.module.mes.controller.admin.qc.rqc;
import cn.hutool.core.collection.CollUtil;
+import cn.iocoder.yudao.module.mes.dal.dataobject.wm.batch.MesWmBatchDO;
+import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService;
import cn.hutool.core.util.StrUtil;
import cn.iocoder.yudao.framework.apilog.core.annotation.ApiAccessLog;
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
@@ -62,6 +64,9 @@
public class MesQcRqcController {
@Resource
+ private MesWmBatchService batchService;
+
+ @Resource
private MesQcRqcService rqcService;
@Resource
private MesMdItemService itemService;
@@ -113,7 +118,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱閫�璐ф楠屽崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:qc-rqc:query')")
public CommonResult<MesQcRqcRespVO> getRqc(@RequestParam("id") Long id) {
MesQcRqcDO rqc = rqcService.getRqc(id);
return success(buildRqcRespVOList(Collections.singletonList(rqc)).get(0));
@@ -121,7 +125,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱閫�璐ф楠屽崟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:qc-rqc:query')")
public CommonResult<PageResult<MesQcRqcRespVO>> getRqcPage(@Valid MesQcRqcPageReqVO pageReqVO) {
PageResult<MesQcRqcDO> pageResult = rqcService.getRqcPage(pageReqVO);
return success(new PageResult<>(buildRqcRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -156,8 +159,13 @@
convertSet(list, MesQcRqcDO::getInspectorUserId));
// 鎵归噺鏌ヨ妫�楠岄」鎸囨爣
Map<Long, String> indicatorSummaryMap = buildIndicatorSummaryMap(list);
+ Map<String, MesWmBatchDO> batchMap = new HashMap<>();
+ for (String code : convertSet(list, MesQcRqcDO::getBatchCode)) {
+ if (code != null && !code.isBlank()) batchMap.put(code, batchService.getBatchByCode(code));
+ }
// 鎷艰 VO
return BeanUtils.toBean(list, MesQcRqcRespVO.class, vo -> {
+ findAndThen(batchMap, vo.getBatchCode(), batch -> vo.setReelNo(batch.getReelNo()));
findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode()).setItemName(item.getName()).setItemSpecification(item.getSpecification());
findAndThen(unitMeasureMap, item.getUnitMeasureId(),
--
Gitblit v1.9.3