From be5783c8a7e13bbc76d33c95643d75779cce21db Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 18 七月 2026 15:39:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/iqc/MesQcIqcController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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 1602160..54b7169 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
@@ -10,13 +10,13 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.qc.iqc.vo.MesQcIqcSaveReqVO;
+import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
+import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
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.vendor.MesMdVendorDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.iqc.MesQcIqcDO;
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.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -50,7 +50,7 @@
@Resource
private MesQcIqcService iqcService;
@Resource
- private MesMdVendorService vendorService;
+ private ErpSupplierApi supplierApi;
@Resource
private MesMdItemService itemService;
@Resource
@@ -128,8 +128,9 @@
return Collections.emptyList();
}
// 鎵归噺鏌ヨ渚涘簲鍟�
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesQcIqcDO::getVendorId));
+ Map<Long, ErpSupplierRespDTO> vendorMap = supplierApi.getSupplierList(
+ convertSet(list, MesQcIqcDO::getVendorId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, s -> s));
// 鎵归噺鏌ヨ鐗╂枡
Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
convertSet(list, MesQcIqcDO::getItemId));
@@ -142,7 +143,7 @@
// 鎷艰 VO
return BeanUtils.toBean(list, MesQcIqcRespVO.class, vo -> {
findAndThen(vendorMap, vo.getVendorId(),
- vendor -> vo.setVendorNickname(vendor.getNickname()));
+ vendor -> vo.setVendorNickname(vendor.getName()));
findAndThen(itemMap, vo.getItemId(), item -> {
vo.setItemCode(item.getCode());
vo.setItemName(item.getName());
--
Gitblit v1.9.3