From c47c8647f514eaa8c6a7624185b55738e8625c2c Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 05 十一月 2026 13:37:31 +0800
Subject: [PATCH] feat(product-issue): 支持按任务工序校验和选择领料物料
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java | 37 ++++++++++++++++++++++++++++++++++---
1 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
index 1ad30d1..2e5ee7d 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/pd/project/MesPdProjectController.java
@@ -9,6 +9,8 @@
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.pd.project.vo.MesPdProjectAuditReqVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.pd.project.vo.MesPdProjectSaveReqVO;
@@ -18,6 +20,7 @@
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
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;
@@ -25,8 +28,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.time.LocalDateTime;
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -78,7 +83,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱璁捐椤圭洰")
@Parameter(name = "id", description = "缂栧彿", required = true, example = "1024")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<MesPdProjectRespVO> getProject(@RequestParam("id") Long id) {
MesPdProjectDO project = projectService.getProject(id);
if (project == null) {
@@ -89,7 +93,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱璁捐椤圭洰鍒嗛〉")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<PageResult<MesPdProjectRespVO>> getProjectPage(@Valid MesPdProjectPageReqVO pageReqVO) {
PageResult<MesPdProjectDO> pageResult = projectService.getProjectPage(pageReqVO);
return success(new PageResult<>(buildProjectRespVOList(pageResult.getList()), pageResult.getTotal()));
@@ -106,6 +109,35 @@
// 瀵煎嚭 Excel
ExcelUtils.write(response, "璁捐椤圭洰.xls", "鏁版嵁", MesPdProjectRespVO.class,
buildProjectRespVOList(list));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "鑾峰緱璁捐椤圭洰瀵煎叆妯℃澘")
+ public void importTemplate(HttpServletResponse response) throws IOException {
+ // 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ List<MesPdProjectImportExcelVO> list = Collections.singletonList(
+ MesPdProjectImportExcelVO.builder().taskCode("PD-001").taskName("绀轰緥璁捐浠诲姟")
+ .productCode("").productName("").version("V1.0")
+ .chiefDesigner(1L).reviewer(1L)
+ .planFinishTime(LocalDateTime.of(2026, 12, 31, 0, 0))
+ .remark("").build()
+ );
+ // 杈撳嚭
+ ExcelUtils.writeTemplate(response, "璁捐椤圭洰瀵煎叆妯℃澘.xls", "璁捐椤圭洰鍒楄〃", MesPdProjectImportExcelVO.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:pd-project:import')")
+ public CommonResult<MesPdProjectImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
+ @RequestParam(value = "updateSupport", required = false,
+ defaultValue = "false") Boolean updateSupport) throws Exception {
+ List<MesPdProjectImportExcelVO> list = ExcelUtils.read(file, MesPdProjectImportExcelVO.class);
+ return success(projectService.importProjectList(list, updateSupport));
}
@PutMapping("/publish")
@@ -145,7 +177,6 @@
@GetMapping("/approver-ids")
@Operation(summary = "鑾峰緱璁捐椤圭洰鐨勫鏍镐汉缂栧彿闆嗗悎锛屼緵鍓嶇鍒ゆ柇鏄惁灞曠ず瀹℃牳鎸夐挳")
- @PreAuthorize("@ss.hasPermission('mes:pd-project:query')")
public CommonResult<Set<Long>> getApproverUserIds() {
return success(projectService.getProjectApproverUserIds());
}
--
Gitblit v1.9.3