From 4114759a57d73661937f28a765fb8a67c017b14b Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 24 六月 2025 16:28:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java | 25 +------------------------
1 files changed, 1 insertions(+), 24 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 1ad99ee..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
@@ -50,30 +50,6 @@
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
- if (!Objects.isNull(map.get("poDetlId"))) {
- queryWrapper.in("po_detl_id", JSONArray.parseArray(JSONArray.toJSONString(map.get("poDetlId")), Long.class));
- }
- return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
- }
-
-
- @PreAuthorize("hasAuthority('manager:outStockItem:list')")
- @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
- @PostMapping("/outStockItem/edit/page")
- public R byPoIdspage(@RequestBody Map<String, Object> map) {
- List<Long> poDetlIds = new ArrayList<>();
- if (!Objects.isNull(map.get("poDetlId"))) {
- poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("poDetlId")), Long.class);
- map.remove("poDetlId");
- }
- BaseParam baseParam = buildParam(map, BaseParam.class);
- PageParam<AsnOrderItem, BaseParam> pageParam = new PageParam<>(baseParam, AsnOrderItem.class);
- QueryWrapper<AsnOrderItem> queryWrapper = pageParam.buildWrapper(true);
- if (!poDetlIds.isEmpty()) {
- queryWrapper.in("po_detl_id", poDetlIds);
- } else {
- return R.ok();
- }
return R.ok().add(outStockItemService.listByAsnId(pageParam, queryWrapper));
}
@@ -157,6 +133,7 @@
return R.ok().add(vos);
}
+
@PreAuthorize("hasAuthority('manager:outStockItem:list')")
@PostMapping("/outStockItem/export")
@ApiOperation("瀵煎嚭鍑哄簱鍗曟槑缁�")
--
Gitblit v1.9.1