diff --git a/app/service/systemMethods/order/recheckOrder.js b/app/service/systemMethods/order/recheckOrder.js index 4373342..0fd95fd 100644 --- a/app/service/systemMethods/order/recheckOrder.js +++ b/app/service/systemMethods/order/recheckOrder.js @@ -10,9 +10,9 @@ class RecheckOrderService extends OrderBaseService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - const _noNeedRight = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck,queryRecheckOrderSingleList'; - const _noNeedLog = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck'; - const _noNeedAuth = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck,queryRecheckOrderSingleList'; + const _noNeedRight = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck,batchQuickRecheckByWave,queryRecheckOrderSingleList'; + const _noNeedLog = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck,batchQuickRecheckByWave'; + const _noNeedAuth = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck,batchQuickRecheckByWave,queryRecheckOrderSingleList'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); } @@ -79,6 +79,7 @@ class RecheckOrderService extends OrderBaseService { match_type: matchType, list_type: 'group', waybill_no: keyword, + wave_id: orderWaveId, picker_id: pickerInfo.picker_id, picker_name: pickerInfo.picker_name, task_id: groupTaskId, @@ -2293,21 +2294,7 @@ class RecheckOrderService extends OrderBaseService { async unbindCartForTask(taskId, warehouseId, operatorUserId) { const { ctx } = this; - // 1. 清空波次拣货任务的车绑定信息 - await ctx.model.query( - `UPDATE wms_wave_pick_task - SET current_cart_id = NULL, - current_cart_code_snapshot = NULL, - update_time = NOW() - WHERE id = :taskId - AND warehouse_id = :warehouseId`, - { - replacements: { taskId, warehouseId }, - type: ctx.model.QueryTypes.UPDATE, - } - ); - - // 2. 停用拣货车绑定记录 + // 停用拣货车绑定记录 await ctx.model.query( `UPDATE wms_pick_task_cart_binding SET is_active = 0, @@ -2322,21 +2309,6 @@ class RecheckOrderService extends OrderBaseService { type: ctx.model.QueryTypes.UPDATE, } ); - - // 3. 释放拣货车(清空当前任务和绑定用户) - await ctx.model.query( - `UPDATE wms_pick_cart - SET current_task_id = NULL, - bind_user_id = NULL, - last_seen_time = NOW(), - update_time = NOW() - WHERE warehouse_id = :warehouseId - AND current_task_id = :taskId`, - { - replacements: { taskId, warehouseId }, - type: ctx.model.QueryTypes.UPDATE, - } - ); } /** @@ -2596,16 +2568,44 @@ class RecheckOrderService extends OrderBaseService { /** * 通过车号查找匹配的拣货任务行。 * 匹配优先级: - * 1. wms_wave_pick_task.current_cart_code_snapshot(任务主表车号快照) - * 2. wms_wave_pick_task_order.cart_code_snapshot(任务订单行车号快照,仅散单模式有数据) - * 3. wms_pick_task_cart_binding(车任务绑定表,所有模式均有记录,回退兜底) + * 1. wms_pick_task_cart_binding(车任务绑定表,unbind_time IS NULL,权威数据源) + * 2. wms_wave_pick_task.current_cart_code_snapshot / wms_wave_pick_task_order.cart_code_snapshot(快照回退兜底) * @param {string} cartCode 车号。 * @param {number} warehouseId 仓库ID。 * @return {Promise} 任务行,未找到返回 null。 */ const findTaskByCartCode = async (cartCode, warehouseId) => { - // 第一优先级:任务主表车号快照 + 任务订单行车号快照 - const primaryRows = await ctx.model.query( + // 第一优先级:车任务绑定表(权威活跃绑定数据源,unbind_time IS NULL 表示未解绑) + const bindingRows = await ctx.model.query( + ` + SELECT + t.id AS task_id, + t.task_no, + t.pick_mode, + t.status, + t.review_status, + t.current_cart_code_snapshot + FROM wms_pick_task_cart_binding b + INNER JOIN wms_wave_pick_task t + ON t.id = b.task_id + WHERE b.cart_code_snapshot = :cartCode + AND b.warehouse_id = :warehouseId + AND b.unbind_time IS NULL + ORDER BY b.create_time DESC, b.id DESC + LIMIT 1 + `, + { + replacements: { warehouseId, cartCode }, + type: ctx.model.QueryTypes.SELECT, + } + ); + + if (Array.isArray(bindingRows) && bindingRows.length > 0) { + return bindingRows[0]; + } + + // 第二优先级(回退兜底):任务主表 + 任务订单行快照 + const snapshotRows = await ctx.model.query( ` SELECT t.id AS task_id, @@ -2634,36 +2634,7 @@ class RecheckOrderService extends OrderBaseService { } ); - if (Array.isArray(primaryRows) && primaryRows.length > 0) { - return primaryRows[0]; - } - - // 第二优先级(回退):车任务绑定表(覆盖小团购等无 wms_wave_pick_task_order 记录的场景) - const bindingRows = await ctx.model.query( - ` - SELECT - t.id AS task_id, - t.task_no, - t.pick_mode, - t.status, - t.review_status, - t.current_cart_code_snapshot - FROM wms_pick_task_cart_binding b - INNER JOIN wms_wave_pick_task t - ON t.id = b.task_id - WHERE b.cart_code_snapshot = :cartCode - AND b.warehouse_id = :warehouseId - AND b.is_active = 1 - ORDER BY b.create_time DESC, b.id DESC - LIMIT 1 - `, - { - replacements: { warehouseId, cartCode }, - type: ctx.model.QueryTypes.SELECT, - } - ); - - return (Array.isArray(bindingRows) && bindingRows.length > 0) ? bindingRows[0] : null; + return (Array.isArray(snapshotRows) && snapshotRows.length > 0) ? snapshotRows[0] : null; }; const taskRow = await findTaskByCartCode(cartCode, warehouseId); @@ -3661,6 +3632,200 @@ class RecheckOrderService extends OrderBaseService { }; } + /** + * 规范波次 ID 入参,兼容 wave_ids、waveIds、wave_id 等写法。 + * @param {Object} data 请求体。 + * @return {number[]} 波次 ID 列表。 + */ + normalizeWaveIds(data = {}) { + const requestData = this.isPlainObject(data) ? data : {}; + const rawIds = requestData.wave_ids; + const sourceIds = []; + + if (Array.isArray(rawIds)) { + sourceIds.push(...rawIds); + } else if (typeof rawIds === 'string') { + sourceIds.push(...rawIds.split(',')); + } else if (rawIds !== undefined && rawIds !== null && rawIds !== '') { + sourceIds.push(rawIds); + } else if (requestData.waveIds !== undefined && requestData.waveIds !== null && requestData.waveIds !== '') { + const val = requestData.waveIds; + if (Array.isArray(val)) sourceIds.push(...val); + else if (typeof val === 'string') sourceIds.push(...val.split(',')); + else sourceIds.push(val); + } else if (requestData.wave_id !== undefined && requestData.wave_id !== null && requestData.wave_id !== '') { + sourceIds.push(requestData.wave_id); + } + + const normalizedIds = []; + for (const value of sourceIds) { + const normalizedId = Number(String(value).trim()); + if (Number.isFinite(normalizedId) && normalizedId > 0) { + normalizedIds.push(normalizedId); + } + } + + return Array.from(new Set(normalizedIds)); + } + + /** + * 按波次批量快捷复核:传入波次 IDs 列表,对每个波次下所有有效订单执行前置检查 + * (已分配储位、已分配快递、已同步且未被拦截),必要时自动完成拣货(含库存锁定校验与扣减、 + * 库存流水写入、拣货任务状态同步)后标记复核(含复核任务记录、任务复核状态更新、车任务解绑、 + * 操作日志)。每个订单在独立事务中执行,支持部分失败,不满足条件的订单跳过并返回原因。 + * + * @param {Object} data 请求体。 + * @param {number[]|string} [data.wave_ids] 波次 ID 列表,支持数组或以逗号分隔的字符串。 + * @param {number[]|string} [data.waveIds] 波次 ID 列表别名(驼峰写法)。 + * @param {number} [data.wave_id] 单个波次 ID。 + * @return {Promise} 处理结果,包含 success/failed 列表及计数。 + */ + async batchQuickRecheckByWave(data = {}) { + const { ctx } = this; + const warehouseId = this.getWarehouseId(); + const waveIds = this.normalizeWaveIds(data); + + if (waveIds.length === 0) { + this.ctx.throw(400, '波次ID列表不能为空'); + } + + // ── 1. 批量查询所有波次下的订单 ── + const orderModel = await this.getOrderModel('order', warehouseId); + const orderRows = await orderModel.findAll({ + where: { + wave_id: { [this.app.Sequelize.Op.in]: waveIds }, + warehouse_id: warehouseId, + }, + attributes: [ + 'id', 'delivery_order_code', 'pre_delivery_order_code', + 'storage_status', 'post_status', 'sync_status', 'status', 'intercept_status', + 'pick_status', 'recheck_status', 'wave_id', 'wave_no', + ], + raw: true, + }); + + // 按 wave_id 分组 + const waveOrderMap = new Map(); + for (const row of orderRows) { + const wid = Number(row.wave_id); + if (!waveOrderMap.has(wid)) { + waveOrderMap.set(wid, []); + } + waveOrderMap.get(wid).push(row); + } + + // ── 2. 前置条件检查:逐波次、逐订单校验 ── + const allSuccessOrders = []; + const allFailedOrders = []; + + for (const waveId of waveIds) { + const waveOrders = waveOrderMap.get(waveId) || []; + + if (waveOrders.length === 0) { + allFailedOrders.push({ + wave_id: waveId, + reason: '波次下无订单', + }); + continue; + } + + const validOrders = []; + + for (const order of waveOrders) { + const orderId = Number(order.id); + + const interceptStatus = String(order.intercept_status || '').trim(); + if (interceptStatus === 'intercepted' || interceptStatus === 'intercepted_at_warehouse') { + allFailedOrders.push({ + order_id: orderId, + wave_id: waveId, + delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(), + reason: '已拦截', + }); + continue; + } + + const storageStatus = String(order.storage_status || '').trim(); + if (storageStatus !== 'fin') { + allFailedOrders.push({ + order_id: orderId, + wave_id: waveId, + delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(), + reason: '未分配储位', + }); + continue; + } + + const postStatus = String(order.post_status || '').trim(); + if (postStatus !== 'fin') { + allFailedOrders.push({ + order_id: orderId, + wave_id: waveId, + delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(), + reason: '没有分配快递', + }); + continue; + } + + const syncStatus = String(order.sync_status || '').trim(); + if (syncStatus !== 'fin') { + allFailedOrders.push({ + order_id: orderId, + wave_id: waveId, + delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(), + reason: '没有同步', + }); + continue; + } + + validOrders.push(order); + } + + // ── 3. 逐订单在独立事务中执行拣货完成 + 复核标记 ── + for (const order of validOrders) { + const orderId = Number(order.id); + + try { + await ctx.model.transaction(async transaction => { + // 3a. 若未完成拣货,先执行拣货完成流程 + const pickStatus = String(order.pick_status || '').trim(); + if (pickStatus !== 'fin') { + await this._completePickForOrder(orderId, warehouseId, transaction); + // 更新内存中的 pick_status,避免后续 _markRecheckForOrder 因旧值误判 + order.pick_status = 'fin'; + } + + // 3b. 标记复核 + await this._markRecheckForOrder(order, warehouseId, transaction); + }); + + allSuccessOrders.push({ + order_id: orderId, + wave_id: Number(order.wave_id) || waveId, + delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(), + }); + } catch (error) { + ctx.logger.warn( + `[batchQuickRecheckByWave] 订单复核失败, orderId=${orderId}, waveId=${waveId}, error=${error.message}` + ); + allFailedOrders.push({ + order_id: orderId, + wave_id: waveId, + delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(), + reason: `复核失败: ${error.message}`, + }); + } + } + } + + return { + success: allSuccessOrders, + failed: allFailedOrders, + success_count: allSuccessOrders.length, + failed_count: allFailedOrders.length, + }; + } + /** * 完成单个订单的拣货流程(内部方法,在事务中执行)。 * 包含:更新拣货任务订单状态、订单拣货状态、拣货记录状态、扣减库存锁定数量与可用数量、写库存流水。 @@ -4294,6 +4459,31 @@ class RecheckOrderService extends OrderBaseService { `[batchQuickRecheck] 解绑车任务失败(复核已成功), taskId=${taskId}, orderId=${orderId}, error=${unbindError.message}` ); } + + // 更新 wms_wave_pick_task 任务状态:status=3(已完成),review_status=3(复核通过) + const operatorName = String(operator.name || '').trim(); + const taskStatusSetClauses = [ + 'status = 3', + 'review_status = 3', + 'review_finish_time = :now', + 'review_time = :now', + 'update_time = NOW()', + ]; + if (operatorUserId > 0) { + taskStatusSetClauses.push('review_user_id = :operatorUserId'); + taskStatusSetClauses.push('review_user_name = :operatorName'); + } + await ctx.model.query( + `UPDATE wms_wave_pick_task + SET ${taskStatusSetClauses.join(',\n ')} + WHERE id = :taskId + AND warehouse_id = :warehouseId`, + { + replacements: { taskId, warehouseId, operatorUserId, operatorName, now }, + type: ctx.model.QueryTypes.UPDATE, + transaction, + } + ); } /** @@ -4308,21 +4498,6 @@ class RecheckOrderService extends OrderBaseService { async _unbindCartForTaskInTransaction(taskId, warehouseId, operatorUserId, transaction) { const { ctx } = this; - // 清空波次拣货任务的车绑定信息 - await ctx.model.query( - `UPDATE wms_wave_pick_task - SET current_cart_id = NULL, - current_cart_code_snapshot = NULL, - update_time = NOW() - WHERE id = :taskId - AND warehouse_id = :warehouseId`, - { - replacements: { taskId, warehouseId }, - type: ctx.model.QueryTypes.UPDATE, - transaction, - } - ); - // 停用拣货车绑定记录 await ctx.model.query( `UPDATE wms_pick_task_cart_binding @@ -4339,26 +4514,6 @@ class RecheckOrderService extends OrderBaseService { transaction, } ); - - // 释放拣货车 - await ctx.model.query( - `UPDATE wms_pick_cart - SET status = 'idle', - current_task_id = NULL, - update_time = NOW() - WHERE id IN ( - SELECT cart_id - FROM wms_pick_task_cart_binding - WHERE task_id = :taskId - AND warehouse_id = :warehouseId - ) - AND warehouse_id = :warehouseId`, - { - replacements: { taskId, warehouseId }, - type: ctx.model.QueryTypes.UPDATE, - transaction, - } - ); } /** diff --git a/app/service/systemMethods/order/wave.js b/app/service/systemMethods/order/wave.js index 34b5014..e42038d 100644 --- a/app/service/systemMethods/order/wave.js +++ b/app/service/systemMethods/order/wave.js @@ -11347,7 +11347,7 @@ class WaveService extends OrderBaseService { : 0; const cartRows = await this.ctx.model.query(` - SELECT id, cart_code, current_task_id + SELECT id, cart_code FROM wms_pick_cart WHERE id = :cartId AND warehouse_id = :warehouseId @@ -11367,9 +11367,31 @@ class WaveService extends OrderBaseService { throw new Error(`拣货车不存在或已停用: ${cartId}`); } - const activeTaskId = Number(cartRow.current_task_id || 0); - if (activeTaskId > 0 && activeTaskId !== taskId) { - throw new Error(`拣货车已被任务占用: ${cartId}`); + // 通过绑定表判断车是否被其他活跃任务占用(不依赖 wms_pick_cart.current_task_id) + const bindingRows = await this.ctx.model.query(` + SELECT b.task_id + FROM wms_pick_task_cart_binding b + INNER JOIN wms_wave_pick_task t ON t.id = b.task_id + WHERE b.cart_id = :cartId + AND b.warehouse_id = :warehouseId + AND b.is_active = 1 + AND t.status IN (0, 1) + LIMIT 1 + FOR UPDATE + `, { + replacements: { + cartId, + warehouseId, + }, + type: this.ctx.model.QueryTypes.SELECT, + transaction, + }); + + const activeBindingTaskId = Number( + (Array.isArray(bindingRows) && bindingRows.length > 0 ? bindingRows[0]?.task_id : 0) + ); + if (activeBindingTaskId > 0 && activeBindingTaskId !== taskId) { + throw new Error(`拣货车已被活动任务占用: ${cartId}`); } await this.bulkInsertRows('wms_pick_task_cart_binding', [{ @@ -11385,25 +11407,6 @@ class WaveService extends OrderBaseService { unbind_time: null, }], transaction); - await this.ctx.model.query(` - UPDATE wms_pick_cart - SET - current_task_id = :taskId, - bind_user_id = :operatorId, - last_bind_time = NOW(), - last_seen_time = NOW() - WHERE id = :cartId - AND warehouse_id = :warehouseId - `, { - replacements: { - taskId, - operatorId, - cartId, - warehouseId, - }, - transaction, - }); - await this.ctx.model.query(` UPDATE wms_wave_pick_task SET @@ -12171,8 +12174,6 @@ class WaveService extends OrderBaseService { SET status = 9, wave_count = 0, - current_cart_id = NULL, - current_cart_code_snapshot = NULL, ${hasCancelledAtColumn ? 'cancelled_at = NOW(),' : ''} update_time = NOW() WHERE id = :taskId @@ -12204,23 +12205,6 @@ class WaveService extends OrderBaseService { transaction, }); - await this.ctx.model.query(` - UPDATE wms_pick_cart - SET - current_task_id = NULL, - bind_user_id = NULL, - last_seen_time = NOW(), - update_time = NOW() - WHERE warehouse_id = :warehouseId - AND current_task_id = :taskId - `, { - replacements: { - taskId, - warehouseId, - }, - transaction, - }); - await this.bulkInsertRows('wms_wave_pick_action_log', [{ task_id: taskId, warehouse_id: warehouseId, diff --git a/app/service/systems/order_auto_outbound.js b/app/service/systems/order_auto_outbound.js index 0b1dd68..6647379 100644 --- a/app/service/systems/order_auto_outbound.js +++ b/app/service/systems/order_auto_outbound.js @@ -55,21 +55,26 @@ class OrderAutoOutboundService extends MainService { raw: true, }); - for (const contract of contracts) { - result.push({ - storeId: store.id, - warehouseId: contract.warehouse_id, - rules: autoOutboundRules, - }); - } + // 始终将 store.id 自身的仓库加入扫描(store.id 即 warehouse_id) + const scannedWarehouseIds = new Set(); + result.push({ + storeId: store.id, + warehouseId: store.id, + rules: autoOutboundRules, + }); + scannedWarehouseIds.add(store.id); - // 兜底:仓库自身没有 StoreWarehouse 合同关系时,直接用 store.id 作为 warehouseId - if (contracts.length === 0) { - result.push({ - storeId: store.id, - warehouseId: store.id, - rules: autoOutboundRules, - }); + // 追加外部合同中的仓库(去重) + for (const contract of contracts) { + const contractWarehouseId = contract.warehouse_id; + if (!scannedWarehouseIds.has(contractWarehouseId)) { + result.push({ + storeId: store.id, + warehouseId: contractWarehouseId, + rules: autoOutboundRules, + }); + scannedWarehouseIds.add(contractWarehouseId); + } } } diff --git a/app/service/systems/order_packing.js b/app/service/systems/order_packing.js index 61cc6df..1bc2220 100644 --- a/app/service/systems/order_packing.js +++ b/app/service/systems/order_packing.js @@ -360,8 +360,14 @@ class OrderPackingService extends Service { const list = rows.map(row => { const plain = row.get({ plain: true }); const rawVideos = plain.videos || []; + const { app: appCtx } = this; return { ...plain, + start_time: plain.start_time ? appCtx.formatDate(plain.start_time) : null, + end_time: plain.end_time ? appCtx.formatDate(plain.end_time) : null, + create_time: plain.create_time ? appCtx.formatDate(plain.create_time) : null, + update_time: plain.update_time ? appCtx.formatDate(plain.update_time) : null, + deleted_at: plain.deleted_at ? appCtx.formatDate(plain.deleted_at) : null, workbench_name: plain.workbench?.name || null, workbench_type: plain.workbench?.type || null, workbench_barcode: plain.workbench?.barcode || null, @@ -465,8 +471,14 @@ class OrderPackingService extends Service { const plain = record.get({ plain: true }); const recordingComputerId = await this._getRecordingComputerId(warehouseId); const rawVideos = plain.videos || []; + const { app: appCtx } = this; const data = { ...plain, + start_time: plain.start_time ? appCtx.formatDate(plain.start_time) : null, + end_time: plain.end_time ? appCtx.formatDate(plain.end_time) : null, + create_time: plain.create_time ? appCtx.formatDate(plain.create_time) : null, + update_time: plain.update_time ? appCtx.formatDate(plain.update_time) : null, + deleted_at: plain.deleted_at ? appCtx.formatDate(plain.deleted_at) : null, workbench_name: plain.workbench?.name || null, workbench_type: plain.workbench?.type || null, workbench_barcode: plain.workbench?.barcode || null, @@ -549,7 +561,7 @@ class OrderPackingService extends Service { message: '结束时间设置成功', data: { id: record.id, - end_time: updates.end_time, + end_time: this.app.formatDate(updates.end_time), status: updates.status, }, }; diff --git a/app/service/systems/pick.js b/app/service/systems/pick.js index b87d322..832f995 100644 --- a/app/service/systems/pick.js +++ b/app/service/systems/pick.js @@ -2376,11 +2376,44 @@ class PickSystemService extends Service { const targetCartId = Number(targetCartRow.cart_id || 0); const targetCartCode = String(targetCartRow.cart_code || '').trim(); - const previousCartId = Number(taskRow && taskRow.current_cart_id || 0); - const bindType = previousCartId > 0 && previousCartId !== targetCartId ? 2 : 1; const transaction = await ctx.model.transaction(); try { + // 检查任务是否已有活跃的车绑定(正常绑定流程,不支持换车,需先解绑) + const taskActiveBindingRows = await ctx.model.query(` + SELECT + b.id, + b.cart_id, + t.current_cart_code_snapshot AS cart_code + FROM wms_pick_task_cart_binding b + INNER JOIN wms_wave_pick_task t + ON t.id = b.task_id + WHERE b.task_id = :taskId + AND b.warehouse_id = :warehouseId + AND b.is_active = 1 + ORDER BY b.id DESC + LIMIT 1 + `, { + replacements: { + taskId, + warehouseId, + }, + type: ctx.model.QueryTypes.SELECT, + transaction, + }); + + const taskActiveBinding = Array.isArray(taskActiveBindingRows) && taskActiveBindingRows.length > 0 + ? taskActiveBindingRows[0] + : null; + if (taskActiveBinding) { + throw this.createBusinessError('任务已绑定拣货车,请先解绑后再重新绑定', 409, { + task_id: taskId, + cart_id: Number(taskActiveBinding.cart_id || 0), + cart_code: String(taskActiveBinding.cart_code || '').trim() || null, + }); + } + + // 检查车是否已有活跃的任务绑定 const cartActiveBindingRows = await ctx.model.query(` SELECT b.id, @@ -2404,58 +2437,29 @@ class PickSystemService extends Service { transaction, }); - const activeBinding = Array.isArray(cartActiveBindingRows) && cartActiveBindingRows.length > 0 + const cartActiveBinding = Array.isArray(cartActiveBindingRows) && cartActiveBindingRows.length > 0 ? cartActiveBindingRows[0] : null; - const bindingTaskId = Number(activeBinding && activeBinding.task_id || 0); - const bindingTaskStatus = Number(activeBinding && activeBinding.task_status || 0); - if (bindingTaskId > 0 && bindingTaskId !== taskId && [ 0, 1 ].includes(bindingTaskStatus)) { - throw this.createBusinessError('该拣货车已绑定其他活动任务,无法重复绑定', 409, { - task_id: bindingTaskId, - task_no: String(activeBinding && activeBinding.task_no || '').trim() || null, - cart_id: targetCartId, - cart_code: targetCartCode, - }); + if (cartActiveBinding) { + const boundTaskId = Number(cartActiveBinding.task_id || 0); + const boundTaskStatus = Number(cartActiveBinding.task_status || 0); + if (boundTaskId === taskId) { + throw this.createBusinessError('该任务已绑定此拣货车,无需重复绑定', 409, { + task_id: taskId, + cart_id: targetCartId, + cart_code: targetCartCode, + }); + } + if ([ 0, 1 ].includes(boundTaskStatus)) { + throw this.createBusinessError('该拣货车已绑定其他活动任务,请先解绑后再重新绑定', 409, { + task_id: boundTaskId, + task_no: String(cartActiveBinding.task_no || '').trim() || null, + cart_id: targetCartId, + cart_code: targetCartCode, + }); + } } - if (previousCartId > 0 && previousCartId !== targetCartId) { - await ctx.model.query(` - UPDATE wms_pick_cart - SET current_task_id = NULL, - bind_user_id = NULL, - update_time = NOW() - WHERE id = :previousCartId - AND warehouse_id = :warehouseId - AND current_task_id = :taskId - `, { - replacements: { - previousCartId, - warehouseId, - taskId, - }, - transaction, - }); - } - - await ctx.model.query(` - UPDATE wms_pick_task_cart_binding - SET is_active = 0, - unbind_user_id = :operatorId, - unbind_time = NOW(), - update_time = NOW() - WHERE warehouse_id = :warehouseId - AND is_active = 1 - AND (task_id = :taskId OR cart_id = :cartId) - `, { - replacements: { - operatorId, - warehouseId, - taskId, - cartId: targetCartId, - }, - transaction, - }); - await ctx.model.query(` INSERT INTO wms_pick_task_cart_binding ( task_id, @@ -2474,7 +2478,7 @@ class PickSystemService extends Service { :cartCode, :warehouseId, :operatorId, - :bindType, + 1, 1, NOW(), NOW(), @@ -2487,7 +2491,6 @@ class PickSystemService extends Service { cartCode: targetCartCode, warehouseId, operatorId, - bindType, }, transaction, }); @@ -2509,25 +2512,6 @@ class PickSystemService extends Service { transaction, }); - await ctx.model.query(` - UPDATE wms_pick_cart - SET current_task_id = :taskId, - bind_user_id = :operatorId, - last_bind_time = NOW(), - last_seen_time = NOW(), - update_time = NOW() - WHERE id = :cartId - AND warehouse_id = :warehouseId - `, { - replacements: { - taskId, - operatorId, - cartId: targetCartId, - warehouseId, - }, - transaction, - }); - await transaction.commit(); const latestCartRow = await this.getPickCartById(targetCartId, warehouseId); @@ -2654,8 +2638,24 @@ class PickSystemService extends Service { throw this.createBusinessError('cart_code 必填', 400); } await this.assertPickCartCodeUnique(nextCartCode, warehouseId, cartId); - if (nextStatus === 0 && Number(cartRow.current_task_id || 0) > 0) { - throw this.createBusinessError('拣货车已绑定任务,无法停用', 400); + if (nextStatus === 0) { + // 通过绑定表检查车是否被活动任务占用 + const activeBindingRows = await ctx.model.query(` + SELECT b.id + FROM wms_pick_task_cart_binding b + INNER JOIN wms_wave_pick_task t ON t.id = b.task_id + WHERE b.cart_id = :cartId + AND b.warehouse_id = :warehouseId + AND b.is_active = 1 + AND t.status IN (0, 1) + LIMIT 1 + `, { + replacements: { cartId, warehouseId }, + type: ctx.model.QueryTypes.SELECT, + }); + if (Array.isArray(activeBindingRows) && activeBindingRows.length > 0) { + throw this.createBusinessError('拣货车已绑定活动任务,无法停用', 400); + } } await ctx.model.query(`