From 8eb93d5740c17f7b30888cc4dc1038f024ab3cb9 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 11 六月 2025 09:22:04 +0800 Subject: [PATCH] DO单导入优化 出库单导入优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java index 9ee7129..1ee268e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java @@ -10,6 +10,7 @@ import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam; import com.vincent.rsf.server.manager.controller.params.OutStockToTaskParams; +import com.vincent.rsf.server.manager.entity.excel.OutStockTemplate; import com.vincent.rsf.server.manager.enums.OrderType; import com.vincent.rsf.server.manager.enums.OrderWorkType; import com.vincent.rsf.server.common.annotation.OperationLog; @@ -240,6 +241,7 @@ } @PostMapping("/outStock/order/getOutTaskItems") + @ApiOperation("鍑哄簱鍗曞簱浣嶉瑙�") @PreAuthorize("hasAuthority('manager:outStock:list')") public R getOrderOutTaskItem(@RequestBody OrderOutTaskParam param) { if (Cools.isEmpty(param)) { @@ -262,10 +264,40 @@ if (Cools.isEmpty()) { return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } + if (Objects.isNull(params.get("outId"))) { + return R.error("鍑哄簱鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + List<OutStockToTaskParams> taskParams = JSONArray.parseArray(JSONArray.toJSONString(params.get("items")), OutStockToTaskParams.class); - return outStockService.genOutStockTask(taskParams, getLoginUserId()); + return outStockService.genOutStockTask(taskParams, getLoginUserId(), Long.parseLong(params.get("outId").toString())); } + /** + * 鑾峰彇鍑哄簱绔欑偣 + * @return + */ + @GetMapping("/outStock/tasks/sites") + @ApiOperation("鑾峰彇鍑哄簱搴撳彛") + @PreAuthorize("hasAuthority('manager:outStock:list')") + public R getSiteNos() { + return outStockService.getSiteNos(); + } + + /** + * @author Ryan + * @description 涓嬭浇妯℃澘 + * @param + * @return + * @time 2025/4/18 08:17 + */ + @PostMapping("/outStock/template/download") + @ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�") + @PreAuthorize("hasAuthority('manager:outStockItem:update')") + public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { + OutStockTemplate template = ExcelUtil.mockData(OutStockTemplate.class); + List<OutStockTemplate> list = Arrays.asList(template); + ExcelUtil.build(ExcelUtil.create(list, OutStockTemplate.class, true), response); + } } -- Gitblit v1.9.1