From 04305fffd60be5dd972e7aaf3d0f04f74865d893 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Fri, 17 Jul 2026 02:26:10 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20stock.transaction=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=20where.ids=20=E7=B2=BE=E7=A1=AE=E7=AD=9B=E9=80=89=EF=BC=8C?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=AF=BC=E5=87=BA=E9=80=89=E4=B8=AD=E8=AE=B0?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 之前 where.ids 传入完全被忽略,导致导出内容与用户选中的记录不符。 queryList/exportList 现已支持 ids 数组精确筛选 wms_stock_transaction.id。 --- .../systemMethods/stock/transaction.js | 8 ++++++++ app/service/systems/stock_transaction.js | 20 +++++++++++++++++++ 2 files changed, 28 insertions(+) diff --git a/app/service/systemMethods/stock/transaction.js b/app/service/systemMethods/stock/transaction.js index f8c94e1..6dae504 100644 --- a/app/service/systemMethods/stock/transaction.js +++ b/app/service/systemMethods/stock/transaction.js @@ -38,6 +38,7 @@ class StockTransactionMethodService extends MainService { store_ids: storeIds, stock_ids: stockIds, keyword, + ids, transaction_type: transactionType, order_type: orderType, order_no: orderNo, @@ -67,6 +68,7 @@ class StockTransactionMethodService extends MainService { storeIds, stockIds, keyword, + ids, transactionType, orderType, orderNo, @@ -109,6 +111,7 @@ class StockTransactionMethodService extends MainService { stock_ids: stockIdsRaw, stock_id: stockIdRaw, keyword, + ids, transaction_type: transactionType, order_type: orderType, order_no: orderNo, @@ -148,6 +151,7 @@ class StockTransactionMethodService extends MainService { warehouseIds, stockIds, keyword, + ids, transactionType, orderType, orderNo, @@ -178,6 +182,7 @@ class StockTransactionMethodService extends MainService { store_ids: storeIds, stock_ids: stockIds, keyword, + ids, transaction_type: transactionType, order_type: orderType, order_no: orderNo, @@ -223,6 +228,7 @@ class StockTransactionMethodService extends MainService { storeIds, stockIds, keyword, + ids, transactionType, orderType, orderNo, @@ -284,6 +290,7 @@ class StockTransactionMethodService extends MainService { stock_ids: stockIdsRaw, stock_id: stockIdRaw, keyword, + ids, transaction_type: transactionType, order_type: orderType, order_no: orderNo, @@ -337,6 +344,7 @@ class StockTransactionMethodService extends MainService { warehouseIds, stockIds, keyword, + ids, transactionType, orderType, orderNo, diff --git a/app/service/systems/stock_transaction.js b/app/service/systems/stock_transaction.js index a339123..110c9d3 100644 --- a/app/service/systems/stock_transaction.js +++ b/app/service/systems/stock_transaction.js @@ -400,6 +400,7 @@ class StockTransactionService extends Service { warehouseIds, stockIds: rawStockIds, keyword, + ids, transactionType, orderType, orderNo, @@ -482,6 +483,15 @@ class StockTransactionService extends Service { replacements.stockIds = normalizedStockIds; } + // 记录ID筛选(精确导出选中记录) + const normalizedIds = Array.isArray(ids) + ? ids.map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0) + : []; + if (normalizedIds.length > 0) { + whereClauses.push('t.id IN (:ids)'); + replacements.ids = normalizedIds; + } + // 流水类型 if (transactionType) { whereClauses.push('t.transaction_type = :transactionType'); @@ -644,6 +654,7 @@ class StockTransactionService extends Service { warehouseIds, stockIds: rawStockIds, keyword, + ids, transactionType, orderType, orderNo, @@ -722,6 +733,15 @@ class StockTransactionService extends Service { replacements.stockIds = normalizedStockIds; } + // 记录ID筛选(精确导出选中记录) + const normalizedIds = Array.isArray(ids) + ? ids.map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0) + : []; + if (normalizedIds.length > 0) { + whereClauses.push('t.id IN (:ids)'); + replacements.ids = normalizedIds; + } + if (transactionType) { whereClauses.push('t.transaction_type = :transactionType'); replacements.transactionType = String(transactionType).trim();