From 01ce50a3b8736726f58899b6cfa70ea27154637a Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 13 六月 2025 14:03:55 +0800
Subject: [PATCH] 出库推荐库位优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java | 39 ++++++++++++++++++++++++++++++++++++---
1 files changed, 36 insertions(+), 3 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
index eb7d9a1..8d63180 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/DeliveryItemController.java
@@ -3,6 +3,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;
@@ -39,18 +40,50 @@
private DeliveryItemService deliveryItemService;
@Autowired
private CompanysService companysService;
- @Autowired
- private DeliveryServiceImpl deliveryService;
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@PostMapping("/deliveryItem/page")
public R page(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
- return R.ok().add(deliveryItemService.page(pageParam, pageParam.buildWrapper(true)));
+ QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
+ return R.ok().add(deliveryItemService.page(pageParam, wrapper));
}
@PreAuthorize("hasAuthority('manager:deliveryItem:list')")
+ @PostMapping("/deliveryItem/filters/page")
+ public R filter(@RequestBody Map<String, Object> map) {
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
+ QueryWrapper<DeliveryItem> wrapper = pageParam.buildWrapper(true);
+ wrapper.apply("anfme > work_qty + qty ");
+ return R.ok().add(deliveryItemService.page(pageParam, wrapper));
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
+ @ApiOperation("鍒嗛〉鑾峰彇鍒楄〃")
+ @PostMapping("/deliveryItem/edit/page")
+ public R byPoIdspage(@RequestBody Map<String, Object> map) {
+ List<Long> poDetlIds = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ poDetlIds = JSONArray.parseArray(JSONArray.toJSONString(map.get("ids")), Long.class);
+ map.remove("ids");
+ }
+ BaseParam baseParam = buildParam(map, BaseParam.class);
+ PageParam<DeliveryItem, BaseParam> pageParam = new PageParam<>(baseParam, DeliveryItem.class);
+ QueryWrapper<DeliveryItem> queryWrapper = pageParam.buildWrapper(true);
+ if (!poDetlIds.isEmpty()) {
+ queryWrapper.in("id", poDetlIds);
+ } else {
+ return R.ok();
+ }
+ return R.ok().add(deliveryItemService.page(pageParam, queryWrapper));
+ }
+
+
+
+ @PreAuthorize("hasAuthority('manager:deliveryItem:list')")
@PostMapping("/deliveryItem/list")
public R list(@RequestBody Map<String, Object> map) {
return R.ok().add(deliveryItemService.list());
--
Gitblit v1.9.1