From 7de56ab8061601614a9c29af42acadfcddcafdce Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 27 六月 2025 13:22:09 +0800
Subject: [PATCH] no message
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
index c665a12..989d23d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
@@ -16,6 +17,7 @@
import com.vincent.rsf.server.manager.entity.AsnOrderItem;
import com.vincent.rsf.server.manager.entity.Companys;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
+import com.vincent.rsf.server.manager.entity.excel.OutStockTemplate;
import com.vincent.rsf.server.manager.enums.CompanysType;
import com.vincent.rsf.server.manager.service.AsnOrderItemService;
import com.vincent.rsf.server.manager.service.CompanysService;
@@ -48,7 +50,8 @@
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- return R.ok().add(outStockItemService.listByAsnId(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
+ return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
}
@PreAuthorize("hasAuthority('manager:outStockItem:list')")
@@ -106,6 +109,7 @@
return R.ok("Update Success").add(asnOrderItem);
}
+
@PreAuthorize("hasAuthority('manager:outStockItem:remove')")
@OperationLog("Delete 鍑哄簱鍗曟槑缁�")
@PostMapping("/outStockItem/remove/{ids}")
@@ -129,6 +133,7 @@
);
return R.ok().add(vos);
}
+
@PreAuthorize("hasAuthority('manager:outStockItem:list')")
@PostMapping("/outStockItem/export")
@@ -159,7 +164,7 @@
@PostMapping("/outStockItem/import")
@ApiOperation("ASN瀵煎叆鎺ュ彛")
@PreAuthorize("hasAuthority('manager:outStockItem:update')")
- public R importExcel(@RequestParam(value = "file") MultipartFile file, @RequestParam String asnId) throws Exception {
+ public R importExcel(@RequestParam(value = "file") MultipartFile file) throws Exception {
if (Objects.isNull(file)) {
R.error("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
@@ -174,13 +179,14 @@
* @return
* @time 2025/4/18 08:17
*/
- @PostMapping("/outStockItem/template/download")
+ @PostMapping("/outStock/template/download")
@ApiOperation("涓嬭浇鏀惰揣鍗曟ā鏉�")
@PreAuthorize("hasAuthority('manager:outStockItem:update')")
public void downloadTemplate(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class);
- List<AsnOrderTemplate> list = Arrays.asList(template);
- ExcelUtil.build(ExcelUtil.create(list, AsnOrderTemplate.class, true), response);
+ OutStockTemplate template = ExcelUtil.mockData(OutStockTemplate.class);
+ List<OutStockTemplate> list = Arrays.asList(template);
+ ExcelUtil.build(ExcelUtil.create(list, OutStockTemplate.class, true), response);
}
+
}
--
Gitblit v1.9.1