diff --git a/app/service/systems/order_b2b.js b/app/service/systems/order_b2b.js index 4c782b2..0c30060 100644 --- a/app/service/systems/order_b2b.js +++ b/app/service/systems/order_b2b.js @@ -112,21 +112,42 @@ class OrderB2bService extends Service { } ); - // 写入 B2B 作业明细(uk_order_id 唯一,已存在时跳过不覆盖) + // 写入 B2B 作业明细(uk_order_id 唯一): + // 首次转换创建新行;二次转换(存在历史软删除行)恢复同一行并重置作业字段 const b2bModel = ctx.model.OrderB2b; for (const row of convertedRows) { - await b2bModel.findOrCreate({ - where: { order_id: Number(row.id) }, - defaults: { - order_id: Number(row.id), - warehouse_id: normalizedWarehouseId, - store_id: Number(row.store_id || 0) > 0 ? Number(row.store_id) : null, - delivery_order_code: String(row.delivery_order_code || '').trim(), - created_at: now, - updated_at: now, - }, + const orderId = Number(row.id); + const baseFields = { + warehouse_id: normalizedWarehouseId, + store_id: Number(row.store_id || 0) > 0 ? Number(row.store_id) : null, + delivery_order_code: String(row.delivery_order_code || '').trim(), + updated_at: now, + }; + const existing = await b2bModel.findOne({ + where: { order_id: orderId }, + paranoid: false, transaction, }); + if (existing) { + // 恢复历史行并重置作业字段(取消 B2B 后的旧作业数据不再有效) + await existing.update({ + deleted_at: null, + total_box_count: 0, + pickup_plate_number: null, + prep_remark: null, + prep_duration_seconds: 0, + is_picked_up: 'N', + picked_up_at: null, + is_print: 'N', + ...baseFields, + }, { transaction, paranoid: false }); + } else { + await b2bModel.create({ + order_id: orderId, + ...baseFields, + created_at: now, + }, { transaction }); + } } }