From 616a6b2e9a7824da8d11a4e11730fd2f9b615299 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 06 十一月 2026 09:46:53 +0800
Subject: [PATCH] fix(qc): 修复巡检记录校验缺少租户隔离问题
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
index 38b54fe..8f35b03 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java
@@ -11,12 +11,13 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,7 +46,7 @@
@Resource
private MesWmArrivalNoticeService arrivalNoticeService;
@Resource
- private MesMdVendorService vendorService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private ErpPurchaseOrderApi purchaseOrderApi;
@@ -76,7 +77,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍒拌揣閫氱煡鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:query')")
public CommonResult<MesWmArrivalNoticeRespVO> getArrivalNotice(@RequestParam("id") Long id) {
MesWmArrivalNoticeDO notice = arrivalNoticeService.getArrivalNotice(id);
if (notice == null) {
@@ -87,7 +87,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍒拌揣閫氱煡鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:query')")
public CommonResult<PageResult<MesWmArrivalNoticeRespVO>> getArrivalNoticePage(
@Valid MesWmArrivalNoticePageReqVO pageReqVO) {
PageResult<MesWmArrivalNoticeDO> pageResult = arrivalNoticeService.getArrivalNoticePage(pageReqVO);
@@ -129,9 +128,10 @@
if (CollUtil.isEmpty(list)) {
return Collections.emptyList();
}
- // 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesWmArrivalNoticeDO::getVendorId));
+ // 1. 鑾峰緱渚涘簲鍟嗕俊鎭紙ERP 閲囪喘渚涘簲鍟嗭級
+ Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
+ convertSet(list, MesWmArrivalNoticeDO::getVendorId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
// 2. 鑾峰緱閲囪喘璁㈠崟淇℃伅
List<Long> purchaseOrderIds = list.stream()
.map(MesWmArrivalNoticeDO::getPurchaseOrderId)
@@ -143,10 +143,15 @@
.collect(java.util.stream.Collectors.toMap(ErpPurchaseOrderRespDTO::getId, v -> v, (a, b) -> a));
// 3. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmArrivalNoticeRespVO.class, vo -> {
- MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
- vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
- MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder ->
- vo.setPurchaseOrderNo(purchaseOrder.getNo()));
+ MapUtils.findAndThen(supplierMap, vo.getVendorId(), supplier ->
+ vo.setVendorName(supplier.getName()));
+ MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder -> {
+ vo.setPurchaseOrderNo(purchaseOrder.getNo());
+ // 鍘嗗彶鍗曟嵁鏈揩鐓у悎鍚屽彿鏃讹紝鍥炲～閲囪喘璁㈠崟涓婄殑鍚堝悓鍙�
+ if (cn.hutool.core.util.StrUtil.isBlank(vo.getContractNo())) {
+ vo.setContractNo(purchaseOrder.getContractNo());
+ }
+ });
});
}
--
Gitblit v1.9.3