diff --git a/app/service/inbox/functions.js b/app/service/inbox/functions.js index 7bc7509..64ee1cc 100644 --- a/app/service/inbox/functions.js +++ b/app/service/inbox/functions.js @@ -969,6 +969,23 @@ class InboxFunctionsService extends Service { const interceptOrderIds = []; const kickOutOrderIds = []; + // 批量查询散单的称重状态(wms_order_express.weighing_weight) + let weighingMap = {}; + const scatterOrderIds = orders + .filter(o => o.wave_id > 0 && waveMap[o.wave_id] && waveMap[o.wave_id].wave_type === 2) + .map(o => o.id); + if (scatterOrderIds.length > 0) { + const expressRows = await ctx.model.OrderExpress.findAll({ + attributes: [ 'order_id', 'weighing_weight' ], + where: { order_id: { [ctx.app.Sequelize.Op.in]: scatterOrderIds }, warehouse_id: warehouseId }, + raw: true, + }); + weighingMap = Object.fromEntries( + (Array.isArray(expressRows) ? expressRows : []) + .map(r => [ r.order_id, Number(r.weighing_weight || 0) ]) + ); + } + for (const order of orders) { const wave = waveMap[order.wave_id]; const orderId = order.id; @@ -980,8 +997,9 @@ class InboxFunctionsService extends Service { // 团购波次:未复核 → 拦截 needIntercept = order.inspection_status !== 'fin'; } else if (wave.wave_type === 2) { - // 散单波次:未称重视同可拦截(订单表无称重状态,默认拦截) - needIntercept = true; + // 散单波次:未称重 → 拦截(weighing_weight = 0 表示未称重) + const weight = weighingMap[orderId] ?? 0; + needIntercept = weight <= 0; } } else { // 无波次订单:直接拦截 @@ -1311,11 +1329,30 @@ class InboxFunctionsService extends Service { waveMap = Object.fromEntries(waves.map(w => [ w.wave_id, w ])); } const interceptOrderIds = []; + // 批量查询散单的称重状态 + const scatterIds = orders + .filter(o => o.wave_id > 0 && waveMap[o.wave_id] && waveMap[o.wave_id].wave_type === 2) + .map(o => o.id); + const wMap = {}; + if (scatterIds.length > 0) { + const er = await ctx.model.OrderExpress.findAll({ + attributes: [ 'order_id', 'weighing_weight' ], + where: { order_id: { [ctx.app.Sequelize.Op.in]: scatterIds }, warehouse_id: warehouseId }, + raw: true, + }); + for (const r of (Array.isArray(er) ? er : [])) { + wMap[r.order_id] = Number(r.weighing_weight || 0); + } + } for (const order of orders) { const wave = waveMap[order.wave_id]; let needIntercept = false; if (order.wave_id > 0 && wave) { - needIntercept = wave.wave_type === 1 ? order.inspection_status !== 'fin' : true; + if (wave.wave_type === 1) { + needIntercept = order.inspection_status !== 'fin'; + } else { + needIntercept = (wMap[order.id] ?? 0) <= 0; + } } else { needIntercept = true; }