From 691bee4229856f8bf81c2720092ecee1c9f21509 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 19:18:12 +0800
Subject: [PATCH] #getter$摘出entity
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/TransferController.java | 63 +++++++++++++++++++++++--------
1 files changed, 47 insertions(+), 16 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 fd23a4e..5fd494a 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,17 +4,21 @@
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.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -23,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("璋冩嫈鍗�")
@@ -32,39 +36,53 @@
@Autowired
private TransferService transferService;
+ @Autowired
+ private OutStockService outStockService;
@PreAuthorize("hasAuthority('manager:transfer:list')")
@PostMapping("/transfer/page")
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));
+ return R.ok().add(buildPageRowsUtils.rowsMap(page));
}
+ @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)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(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')")
@PostMapping("/transfer/list")
public R list(@RequestBody Map<String, Object> map) {
- return R.ok().add(transferService.list());
+ return R.ok().add(buildPageRowsUtils.rowsMap(transferService.list()));
}
@PreAuthorize("hasAuthority('manager:transfer:list')")
@PostMapping({"/transfer/many/{ids}", "/transfers/many/{ids}"})
public R many(@PathVariable Long[] ids) {
- return R.ok().add(transferService.listByIds(Arrays.asList(ids)));
+ return R.ok().add(buildPageRowsUtils.rowsMap(transferService.listByIds(Arrays.asList(ids))));
}
@PreAuthorize("hasAuthority('manager:transfer:list')")
@GetMapping("/transfer/{id}")
public R get(@PathVariable("id") Long id) {
- return R.ok().add(transferService.getById(id));
+ return R.ok().add(buildPageRowsUtils.rowsMap(transferService.getById(id)));
}
@PreAuthorize("hasAuthority('manager:transfer:save')")
@@ -84,7 +102,7 @@
if (!transferService.save(transfer)) {
return R.error("Save Fail");
}
- return R.ok("Save Success").add(transfer);
+ return R.ok("Save Success").add(buildPageRowsUtils.rowsMap(transfer));
}
@PreAuthorize("hasAuthority('manager:transfer:update')")
@@ -96,17 +114,21 @@
if (!transferService.updateById(transfer)) {
return R.error("Update Fail");
}
- return R.ok("Update Success").add(transfer);
+ return R.ok("Update Success").add(buildPageRowsUtils.rowsMap(transfer));
}
@PreAuthorize("hasAuthority('manager:transfer:remove')")
@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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
- return R.ok("Delete Success").add(ids);
+ if (!transferService.removeTransfer(list)) {
+ throw new CoolException("璋冩嫈鍗曠Щ闄ゅけ璐ワ紒锛�");
+ }
+ return R.ok("Delete Success").add(buildPageRowsUtils.rowsMap(ids));
}
@PreAuthorize("hasAuthority('manager:transfer:list')")
@@ -120,7 +142,7 @@
transferService.page(new Page<>(1, 30), wrapper).getRecords().forEach(
item -> vos.add(new KeyValVo(item.getId(), item.getId()))
);
- return R.ok().add(vos);
+ return R.ok().add(buildPageRowsUtils.rowsMap(vos));
}
@PostMapping("/transfer/items/save")
@@ -135,8 +157,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
@@ -144,6 +166,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(buildPageRowsUtils.rowsMap(transferService.getLocsItems(params, getLoginUserId())));
+ }
/**
* @author Ryan
@@ -155,7 +186,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);
@@ -165,7 +196,7 @@
@PreAuthorize("hasAuthority('manager:transfer:list')")
@PostMapping("/transfer/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(transferService.list(), Transfer.class), response);
+ ExcelUtil.build(ExcelUtil.create(buildPageRowsUtils.rowsMap(transferService.list()), Transfer.class), response);
}
}
--
Gitblit v1.9.1