From d2cb36959b65ece32cec7e2db4d6764f5c788b1d Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 08:33:24 +0800 Subject: [PATCH] 1. 波次删除判断是否有子任务列表 2. 任务明细添加字段:执行数量,完成数量, 源单据号,源单据ID --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java index b221e6b..014c228 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderItemController.java @@ -176,12 +176,23 @@ R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒"); } HashMap<String, Object> hashMap = new HashMap<>(); - if (!Objects.isNull(asnId)) { - hashMap.put("asnId", asnId); - } - - return asnOrderItemService.excelImport(file, hashMap); + return asnOrderItemService.excelImport(file, hashMap, getLoginUserId()); } + /** + * @author Ryan + * @description 涓嬭浇妯℃澘 + * @param + * @return + * @time 2025/4/18 08:17 + */ + @PostMapping("/asnOrderItem/template/download") + @ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�") + @PreAuthorize("hasAuthority('manager:asnOrderItem:update')") + public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception { + AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class); + List<AsnOrderTemplate> list = Arrays.asList(template); + ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response); + } } -- Gitblit v1.9.1