From c25dffe8844e69a80cf93edf05ddb1637a77dd30 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 6 Aug 2026 17:38:49 +0800 Subject: [PATCH] =?UTF-8?q?feat(pick):=20=E5=85=88=E6=8B=A3=E5=90=8E?= =?UTF-8?q?=E5=88=86=E6=95=A3=E5=8D=95=E6=8B=A3=E8=B4=A7=E6=A8=A1=E5=BC=8F?= =?UTF-8?q?=E6=94=AF=E6=8C=81=20-=20box=5Fno=E6=8C=89=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=B9=B6=E6=8C=89stock=5Fid=E5=88=86?= =?UTF-8?q?=E7=BB=84=E5=88=9B=E5=BB=BA=E6=A1=86=20-=20picking=5Fdetails?= =?UTF-8?q?=E5=92=8CscanOrder=E6=8C=89stock=5Fid=E6=98=A0=E5=B0=84box=5Fno?= =?UTF-8?q?=20-=20singleFetchByIds=E6=B3=A2=E6=AC=A1=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E5=85=88=E6=8B=A3=E5=90=8E=E5=88=86=E6=A8=A1=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../systemMethods/order/recheckOrder.js | 32 +- app/service/systemMethods/pick.js | 305 ++++++++++++++++-- app/service/systems/pick.js | 22 ++ 3 files changed, 326 insertions(+), 33 deletions(-) diff --git a/app/service/systemMethods/order/recheckOrder.js b/app/service/systemMethods/order/recheckOrder.js index ccde821..5790498 100644 --- a/app/service/systemMethods/order/recheckOrder.js +++ b/app/service/systemMethods/order/recheckOrder.js @@ -517,11 +517,41 @@ class RecheckOrderService extends OrderBaseService { // 批量查询包材推荐 const packageMaterialMap = await this.batchQueryPackageMaterialRecommendation(orders, warehouseId); - // 为每个订单附加 items_weight 和包材推荐 + // 查询任务框的 stock_id → box_no 映射(用于先拣后分等散单模式) + const taskId = pickerInfo.task_id; + const boxNoByStockId = new Map(); + if (taskId > 0) { + const { ctx } = this; + const boxRows = await ctx.model.query( + `SELECT ref_id, box_no + FROM wms_wave_pick_task_box + WHERE task_id = :taskId`, + { + replacements: { taskId }, + type: ctx.model.QueryTypes.SELECT, + } + ); + for (const row of (Array.isArray(boxRows) ? boxRows : [])) { + const sid = Number(row.ref_id || 0); + const bno = Number(row.box_no || 0); + if (sid > 0 && bno > 0 && !boxNoByStockId.has(sid)) { + boxNoByStockId.set(sid, bno); + } + } + } + + // 为每个订单附加 items_weight、包材推荐和 stock 中的 box_no const enrichedOrders = orders.map(order => { const itemsHash = String(order.items_hash || '').trim(); + const enrichedStock = Array.isArray(order.stock) + ? order.stock.map(stockItem => ({ + ...stockItem, + box_no: boxNoByStockId.get(Number(stockItem.stock_id || 0)) || 0, + })) + : []; return { ...order, + stock: enrichedStock, items_weight: order.items_weight != null ? Number(order.items_weight) : 0, suggested_package_material: itemsHash ? (packageMaterialMap.get(itemsHash) || null) : null, }; diff --git a/app/service/systemMethods/pick.js b/app/service/systemMethods/pick.js index 5d33c75..762cc4f 100644 --- a/app/service/systemMethods/pick.js +++ b/app/service/systemMethods/pick.js @@ -258,46 +258,112 @@ class PickService extends MainService { ); if (normalizedOrderIds.length > 0) { - // 查询波次索引(wave_index),使 box_no 与 wms_order_wave_index.wave_index 一致 - const waveIndexMap = new Map(); - try { - const waveIndexRows = await ctx.model.query( - `SELECT order_id, wave_index - FROM wms_order_wave_index - WHERE warehouse_id = :warehouseId - AND wave_id = :waveId - AND order_id IN (:orderIds)`, + // 按库位排序并按 stock_id 分组,同 stock_id 的订单共享同一篮号 + const stockGroups = await this.resolveLocationSortedOrderIds( + normalizedOrderIds, + warehouseId, + transaction + ); + + // 写入 wms_wave_pick_task_box:每个 stock_id 一个框,记录 stock_id → box_no 映射 + const boxValuesSql = []; + const boxReplacements = {}; + let boxNo = 0; + let boxIndex = 0; + for (const group of stockGroups) { + boxNo += 1; + const stockId = group.stock_id > 0 ? group.stock_id : 0; + const boxNoKey = `boxNo${boxIndex}`; + const stockIdKey = `stockId${boxIndex}`; + const boxCodeKey = `boxCode${boxIndex}`; + boxValuesSql.push(`( + :taskId, + NULL, + :${boxCodeKey}, + :${boxNoKey}, + 1, + :${stockIdKey}, + NULL, + 0, + 0, + 0, + NULL, + NULL, + NULL, + :warehouseId, + NOW(), + NOW() + )`); + boxReplacements[boxNoKey] = boxNo; + boxReplacements[stockIdKey] = stockId; + boxReplacements[boxCodeKey] = `${taskNo}-S${boxNo}`; + boxIndex += 1; + } + + if (boxValuesSql.length > 0) { + await ctx.model.query( + ` + INSERT INTO wms_wave_pick_task_box ( + task_id, + order_id, + box_code, + box_no, + box_type, + ref_id, + ref_label, + required_qty, + picked_qty, + box_status, + review_result, + review_user_id, + review_time, + warehouse_id, + create_time, + update_time + ) VALUES ${boxValuesSql.join(',\n')} + `, { replacements: { + taskId, warehouseId, - waveId, - orderIds: normalizedOrderIds, + ...boxReplacements, }, - type: ctx.model.QueryTypes.SELECT, transaction, } ); - for (const wr of (Array.isArray(waveIndexRows) ? waveIndexRows : [])) { - const wrOrderId = Number(wr && wr.order_id || 0); - if (wrOrderId > 0) { - waveIndexMap.set(wrOrderId, Number(wr.wave_index || 0)); + + // 更新任务主表的 box_count + await ctx.model.query( + `UPDATE wms_wave_pick_task + SET box_count = :boxCount, + update_time = NOW() + WHERE id = :taskId`, + { + replacements: { taskId, boxCount: boxValuesSql.length }, + transaction, + } + ); + } + + // 写入 wms_wave_pick_task_order:每个订单写入一次(取该订单所属的最小 box_no) + const orderBoxMap = new Map(); + boxNo = 0; + for (const group of stockGroups) { + boxNo += 1; + for (const orderId of group.order_ids) { + if (!orderBoxMap.has(orderId) || orderBoxMap.get(orderId) > boxNo) { + orderBoxMap.set(orderId, boxNo); } } - } catch (e) { - ctx.logger.warn('[pick.createWavePickTask] 查询波次索引失败,box_no 将退化为任务内序号', { - error: e && e.message, - warehouseId, - waveId, - }); } const orderValuesSql = []; const orderReplacements = {}; - normalizedOrderIds.forEach((orderId, index) => { - const orderIdKey = `orderId${index}`; - const orderNoKey = `orderNo${index}`; - const boxNoKey = `boxNo${index}`; - const waveIndex = waveIndexMap.get(orderId); + let paramIndex = 0; + for (const [ orderId, orderBoxNo ] of orderBoxMap) { + const orderIdKey = `orderId${paramIndex}`; + const orderNoKey = `orderNo${paramIndex}`; + const boxNoKey = `oBoxNo${paramIndex}`; orderValuesSql.push(`( :taskId, :waveId, @@ -312,8 +378,9 @@ class PickService extends MainService { )`); orderReplacements[orderIdKey] = orderId; orderReplacements[orderNoKey] = orderNoMap.get(orderId) || ''; - orderReplacements[boxNoKey] = Number.isFinite(waveIndex) && waveIndex > 0 ? waveIndex : (index + 1); - }); + orderReplacements[boxNoKey] = orderBoxNo; + paramIndex += 1; + } await ctx.model.query( ` @@ -362,7 +429,7 @@ class PickService extends MainService { extras: { message: `订单${orderId}抓取波次成功`, warehouseId, - externalLogType: 'PDA', + externalLogType: 'API', }, })); await operationLogService.createOperationLogs(logPayloads); @@ -384,6 +451,144 @@ class PickService extends MainService { } } + /** + * 按库位排序并按 stock_id 分组订单,使 box_no 按拣货路径顺序分配。 + * + * 同 stock_id 的订单归入同一组(同一篮号),组间按 pick_sequence ASC 排序。 + * 若某订单无拣货数据(未分配储位),排到末尾保持原顺序。 + * + * @param {Array} orderIds 订单ID列表。 + * @param {number} warehouseId 仓库ID。 + * @param {Object} [transaction] Sequelize 事务。 + * @return {Promise>} 按库位排序后的分组列表。 + */ + async resolveLocationSortedOrderIds(orderIds, warehouseId, transaction) { + const { ctx } = this; + const normalizedOrderIds = [ ...new Set((Array.isArray(orderIds) ? orderIds : []) + .map(id => Number(id || 0)) + .filter(id => Number.isInteger(id) && id > 0)) ]; + + if (normalizedOrderIds.length === 0) { + return []; + } + + if (normalizedOrderIds.length === 1) { + return [{ stock_id: 0, order_ids: normalizedOrderIds }]; + } + + try { + // 查询拣货明细获取 order_item_id 和 space_id + const pickingRows = await ctx.model.Picking.findAll({ + where: { + order_id: { [this.app.Sequelize.Op.in]: normalizedOrderIds }, + warehouse_id: warehouseId, + }, + attributes: [ 'order_id', 'order_item_id', 'space_id' ], + raw: true, + transaction, + }); + + const normalizedPickingRows = Array.isArray(pickingRows) ? pickingRows : []; + const orderSpaceMap = new Map(); + const orderItemIds = []; + for (const row of normalizedPickingRows) { + const oid = Number(row && row.order_id || 0); + const sid = Number(row && row.space_id || 0); + const oiid = Number(row && row.order_item_id || 0); + if (oid > 0 && !orderSpaceMap.has(oid)) { + orderSpaceMap.set(oid, sid); + } + if (oiid > 0) { + orderItemIds.push(oiid); + } + } + + // 查询订单商品明细获取 stock_id,收集每个订单的所有 stock_id + const orderStockIdSet = new Map(); + if (orderItemIds.length > 0) { + const factory = ctx.model && ctx.model.OrderItemsFactory; + if (factory && typeof factory.getCurrentModel === 'function') { + const orderItemModel = await factory.getCurrentModel(warehouseId); + if (orderItemModel && typeof orderItemModel.findAll === 'function') { + const itemRows = await orderItemModel.findAll({ + where: { + id: { [this.app.Sequelize.Op.in]: [ ...new Set(orderItemIds) ] }, + }, + attributes: [ 'id', 'order_id', 'stock_id' ], + raw: true, + transaction, + }); + for (const row of (Array.isArray(itemRows) ? itemRows : [])) { + const oid = Number(row && row.order_id || 0); + const stockId = Number(row && row.stock_id || 0); + if (oid > 0 && stockId > 0) { + if (!orderStockIdSet.has(oid)) { + orderStockIdSet.set(oid, new Set()); + } + orderStockIdSet.get(oid).add(stockId); + } + } + } + } + } + + // 按 stock_id 分组:每个 stock_id 一个组,订单可出现在多个组(多商品订单) + const groupMap = new Map(); + for (const oid of normalizedOrderIds) { + const stockIds = orderStockIdSet.get(oid); + if (stockIds && stockIds.size > 0) { + for (const stockId of stockIds) { + if (!groupMap.has(stockId)) { + groupMap.set(stockId, { stock_id: stockId, order_ids: [] }); + } + groupMap.get(stockId).order_ids.push(oid); + } + } else { + const key = -oid; // 无 stock_id 的订单各自成组 + if (!groupMap.has(key)) { + groupMap.set(key, { stock_id: 0, order_ids: [] }); + } + groupMap.get(key).order_ids.push(oid); + } + } + + const spaceIds = [ ...new Set([ ...orderSpaceMap.values() ].filter(sid => sid > 0)) ]; + const sequenceMap = new Map(); + if (spaceIds.length > 0) { + const locationRows = await ctx.model.LocationSpace.findAll({ + where: { id: { [this.app.Sequelize.Op.in]: spaceIds } }, + attributes: [ 'id', 'pick_sequence' ], + raw: true, + transaction, + }); + for (const row of (Array.isArray(locationRows) ? locationRows : [])) { + const lid = Number(row && row.id || 0); + if (lid > 0 && !sequenceMap.has(lid)) { + sequenceMap.set(lid, Number(row.pick_sequence || 0)); + } + } + } + + // 每组取最小 pick_sequence 排序 + const groups = [ ...groupMap.values() ]; + groups.sort((a, b) => { + const seqA = Math.min(...a.order_ids.map(oid => sequenceMap.get(orderSpaceMap.get(oid)) ?? Number.MAX_SAFE_INTEGER)); + const seqB = Math.min(...b.order_ids.map(oid => sequenceMap.get(orderSpaceMap.get(oid)) ?? Number.MAX_SAFE_INTEGER)); + if (seqA !== seqB) return seqA - seqB; + return a.order_ids[0] - b.order_ids[0]; + }); + + return groups; + } catch (error) { + ctx.logger.warn('[pick.resolveLocationSortedOrderIds] 按库位排序失败,退回原顺序', { + error: error && error.message, + warehouseId, + orderCount: normalizedOrderIds.length, + }); + return [{ stock_id: 0, order_ids: normalizedOrderIds }]; + } + } + /** * 按关键字获取或创建波次拣货任务。 * @@ -709,7 +914,25 @@ class PickService extends MainService { const normalizedWaveType = Number(targetWaveType || 2); const isGroupWave = normalizedWaveType === 1; - const pickMode = isGroupWave ? 1 : 2; + // 检查是否为 singleFetchByIds 创建的波次(item_part_type='manual_ids'),使用先拣后分模式 + let isManualIdsWave = false; + try { + const waveInfoRows = await ctx.model.query( + `SELECT item_part_type + FROM wms_wave_batch + WHERE wave_id = :waveId + LIMIT 1`, + { + replacements: { waveId: targetWaveId }, + type: ctx.model.QueryTypes.SELECT, + } + ); + const waveInfo = Array.isArray(waveInfoRows) && waveInfoRows.length > 0 ? waveInfoRows[0] : null; + isManualIdsWave = String(waveInfo && waveInfo.item_part_type || '').trim() === 'manual_ids'; + } catch (e) { + // 查询失败不影响主流程,退回默认拣货模式 + } + const pickMode = isGroupWave ? 1 : (isManualIdsWave ? 3 : 2); if (selectedOrderIds.length === 0) { let orderModel = null; @@ -1080,7 +1303,25 @@ class PickService extends MainService { const normalizedWaveType = Number(targetWaveType || 2); const isGroupWave = normalizedWaveType === 1; - const pickMode = isGroupWave ? 1 : 2; + // 检查是否为 singleFetchByIds 创建的波次(item_part_type='manual_ids'),使用先拣后分模式 + let isManualIdsWaveWP = false; + try { + const waveInfoRowsWP = await ctx.model.query( + `SELECT item_part_type + FROM wms_wave_batch + WHERE wave_id = :waveId + LIMIT 1`, + { + replacements: { waveId: targetWaveId }, + type: ctx.model.QueryTypes.SELECT, + } + ); + const waveInfoWP = Array.isArray(waveInfoRowsWP) && waveInfoRowsWP.length > 0 ? waveInfoRowsWP[0] : null; + isManualIdsWaveWP = String(waveInfoWP && waveInfoWP.item_part_type || '').trim() === 'manual_ids'; + } catch (e) { + // 查询失败不影响主流程,退回默认拣货模式 + } + const pickMode = isGroupWave ? 1 : (isManualIdsWaveWP ? 3 : 2); try { const createdTask = await this.createWavePickTask({ diff --git a/app/service/systems/pick.js b/app/service/systems/pick.js index de8bc96..d40c11c 100644 --- a/app/service/systems/pick.js +++ b/app/service/systems/pick.js @@ -1261,6 +1261,16 @@ class PickSystemService extends Service { .map(row => [ Number(row && row.box_no || 0), row ]) .filter(([ boxNo ]) => boxNo > 0)); + // 构建 stock_id → box_no 映射(从 wms_wave_pick_task_box.ref_id),用于给每个拣货明细行标注篮号 + const boxNoByStockId = new Map(); + for (const row of normalizedBoxRows) { + const sid = Number(row && row.ref_id || 0); + const bno = Number(row && row.box_no || 0); + if (sid > 0 && bno > 0 && !boxNoByStockId.has(sid)) { + boxNoByStockId.set(sid, bno); + } + } + const pickingDetails = (Array.isArray(pickingRows) ? pickingRows : []).map(row => { const orderItemId = Number(row && row.order_item_id || 0); const currentSpaceId = Number(row && row.space_id || 0); @@ -1295,6 +1305,7 @@ class PickSystemService extends Service { return { order_id: Number(row && row.order_id || 0), + box_no: boxNoByStockId.get(stockId) || 0, order_item_id: orderItemId, quantity: Number(row && row.quantity || 0), storage_id: Number(row && row.storage_id || 0), @@ -1320,6 +1331,17 @@ class PickSystemService extends Service { }; }); + // 排序 picking_details:box_no 已按库位顺序生成,直接按 box_no 升序即可 + pickingDetails.sort((a, b) => { + const boxA = Number(a && a.box_no || 0); + const boxB = Number(b && b.box_no || 0); + if (boxA !== boxB) return boxA - boxB; + + const codeA = String(a && a.item_code || '').trim(); + const codeB = String(b && b.item_code || '').trim(); + return codeA.localeCompare(codeB); + }); + const pickingSummary = this.buildPickingSummary(pickingDetails); const pickingView = await this.buildPickingView({ pickMode,