From 48b875f66aa0b9346b698e600f03361e972028e8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 19 六月 2025 18:33:22 +0800
Subject: [PATCH] 波次出库任务失败
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java | 24 +++++++-----------------
1 files changed, 7 insertions(+), 17 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..5e37529 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;
@@ -48,7 +49,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 +108,7 @@
return R.ok("Update Success").add(asnOrderItem);
}
+
@PreAuthorize("hasAuthority('manager:outStockItem:remove')")
@OperationLog("Delete 鍑哄簱鍗曟槑缁�")
@PostMapping("/outStockItem/remove/{ids}")
@@ -129,6 +132,7 @@
);
return R.ok().add(vos);
}
+
@PreAuthorize("hasAuthority('manager:outStockItem:list')")
@PostMapping("/outStockItem/export")
@@ -159,7 +163,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("鏂囦欢涓嶈兘涓虹┖锛侊紒");
}
@@ -167,20 +171,6 @@
return outStockItemService.excelImport(file, hashMap, getLoginUserId());
}
- /**
- * @author Ryan
- * @description 涓嬭浇妯℃澘
- * @param
- * @return
- * @time 2025/4/18 08:17
- */
- @PostMapping("/outStockItem/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);
- }
+
}
--
Gitblit v1.9.1