From 474103da0c9793ec9cd7559f109491ece282e269 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期一, 28 七月 2025 17:03:16 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 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 cf5f8c2..dcc9f81 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,20 @@
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.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.TransferService;
+import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
+import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +40,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')")
@@ -63,6 +87,12 @@
transfer.setCreateTime(new Date());
transfer.setUpdateBy(getLoginUserId());
transfer.setUpdateTime(new Date());
+
+ if (Objects.isNull(transfer.getCode())) {
+ String ruleCode = SerialRuleUtils.generateRuleCode(SerialRuleCode.SYS_TRANSFER_ORDER_CODE, transfer);
+ transfer.setCode(ruleCode);
+ }
+
if (!transferService.save(transfer)) {
return R.error("Save Fail");
}
@@ -105,6 +135,28 @@
return R.ok().add(vos);
}
+ @PostMapping("/transfer/items/save")
+ @ApiOperation("淇濆瓨涓诲崟鍙婃槑缁�")
+ @PreAuthorize("hasAuthority('manager:transfer:save')")
+ public R saveOutStock(@RequestBody TransferItemParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return transferService.saveTransfer(params, getLoginUserId());
+ }
+
+ @ApiOperation("鍗曟嵁淇℃伅淇敼")
+ @PostMapping("/transfer/items/update")
+ @PreAuthorize("hasAuthority('manager:outStock:update')")
+ public R orderAndrItemUpdate(@RequestBody TransferItemParams params) throws Exception {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return transferService.updateTransfer(params, getLoginUserId());
+ }
+
+
+
/**
* @author Ryan
* @description 涓嬭浇妯℃澘
--
Gitblit v1.9.1