diff --git a/app/service/systemMethods/order/pendingOrder.js b/app/service/systemMethods/order/pendingOrder.js index ea2c0d4..790d9dc 100644 --- a/app/service/systemMethods/order/pendingOrder.js +++ b/app/service/systemMethods/order/pendingOrder.js @@ -2816,9 +2816,22 @@ class PendingOrderService extends OrderBaseService { post_status: 'none', }; + const platformName = String(platform.name || '').trim(); + + // 更新前查询候选订单,筛出平台实际发生变化的订单,用于逐单写入订单日志 + const candidateOrders = await model.findAll({ + where, + attributes: [ 'id', 'sys_platform_code', 'sys_platform_name' ], + raw: true, + }); + + const changedOrders = Array.isArray(candidateOrders) + ? candidateOrders.filter(order => String(order.sys_platform_code || '').trim() !== String(platform.code || '').trim()) + : []; + const [ affectedRows ] = await model.update({ sys_platform_code: platform.code, - sys_platform_name: String(platform.name || '').trim(), + sys_platform_name: platformName, updated_at: new Date(), }, { where }); @@ -2835,9 +2848,9 @@ class PendingOrderService extends OrderBaseService { warehouseId: logWarehouseId, orderIds, sys_platform_code: platform.code, - sys_platform_name: String(platform.name || '').trim(), + sys_platform_name: platformName, updated_count: count, - message: `批量修改订单平台:订单ID [${orderIds.join(', ')}],平台 ${platform.code}(${String(platform.name || '').trim()}),共更新 ${count} 条`, + message: `批量修改订单平台:订单ID [${orderIds.join(', ')}],平台 ${platform.code}(${platformName}),共更新 ${count} 条`, }, beforeChanges: null, }); @@ -2845,6 +2858,39 @@ class PendingOrderService extends OrderBaseService { this.ctx.logger.warn('[PendingOrderService.updateOrderPlatform] 写入操作日志失败,不影响业务', logErr); } + // 为实际发生平台变化的订单逐单写入订单日志(订单详情页可见) + try { + const opLogService = this.ctx.service && this.ctx.service.systems && this.ctx.service.systems.operationLog; + if (opLogService && typeof opLogService.createOperationLogs === 'function' && changedOrders.length > 0) { + const logPayloads = changedOrders + .map(order => { + const orderId = Number(order.id); + if (!Number.isInteger(orderId) || orderId <= 0) { + return null; + } + const originalName = String(order.sys_platform_name || order.sys_platform_code || '未知').trim(); + return { + businessType: 'order', + businessId: String(orderId), + operationCode: 'ORDER_UPDATE_PLATFORM', + operator, + extras: { + warehouseId: logWarehouseId, + message: `修改订单平台:${originalName} → ${platform.code}(${platformName})`, + externalLogType: 'NONE', + }, + }; + }) + .filter(Boolean); + + if (logPayloads.length > 0) { + await opLogService.createOperationLogs(logPayloads); + } + } + } catch (logErr) { + this.ctx.logger.warn('[PendingOrderService.updateOrderPlatform] 写入订单日志失败,不影响业务', logErr); + } + return this.success('ok', { updated_count: count, sys_platform_code: platform.code, @@ -3150,6 +3196,8 @@ class PendingOrderService extends OrderBaseService { * 2. 若原订单已分配储位(storage_status='fin'),先清除已分配库存; * 3. 取消原订单(step->9, status->'cancel')并记录"克隆"日志; * 4. 以原订单业务数据创建新订单,所有流程状态字段重置为初始落库状态; + * 同步状态继承原订单:原订单已同步(sync_status=fin)则新订单直接置 fin 避免重复回传, + * 否则重置为 padding 重新走同步; * 5. 对新订单记录"克隆创建"日志。 * * @param {Object} data 请求体。 @@ -3181,14 +3229,20 @@ class PendingOrderService extends OrderBaseService { throw new Error('订单当前状态不允许克隆'); } - // 2. 若已分配储位,先清除库存 + // 2. 若已分配储位,先清除库存。 + // 已同步订单同样允许克隆;库存释放失败不阻断克隆(与 cancelOrder 降级策略一致), + // 原订单残留占用保留在原订单名下,克隆新订单不重新占用库存 + // (新订单 storage_status 重置为 none,创建过程不触发储位分配与库存锁定)。 if (String(original.storage_status || '').trim() === 'fin') { try { await this.service.systems.orderStorageAllocation.cancelAllocateStorage({ order_ids: [ orderId ], }); } catch (storageErr) { - throw new Error(`清除已分配库存失败:${storageErr.message}`); + this.ctx.logger.warn( + `[PendingOrderService.cloneOrder] 清除已分配库存失败,不影响克隆,orderId=${orderId}`, + storageErr + ); } } @@ -3271,8 +3325,11 @@ class PendingOrderService extends OrderBaseService { }; // 业务字段白名单(从原订单复制) + // 注意:不含 delivery_order_code —— 该字段受 (delivery_order_code, store_id, warehouse_id) + // 唯一索引约束,且原订单取消后仍留在 current 表占用索引,复制原单号会触发唯一键冲突 + // (Sequelize UniqueConstraintError,对外表现为 "Validation error")。新单号见下方生成逻辑。 const COPY_FIELDS = [ - 'delivery_order_code', 'pre_delivery_order_code', 'pre_delivery_order_id', + 'pre_delivery_order_code', 'pre_delivery_order_id', 'order_type', 'warehouse_code', 'warehouse_id', 'store_id', 'from_key', 'source_platform_code', 'source_platform_name', 'source_order_codes', 'sys_platform_code', 'sys_platform_name', @@ -3289,11 +3346,21 @@ class PendingOrderService extends OrderBaseService { ]; const newOrderData = { ...RESET_FIELDS }; + // 克隆单生成全新发货单号(与手工单 createOrder 相同的生成规则) + newOrderData.delivery_order_code = `SYS${Date.now()}${Math.floor(Math.random() * 9000) + 1000}`; + // 同步状态继承:原订单已同步(sync_status=fin)则新订单直接置 fin,避免重复回传平台; + // 未同步/同步失败(padding/error)重置为 padding 重新走同步流程 + newOrderData.sync_status = String(original.sync_status || '').trim() === 'fin' ? 'fin' : 'padding'; for (const field of COPY_FIELDS) { if (original[field] !== undefined) { newOrderData[field] = original[field]; } } + // 克隆追溯链:原订单无前置单号时,把原单号写入新订单 pre_delivery_order_code + const originalDeliveryCode = String(original.delivery_order_code || '').trim(); + if (originalDeliveryCode && !String(newOrderData.pre_delivery_order_code || '').trim()) { + newOrderData.pre_delivery_order_code = originalDeliveryCode; + } // 克隆单同样由仓库序列表统一发号;发号失败直接抛错,不回退分表自增, // 避免分表自增与序列表发号区间重叠产生冲突 id