From 00ab993817c7cd9807052fdb643c03b4dc35b2a7 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期四, 13 十一月 2025 22:16:49 +0800
Subject: [PATCH] #新增 1. 拣货完成后，保存历史进出入库历史
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java | 31 +++++++++++++++++++++----------
1 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
index 844c06b..7dba356 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/StockItemController.java
@@ -9,7 +9,9 @@
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.common.utils.FieldsUtils;
import com.vincent.rsf.server.manager.entity.StockItem;
+import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.service.StockItemService;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
@@ -27,33 +29,42 @@
@Autowired
private StockItemService stockItemService;
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<StockItem, BaseParam> pageParam = new PageParam<>(baseParam, StockItem.class);
- return R.ok().add(stockItemService.page(pageParam, pageParam.buildWrapper(true)));
+ PageParam<StockItem, BaseParam> page = stockItemService.page(pageParam, pageParam.buildWrapper(true));
+ List<StockItem> records = page.getRecords();
+ for (StockItem record : records) {
+ if (!Objects.isNull(record.getFieldsIndex())) {
+ Map<String, String> fields = FieldsUtils.getFields(record.getFieldsIndex());
+ record.setExtendFields(fields);
+ }
+ }
+ page.setRecords(records);
+ return R.ok().add(page);
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(stockItemService.list());
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping({"/stockItem/many/{ids}", "/stockItems/many/{ids}"})
public R many(@PathVariable Long[] ids) {
return R.ok().add(stockItemService.listByIds(Arrays.asList(ids)));
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@GetMapping("/stockItem/{id}")
public R get(@PathVariable("id") Long id) {
return R.ok().add(stockItemService.getById(id));
}
- @PreAuthorize("hasAuthority('manager:stockItem:save')")
+ @PreAuthorize("hasAuthority('manager:stock:save')")
@OperationLog("Create 搴撳瓨鏄庣粏琛�")
@PostMapping("/stockItem/save")
public R save(@RequestBody StockItem stockItem) {
@@ -67,7 +78,7 @@
return R.ok("Save Success").add(stockItem);
}
- @PreAuthorize("hasAuthority('manager:stockItem:update')")
+ @PreAuthorize("hasAuthority('manager:stock:update')")
@OperationLog("Update 搴撳瓨鏄庣粏琛�")
@PostMapping("/stockItem/update")
public R update(@RequestBody StockItem stockItem) {
@@ -79,7 +90,7 @@
return R.ok("Update Success").add(stockItem);
}
- @PreAuthorize("hasAuthority('manager:stockItem:remove')")
+ @PreAuthorize("hasAuthority('manager:stock:remove')")
@OperationLog("Delete 搴撳瓨鏄庣粏琛�")
@PostMapping("/stockItem/remove/{ids}")
public R remove(@PathVariable Long[] ids) {
@@ -89,7 +100,7 @@
return R.ok("Delete Success").add(ids);
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/query")
public R query(@RequestParam(required = false) String condition) {
List<KeyValVo> vos = new ArrayList<>();
@@ -103,7 +114,7 @@
return R.ok().add(vos);
}
- @PreAuthorize("hasAuthority('manager:stockItem:list')")
+ @PreAuthorize("hasAuthority('manager:stock:list')")
@PostMapping("/stockItem/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
ExcelUtil.build(ExcelUtil.create(stockItemService.list(), StockItem.class), response);
--
Gitblit v1.9.1