From cb2339b2f1530132659c8c320cfdd91ee7f68c61 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 31 七月 2025 12:47:28 +0800
Subject: [PATCH] 调拔单功能优化 库位编辑更新不生效问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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 dcc9f81..cde90ee 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,9 +11,11 @@
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.system.controller.BaseController;
@@ -33,6 +35,8 @@
@Autowired
private TransferService transferService;
+ @Autowired
+ private OutStockService outStockService;
@PreAuthorize("hasAuthority('manager:transfer:list')")
@PostMapping("/transfer/page")
@@ -115,8 +119,12 @@
@OperationLog("Delete 璋冩嫈鍗�")
@PostMapping("/transfer/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
- if (!transferService.removeByIds(Arrays.asList(ids))) {
- return R.error("Delete Fail");
+ List<Long> list = Arrays.asList(ids);
+ if (list.isEmpty()) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (!transferService.removeTransfer(list)) {
+ throw new CoolException("璋冩嫈鍗曠Щ闄ゅけ璐ワ紒锛�");
}
return R.ok("Delete Success").add(ids);
}
@@ -147,7 +155,7 @@
@ApiOperation("鍗曟嵁淇℃伅淇敼")
@PostMapping("/transfer/items/update")
- @PreAuthorize("hasAuthority('manager:outStock:update')")
+ @PreAuthorize("hasAuthority('manager:transfer:update')")
public R orderAndrItemUpdate(@RequestBody TransferItemParams params) throws Exception {
if (Objects.isNull(params)) {
return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -156,6 +164,15 @@
}
+ @ApiOperation("鑾峰彇鍘熷簱鍖虹墿鏂欎俊鎭�")
+ @PostMapping("/transfer/locs/items")
+ @PreAuthorize("hasAuthority('manager:transfer:list')")
+ public R locsPage(@RequestBody OrgLocParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok().add(transferService.getLocsItems(params, getLoginUserId()));
+ }
/**
* @author Ryan
--
Gitblit v1.9.1