From 474103da0c9793ec9cd7559f109491ece282e269 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 28 七月 2025 17:03:16 +0800 Subject: [PATCH] 调拔单功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java index b1fa27e..8e6ff49 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/OutStockController.java @@ -58,7 +58,7 @@ BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class); QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true); - List<String> list = Arrays.asList(OrderType.ORDER_OUT.type); + List<String> list = Arrays.asList(OrderType.ORDER_OUT.type, OrderType.ORDER_TRANSFER.type); queryWrapper.in("type", list); return R.ok().add(outStockService.page(pageParam, queryWrapper)); } @@ -200,7 +200,7 @@ } List<AsnOrderTemplate> orderTemplates = new ArrayList<>(); for (WkOrder order : orders) { - List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId())); + List<WkOrderItem> orderItems = outStockItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId())); for (WkOrderItem item : orderItems) { if (Objects.isNull(item)) { continue; -- Gitblit v1.9.1