From b0978a62cf2050170793e87fbd01db1760808043 Mon Sep 17 00:00:00 2001
From: xiaoyi <908147524@qq.com>
Date: 星期三, 04 十一月 2026 09:50:30 +0800
Subject: [PATCH] feat: 从长辉移植新高缺失的六个业务模块（安全生产/能耗/数采/备件/质检台账/售后问题回访）
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java | 48 +++++++++++++++++++++++++++++++++++++++---------
1 files changed, 39 insertions(+), 9 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
index a461d13..155e495 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/outsourceissue/MesWmOutsourceIssueController.java
@@ -8,17 +8,20 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssuePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.outsourceissue.vo.MesWmOutsourceIssueSaveReqVO;
-import cn.iocoder.yudao.module.mes.dal.dataobject.md.vendor.MesMdVendorDO;
+import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
+import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.workorder.MesProWorkOrderDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.outsourceissue.MesWmOutsourceIssueDO;
-import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService;
import cn.iocoder.yudao.module.mes.service.wm.outsourceissue.MesWmOutsourceIssueService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -26,6 +29,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.Collections;
@@ -45,7 +49,7 @@
@Resource
private MesWmOutsourceIssueService outsourceIssueService;
@Resource
- private MesMdVendorService vendorService;
+ private SrmSupplierApi srmSupplierApi;
@Resource
private MesProWorkOrderService workOrderService;
@@ -76,7 +80,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱澶栧崗鍙戞枡鍗�")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
public CommonResult<MesWmOutsourceIssueRespVO> getOutsourceIssue(@RequestParam("id") Long id) {
MesWmOutsourceIssueDO issue = outsourceIssueService.getOutsourceIssue(id);
if (issue == null) {
@@ -87,7 +90,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱澶栧崗鍙戞枡鍗曞垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
public CommonResult<PageResult<MesWmOutsourceIssueRespVO>> getOutsourceIssuePage(
@Valid MesWmOutsourceIssuePageReqVO pageReqVO) {
PageResult<MesWmOutsourceIssueDO> pageResult = outsourceIssueService.getOutsourceIssuePage(pageReqVO);
@@ -145,9 +147,36 @@
@GetMapping("/check-quantity")
@Operation(summary = "鏍￠獙澶栧崗鍙戞枡鍗曟暟閲�", description = "鏍￠獙姣忚鏄庣粏鏁伴噺涔嬪拰鏄惁绛変簬琛屽彂鏂欐暟閲�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:query')")
public CommonResult<Boolean> checkOutsourceIssueQuantity(@RequestParam("id") Long id) {
return success(outsourceIssueService.checkOutsourceIssueQuantity(id));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱澶栧崗鍙戞枡鍗曞鍏ユā鏉�")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesWmOutsourceIssueImportExcelVO> list = Collections.singletonList(
+ MesWmOutsourceIssueImportExcelVO.builder()
+ .code("WOS20260302001").name("绀轰緥澶栧崗鍙戞枡鍗�")
+ .issueDate(java.time.LocalDateTime.of(2026, 3, 2, 8, 0))
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "澶栧崗鍙戞枡鍗曞鍏ユā鏉�.xls", "澶栧崗鍙戞枡鍗曞垪琛�", MesWmOutsourceIssueImportExcelVO.class, list);
+ }
+
+ @PostMapping("/import")
+ @Operation(summary = "瀵煎叆澶栧崗鍙戞枡鍗�")
+ @Parameters({
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true),
+ @Parameter(name = "updateSupport", description = "鏄惁鏀寔鏇存柊锛岄粯璁や负 false", example = "true")
+ })
+ @PreAuthorize("@ss.hasPermission('mes:wm-outsource-issue:import')")
+ public CommonResult<MesWmOutsourceIssueImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesWmOutsourceIssueImportExcelVO> list = ExcelUtils.read(file, MesWmOutsourceIssueImportExcelVO.class);
+ return success(outsourceIssueService.importOutsourceIssueList(list, updateSupport));
}
// ==================== 鎷兼帴 VO ====================
@@ -157,14 +186,15 @@
return Collections.emptyList();
}
// 1. 鑾峰緱鍏宠仈鏁版嵁
- Map<Long, MesMdVendorDO> vendorMap = vendorService.getVendorMap(
- convertSet(list, MesWmOutsourceIssueDO::getVendorId));
+ Map<Long, SrmSupplierRespDTO> vendorMap = srmSupplierApi.getSupplierList(
+ convertSet(list, MesWmOutsourceIssueDO::getVendorId)).getCheckedData().stream()
+ .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, s -> s));
Map<Long, MesProWorkOrderDO> workOrderMap = workOrderService.getWorkOrderMap(
convertSet(list, MesWmOutsourceIssueDO::getWorkOrderId));
// 2. 鏋勫缓缁撴灉
return BeanUtils.toBean(list, MesWmOutsourceIssueRespVO.class, vo -> {
MapUtils.findAndThen(vendorMap, vo.getVendorId(), vendor ->
- vo.setVendorCode(vendor.getCode()).setVendorName(vendor.getName()));
+ vo.setVendorName(vendor.getName()));
MapUtils.findAndThen(workOrderMap, vo.getWorkOrderId(), workOrder ->
vo.setWorkOrderCode(workOrder.getCode()).setWorkOrderName(workOrder.getName()));
});
--
Gitblit v1.9.3