From ac2e2b5af3726ee64dc37c3ebf26989a0346f22a Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 07 十一月 2026 19:16:05 +0800
Subject: [PATCH] feat(feedback): 优化报工审批流程并增加报工人校验
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java
index 88c2270..b0907d4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/stocktaking/task/MesWmStockTakingTaskLineController.java
@@ -4,6 +4,9 @@
import cn.iocoder.yudao.framework.common.pojo.CommonResult;
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.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineImportExcelVO;
+import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLinePageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.stocktaking.task.vo.line.MesWmStockTakingTaskLineSaveReqVO;
@@ -25,11 +28,14 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import jakarta.validation.Valid;
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 java.util.Map;
@@ -61,7 +67,6 @@
@GetMapping("/get")
@Operation(summary = "鑾峰緱鐩樼偣浠诲姟琛�")
@Parameter(name = "id", description = "缂栧彿", required = true)
- @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')")
public CommonResult<MesWmStockTakingTaskLineRespVO> getStockTakingTaskLine(@RequestParam("id") Long id) {
MesWmStockTakingTaskLineDO line = stockTakingTaskLineService.getStockTakingTaskLine(id);
if (line == null) {
@@ -72,7 +77,6 @@
@GetMapping("/page")
@Operation(summary = "鑾峰緱鐩樼偣浠诲姟琛屽垎椤�")
- @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')")
public CommonResult<PageResult<MesWmStockTakingTaskLineRespVO>> getStockTakingTaskLinePage(
@Valid MesWmStockTakingTaskLinePageReqVO pageReqVO) {
PageResult<MesWmStockTakingTaskLineDO> pageResult = stockTakingTaskLineService.getStockTakingTaskLinePage(pageReqVO);
@@ -105,13 +109,31 @@
@GetMapping("/simple-list")
@Operation(summary = "鑾峰緱鐩樼偣浠诲姟琛岀簿绠�鍒楄〃", description = "鏍规嵁浠诲姟缂栧彿鏌ヨ锛屼富瑕佺敤浜庡墠绔殑涓嬫媺閫夐」")
- @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:query')")
public CommonResult<List<MesWmStockTakingTaskLineRespVO>> getStockTakingTaskLineSimpleList(
@RequestParam("taskId") Long taskId) {
List<MesWmStockTakingTaskLineDO> list = stockTakingTaskLineService.getStockTakingTaskLineListByTaskId(taskId);
return success(buildStockTakingTaskLineRespVOList(list));
}
+ @PostMapping("/import-excel")
+ @Operation(summary = "瀵煎叆鐩樼偣瀹炵洏鏁伴噺", description = "鎸� 鐗╂枡缂栫爜 + 鎵规鍙� 鍖归厤鐩樼偣琛岋紝鍐欏叆瀹炵洏鏁伴噺")
+ @Parameter(name = "file", description = "Excel 鏂囦欢", required = true)
+ @PreAuthorize("@ss.hasPermission('mes:wm-stock-taking-task:update')")
+ public CommonResult<MesWmStockTakingTaskLineImportRespVO> importStockTakingQuantity(
+ @RequestParam("taskId") Long taskId,
+ @RequestParam("file") MultipartFile file) throws IOException {
+ List<MesWmStockTakingTaskLineImportExcelVO> list =
+ ExcelUtils.read(file, MesWmStockTakingTaskLineImportExcelVO.class);
+ return success(stockTakingTaskLineService.importTakingQuantity(taskId, list));
+ }
+
+ @GetMapping("/get-import-template")
+ @Operation(summary = "涓嬭浇鐩樼偣瀵煎叆妯℃澘")
+ public void getImportTemplate(HttpServletResponse response) throws IOException {
+ ExcelUtils.write(response, "鐩樼偣瀹炵洏鏁板鍏ユā鏉�.xls", "瀹炵洏鏁�",
+ MesWmStockTakingTaskLineImportExcelVO.class, Collections.emptyList());
+ }
+
// ==================== 鎷兼帴 VO ====================
private List<MesWmStockTakingTaskLineRespVO> buildStockTakingTaskLineRespVOList(List<MesWmStockTakingTaskLineDO> list) {
--
Gitblit v1.9.3