From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 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 9767a12..9a2c374 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
@@ -4,15 +4,18 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.framework.exception.CoolException;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
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;
@@ -32,6 +35,8 @@
@Autowired
private TransferService transferService;
+ @Autowired
+ private OutStockService outStockService;
@PreAuthorize("hasAuthority('manager:transfer:list')")
@PostMapping("/transfer/page")
@@ -39,6 +44,25 @@
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)));
+ }
+
+ @ApiOperation("鑾峰彇璋冩嫈鍗曞叧鑱旇鍗�")
+ @PreAuthorize("hasAuthority('manager:transfer:list')")
+ @PostMapping("/transfer/orders/page")
+ public R getTransferInfo(@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.transfersPage(pageParam, pageParam.buildWrapper(true)));
+ }
+
+ @ApiOperation("璋冩嫈鍗曠敓鎴愬嚭搴撳崟")
+ @PreAuthorize("hasAuthority('manager:transfer:list')")
+ @PostMapping("/transfer/pub/outStock")
+ public R genOutstock(@RequestBody Transfer transfer) {
+ if (Objects.isNull(transfer)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return R.ok(transferService.genOutStock(transfer, getLoginUserId()));
}
@PreAuthorize("hasAuthority('manager:transfer:list')")
@@ -95,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);
}
@@ -127,8 +155,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -136,6 +164,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
@@ -147,7 +184,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