From 7bd10d34e8a8dc2437ec8551eb511e37634d7306 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:52 +0800
Subject: [PATCH] feat(mes): 生产计划审批改走协同办公，修复工单领料与产成品入库校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
index 3393b6e..e9fb32e 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java
@@ -122,7 +122,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鏉ユ枡妫�楠屽崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')")
public CommonResult<MesQcIqcRespVO> getIqc(@RequestParam("id") Long id) {
MesQcIqcDO iqc = iqcService.getIqc(id);
return success(buildIqcRespVOList(Collections.singletonList(iqc)).get(0));
@@ -130,7 +129,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鏉ユ枡妫�楠屽崟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:qc-iqc:query')")
public CommonResult<PageResult<MesQcIqcRespVO>> getIqcPage(@Valid MesQcIqcPageReqVO pageReqVO) {
PageResult<MesQcIqcDO> pageResult = iqcService.getIqcPage(pageReqVO);
return success(new PageResult<>(buildIqcRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -251,7 +249,12 @@
// 鎷艰 VO
return BeanUtils.toBean(list, MesQcIqcRespVO.class, vo -> {
findAndThen(vendorMap, vo.getVendorId(),
- vendor -> vo.setVendorNickname(vendor.getName()));
+ vendor -> {
+ if (vo.getVendorName() == null) {
+ vo.setVendorName(vendor.getName());
+ }
+ });
+ vo.setVendorNickname(vo.getVendorName());
findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode());
vo.setItemName(item.getName());
--
Gitblit v1.9.3