From 9daeb6eac6e46710055e625bbbd56331b8890e21 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 10:10:20 +0800
Subject: [PATCH] revert(energy): 撤销 energy 模块移植（与新高原有 em 模块重复）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
index 715afe0..94b5d80 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/oqc/MesQcOqcController.java
@@ -12,13 +12,12 @@
import cn.iocoder.yudao.module.mes.controller.admin.qc.oqc.vo.MesQcOqcSaveReqVO;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mdm.api.item.dto.MdmItemRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.md.unitmeasure.MesMdUnitMeasureDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.qc.oqc.MesQcOqcDO;
-import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
-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.qc.oqc.MesQcOqcService;
+import cn.iocoder.yudao.module.mes.service.qc.support.MesQcItemResolver;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
import io.swagger.v3.oas.annotations.Operation;
@@ -56,7 +55,7 @@
@Resource
private CrmCustomerApi customerApi;
@Resource
- private MesMdItemService itemService;
+ private MesQcItemResolver qcItemResolver;
@Resource
private MesMdUnitMeasureService unitMeasureService;
@@ -99,7 +98,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鍑鸿揣妫�楠屽崟")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:qc-oqc:query')")
public CommonResult<MesQcOqcRespVO> getOqc(@RequestParam("id") Long id) {
MesQcOqcDO oqc = oqcService.getOqc(id);
return success(buildOqcRespVOList(Collections.singletonList(oqc)).get(0));
@@ -107,7 +105,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鍑鸿揣妫�楠屽崟鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:qc-oqc:query')")
public CommonResult<PageResult<MesQcOqcRespVO>> getOqcPage(@Valid MesQcOqcPageReqVO pageReqVO) {
PageResult<MesQcOqcDO> pageResult = oqcService.getOqcPage(pageReqVO);
return success(new PageResult<>(buildOqcRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -134,12 +131,12 @@
// 鎵归噺鏌ヨ瀹㈡埛
Map<Long, CrmCustomerRespDTO> clientMap = customerApi.getCustomerMap(
convertSet(list, MesQcOqcDO::getClientId));
- // 鎵归噺鏌ヨ鐗╂枡
- Map<Long, MesMdItemDO> itemMap = itemService.getItemMap(
+ // 鎵归噺鏌ヨ鐗╂枡锛堝吋瀹� mdm_item.id / mes_md_item.id锛�
+ Map<Long, MdmItemRespDTO> itemMap = qcItemResolver.getItemMap(
convertSet(list, MesQcOqcDO::getItemId));
// 鎵归噺鏌ヨ璁￠噺鍗曚綅
Map<Long, MesMdUnitMeasureDO> unitMeasureMap = unitMeasureService.getUnitMeasureMap(
- convertSet(itemMap.values(), MesMdItemDO::getUnitMeasureId));
+ convertSet(itemMap.values(), MdmItemRespDTO::getUnitMeasureId));
// 鎵归噺鏌ヨ妫�娴嬩汉鍛�
Map<Long, AdminUserRespDTO> userMap = adminUserApi.getUserMap(
convertSet(list, MesQcOqcDO::getInspectorUserId));
@@ -175,7 +172,7 @@
.build()
);
// 杈撳嚭
- ExcelUtils.write(response, "鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘.xls", "鍑鸿揣妫�楠屽崟鍒楄〃", MesQcOqcImportExcelVO.class, list);
+ ExcelUtils.writeTemplate(response, "鍑鸿揣妫�楠屽崟瀵煎叆妯℃澘.xls", "鍑鸿揣妫�楠屽崟鍒楄〃", MesQcOqcImportExcelVO.class, list);
}
@PostMapping("/import")
--
Gitblit v1.9.3