From c229a84e0a8eb68c974e6d23fa1296e064025d76 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 29 七月 2025 17:09:00 +0800
Subject: [PATCH] 调拔单功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 84 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 82 insertions(+), 2 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 06600e0..3842fd6 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,14 +4,23 @@
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.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;
+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;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -19,11 +28,14 @@
import javax.servlet.http.HttpServletResponse;
import java.util.*;
+@Api("璋冩嫈鍗�")
@RestController
public class TransferController extends BaseController {
@Autowired
private TransferService transferService;
+ @Autowired
+ private OutStockService outStockService;
@PreAuthorize("hasAuthority('manager:transfer:list')")
@PostMapping("/transfer/page")
@@ -31,6 +43,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')")
@@ -59,6 +90,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");
}
@@ -81,8 +118,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);
}
@@ -101,6 +142,45 @@
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 涓嬭浇妯℃澘
+ * @param
+ * @return
+ * @time 2025/4/18 08:17
+ */
+ @PostMapping("/transfer/template/download")
+ @ApiOperation("涓嬭浇鐩樼偣鍗曟ā鏉�")
+ @PreAuthorize("hasAuthority('manager:transfer:update')")
+ public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
+ CheckOrderTemplate template = ExcelUtil.mockData(CheckOrderTemplate.class);
+ List<CheckOrderTemplate> list = Arrays.asList(template);
+ ExcelUtil.build(ExcelUtil.create(list, CheckOrderTemplate.class, true), response);
+ }
+
+
@PreAuthorize("hasAuthority('manager:transfer:list')")
@PostMapping("/transfer/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
--
Gitblit v1.9.1