From 05c0643b9337d8129876bdf9398b387c81b5f5f2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 13 六月 2025 12:39:08 +0800
Subject: [PATCH] 根据DO单添加出库单明细功能优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockItemController.java | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 0e11b1c..c30e58b 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,32 @@
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);
+ 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));
}
@PreAuthorize("hasAuthority('manager:outStockItem:list')")
@@ -106,6 +132,7 @@
return R.ok("Update Success").add(asnOrderItem);
}
+
@PreAuthorize("hasAuthority('manager:outStockItem:remove')")
@OperationLog("Delete 鍑哄簱鍗曟槑缁�")
@PostMapping("/outStockItem/remove/{ids}")
@@ -130,6 +157,7 @@
return R.ok().add(vos);
}
+
@PreAuthorize("hasAuthority('manager:outStockItem:list')")
@PostMapping("/outStockItem/export")
@ApiOperation("瀵煎嚭鍑哄簱鍗曟槑缁�")
--
Gitblit v1.9.1