From 381e02b9eccbe953b31d09f2af1c2ce77c816140 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期六, 07 十一月 2026 14:51:05 +0800
Subject: [PATCH] fix(mes): 隔离设备物料并支持销售产品映射
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java | 83 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 80 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java
index 02191d3..74882f8 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pro/route/MesProRouteController.java
@@ -7,10 +7,21 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
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.pro.route.vo.MesProRouteImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.MesProRouteFullExcelVO;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteFullExcelService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteFullImportService;
+import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteWorkbookService;
+import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.MesProRouteImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.MesProRoutePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.MesProRouteRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pro.route.vo.MesProRouteSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.pro.route.MesProRouteProductDO;
+import cn.iocoder.yudao.module.mes.dal.dataobject.md.item.MesMdItemDO;
+import cn.iocoder.yudao.module.mes.dal.mysql.pro.route.MesProRouteProductMapper;
+import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService;
import cn.iocoder.yudao.module.mes.service.pro.route.MesProRouteService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
@@ -22,8 +33,10 @@
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;
import java.util.List;
import static cn.iocoder.yudao.framework.apilog.core.enums.OperateTypeEnum.EXPORT;
@@ -38,6 +51,16 @@
@Resource
private MesProRouteService routeService;
+ @Resource
+ private MesProRouteFullExcelService fullExcelService;
+ @Resource
+ private MesProRouteFullImportService fullImportService;
+ @Resource
+ private MesProRouteWorkbookService routeWorkbookService;
+ @Resource
+ private MesProRouteProductMapper routeProductMapper;
+ @Resource
+ private MesMdItemService itemService;
@PostMapping("/create")
@Operation(summary = "鍒涘缓宸ヨ壓璺嚎")
@@ -79,7 +102,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱宸ヨ壓璺嚎")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<MesProRouteRespVO> getRoute(@RequestParam("id") Long id) {
MesProRouteDO route = routeService.getRoute(id);
return success(BeanUtils.toBean(route, MesProRouteRespVO.class));
@@ -87,10 +109,23 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱宸ヨ壓璺嚎鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pro-route:query')")
public CommonResult<PageResult<MesProRouteRespVO>> getRoutePage(@Valid MesProRoutePageReqVO pageReqVO) {
PageResult<MesProRouteDO> pageResult = routeService.getRoutePage(pageReqVO);
- return success(BeanUtils.toBean(pageResult, MesProRouteRespVO.class));
+ PageResult<MesProRouteRespVO> response = BeanUtils.toBean(pageResult, MesProRouteRespVO.class);
+ if (!pageResult.getList().isEmpty()) {
+ var routeIds = pageResult.getList().stream().map(MesProRouteDO::getId).toList();
+ var references = routeProductMapper.selectList(new LambdaQueryWrapperX<MesProRouteProductDO>()
+ .in(MesProRouteProductDO::getRouteId, routeIds).eq(MesProRouteProductDO::getTemplateReference, true));
+ var items = itemService.getItemMap(references.stream().map(MesProRouteProductDO::getItemId).toList());
+ var byRoute = references.stream().collect(java.util.stream.Collectors.toMap(
+ MesProRouteProductDO::getRouteId, r -> r, (first, ignored) -> first));
+ response.getList().forEach(vo -> {
+ var reference = byRoute.get(vo.getId());
+ MesMdItemDO item = reference == null ? null : items.get(reference.getItemId());
+ if (item != null) { vo.setReferenceProductCode(item.getCode()); vo.setReferenceProductName(item.getName()); }
+ });
+ }
+ return success(response);
}
@GetMapping("/simple-list")
@@ -113,4 +148,46 @@
ExcelUtils.write(response, "宸ヨ壓璺嚎.xls", "鏁版嵁", MesProRouteRespVO.class, data);
}
+ @GetMapping("/get-full-import-template")
+ @Operation(summary = "涓嬭浇鎸囧畾宸ヨ壓璺嚎鍙傝�冧骇鍝併�佸伐搴忋�佷骇鍑哄拰鎶曟枡鐨勫畬鏁存ā鏉�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-route:import')")
+ public void fullImportTemplate(@RequestParam("routeId") Long routeId, HttpServletResponse response) throws IOException {
+ List<MesProRouteFullExcelVO> rows = fullExcelService.exportRouteReference(routeId);
+ routeWorkbookService.write(response, rows);
+ }
+
+ @PostMapping("/import-full")
+ @Operation(summary = "鎸夎矾绾夸簨鍔″鍏ュ畬鏁村伐鑹烘祦绋�")
+ @PreAuthorize("@ss.hasPermission('mes:pro-route:import')")
+ public CommonResult<MesProRouteImportRespVO> importFull(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false, defaultValue = "false") Boolean updateSupport) throws IOException {
+ return success(fullImportService.importRows(routeWorkbookService.read(file), updateSupport));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱宸ヨ壓璺嚎瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesProRouteImportExcelVO> list = Collections.singletonList(
+ MesProRouteImportExcelVO.builder()
+ .code("ROUTE001").name("绀轰緥宸ヨ壓璺嚎").description("").remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.write(response, "宸ヨ壓璺嚎瀵煎叆妯℃澘.xls", "宸ヨ壓璺嚎鍒楄〃", MesProRouteImportExcelVO.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:pro-route:import')")
+ public CommonResult<MesProRouteImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesProRouteImportExcelVO> list = ExcelUtils.read(file, MesProRouteImportExcelVO.class);
+ return success(routeService.importRouteList(list, updateSupport));
+ }
+
}
--
Gitblit v1.9.3