From b1c9e5683cee961946e85297eb581f26cff694ef Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期四, 09 四月 2026 15:00:07 +0800
Subject: [PATCH] lsh#
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java
index 3842fd6..a939faf 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java
@@ -11,12 +11,14 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
+import com.vincent.rsf.server.manager.controller.params.OrgLocParams;
import com.vincent.rsf.server.manager.controller.params.TransferItemParams;
import com.vincent.rsf.server.manager.entity.Transfer;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.manager.service.TransferService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -25,7 +27,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@Api("璋冩嫈鍗�")
@@ -42,7 +44,9 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Transfer, BaseParam> pageParam = new PageParam<>(baseParam, Transfer.class);
- return R.ok().add(transferService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<Transfer, BaseParam> page = transferService.page(pageParam, pageParam.buildWrapper(true));
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@ApiOperation("鑾峰彇璋冩嫈鍗曞叧鑱旇鍗�")
@@ -154,8 +158,8 @@
@ApiOperation("鍗曟嵁淇℃伅淇敼")
@PostMapping("/transfer/items/update")
- @PreAuthorize("hasAuthority('manager:outStock:update')")
- public R orderAndrItemUpdate(@RequestBody TransferItemParams params) throws Exception {
+ @PreAuthorize("hasAuthority('manager:transfer:update')")
+ public R orderAndrItemUpdate(@RequestBody TransferItemParams params) {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -163,6 +167,15 @@
}
+ @ApiOperation("鑾峰彇鍘熷簱鍖虹墿鏂欎俊鎭�")
+ @PostMapping("/transfer/locs/items")
+ @PreAuthorize("hasAuthority('manager:transfer:list')")
+ public R locsPage(@RequestBody OrgLocParams params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok().add(transferService.getLocsItems(params, getLoginUserId()));
+ }
/**
* @author Ryan
@@ -174,7 +187,7 @@
@PostMapping("/transfer/template/download")
@ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
@PreAuthorize("hasAuthority('manager:transfer:update')")
- public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) {
CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
List<CheckOrderTemplate> list = Arrays.asList(template);
ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
--
Gitblit v1.9.1