feat: COMPLETED 入库单绑定收货单与防超扣台账链路

- 入库单 COMPLETED 状态放开绑定收货单,事务内按 SKU 同步收货单明细入库进度(stored_quantity/storage_status)

- wms_entry_order_receiving 新增 allocated_quantity 台账列(迁移已在生产执行),多收货单绑定按剩余可分配量封顶防超扣

- 统一锁序(入库单主行→绑定行→收货明细行)修复并发绑定死锁;解绑/作废按台账回滚,不再整体清零共享收货单

- 同步 entry_items.received_quantity 口径,与绑定收货单 stored_quantity 可对账

- 同步 methods 文档与变更记录、AI_METHOD_ROUTING 方法清单
This commit is contained in:
liufumingren 2026-09-07 22:16:54 +08:00
parent 6a1abbe00c
commit 86222a24eb
8 changed files with 1631 additions and 151 deletions

View File

@ -208,10 +208,10 @@ rg "class .*Service|module.exports" app/service/qimenMethods
- 临时清单输出:temp/tmp-service-method-inventory.md
<!-- SERVICE_METHOD_INVENTORY:BEGIN -->
自动生成时间: 2026-09-06T08:24:13.502Z
自动生成时间: 2026-09-07T13:11:46.995Z
扫描范围: app/service/**/*.js
文件数: 203
文件数: 204
- app/service/api.js (1)
- callMethod
@ -457,8 +457,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
- addOrder, getLineCount, received, success, fail, findByOrderCode, findByStatus, getStatsByWarehouse, updateSyncStatus, updateOrderStatus, calculateReceivedQuantities, batchUpdateReceived, getOrderProgress, tryCreateEntryOrder, addItems, reviewEntry
- app/service/systems/excel.js (26)
- getContentType, sanitizeSheetName, normalizeHeaders, normalizeColumns, prepareSheetData, hasEmbeddedImages, buildWorksheet, buildWorkbook, buildExcelJsWorkbook, inferImageExtension, resolveImageSource, mergeCellStyle, applyStyledRows, applyTextColumnsToSheetJs, applyTextColumnsToExcelJs, addEmbeddedImages, generateBuffer, writeFile, writeAtomicBufferFile, sanitizeFilename, buildUploadKey, generateAndUpload, sendFile, parseBuffer, parseFile, workbookToJSON
- app/service/systems/express_platform.js (16)
- getOrderLogOperator, buildOrderExpressVerPatch, buildExpressPlatformTraceId, OrderExpress, cleanupFailedWaybillOrders, buildFailedOrderCleanupList, polyapi, cainiao, parsePlatformPrintData, stringifyPlatformPrintData, buildWaybillOrderMetaMap, buildWaybillSettlementRelationMap, lockAndDeductWaybillSettlement, persistWaybillSuccessUpdates, normalizePddExtData, pdd
- app/service/systems/express_platform.js (17)
- getOrderLogOperator, buildOrderExpressVerPatch, buildExpressPlatformTraceId, OrderExpress, cleanupFailedWaybillOrders, warnExpressCodeMismatch, buildFailedOrderCleanupList, polyapi, cainiao, parsePlatformPrintData, stringifyPlatformPrintData, buildWaybillOrderMetaMap, buildWaybillSettlementRelationMap, lockAndDeductWaybillSettlement, persistWaybillSuccessUpdates, normalizePddExtData, pdd
- app/service/systems/express_policy.js (10)
- getWarehousePolicyCacheKey, getWarehousePolicyCacheTTL, clearWarehousePolicyCache, fetchWarehousePoliciesFromDB, getWarehousePolicies, _matchAnyToken, _matchAnyIntersect, _matchValueInArray, _isStoreOnlyPolicy, matchPolicy
- app/service/systems/express.js (72)
@ -471,6 +471,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
- getItems, _addSingleItem, _bindReceivingDetail, addItem, removeItem, commit, notifyEntryOrderCompleted, _queryCompletedEntryItems, _buildCompletedItemLines, _sendOpenApiCallback, operationLog, qimenEntrySync, _syncReceivingStorageStatus, _applyReceivingStockOccupancy
- app/service/systems/inbox/group.js (10)
- list, quickList, members, disable, update, reset, validateExpressInterfaces, validateSystemExpressCode, findGroupsByExpress, findStoreAfterSalesGroups
- app/service/systems/intercept_auto_confirm.js (10)
- withPatchedCtxUser, listCurrentWarehouseIds, NOW, buildCandidateWhereSql, Date, matchesAutoConfirmCriteria, resolveCurrentTableName, scanCandidateOrderIds, confirmInterceptForOrderIds, runAutoConfirm
- app/service/systems/license_plate.js (7)
- getTencentCloudConfig, getTencentCloudRegion, normalizeBase64Image, buildTencentCloudRequest, sendTencentCloudRequest, recognizeLicensePlate, formatLicensePlateResult
- app/service/systems/location_space.js (16)
@ -529,8 +531,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
- notifyRefreshInfo, list, update, setRecording, cancelRecording, delete
- app/service/systems/qimen_query.js (3)
- qimenClient, send, sendRequest
- app/service/systems/receiving_entry_match.js (12)
- matchAfterEntryCompleted, _bindEntryOrderReceiving, bindEntryOrderReceiving, _getRecentReceivingOrders, _findReceivingByRemark, _compareDetails, _sendCallback, _sendQimenCallback, _sendOpenApiCallback, _markReceivingPartialStorage, _commitBinding, unbindEntryOrderReceiving
- app/service/systems/receiving_entry_match.js (27)
- matchAfterEntryCompleted, _bindEntryOrderReceiving, bindEntryOrderReceiving, _bindReceivingsWithStorageSync, _bindOneReceivingAndSyncStorage, max, _syncReceivingStorageByEntryItems, _parseLedgerMap, _serializeLedgerMap, min, _buildLegacyBaselineLedger, _bindingAllocationByStock, _recalcReceivingStorageStatus, _reconcileEntryReceivedQuantity, recordLedgerAllocation, setLedgerAllocation, rollbackEntryOrderBindings, _rollbackOneBindingStorage, _getRecentReceivingOrders, _findReceivingByRemark, _compareDetails, _sendCallback, _sendQimenCallback, _sendOpenApiCallback, _markReceivingPartialStorage, _commitBinding, unbindEntryOrderReceiving
- app/service/systems/report.js (16)
- getDefinition, parseFieldsField, definitionToView, resolveTypeEntry, resolveQuerier, listRegisteredTypes, validateTypeFields, resolveOrderedFields, buildFilename, buildWorkbookSheets, generate, generateBuffer, saveDefinition, findDefinitionById, listDefinitions, deleteDefinition
- app/service/systems/report/queries/index.js (0)
@ -609,8 +611,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods
- closeFinishedWaves
- app/service/systems/waybill.js (5)
- toOrder, list, detail, export, buildWaybillExportFile
- app/service/systems/workbench.js (52)
- list, detail, create, update, delete, bindCamera, business, _countWaveOrders, _countWaveOrdersCached, _getWaveOrderIds, Set, _buildPackChangeSummary, _writePackOperationLog, _updateOrderPackStatus, _packOrder, resolvePackTaskEndTime, _finishPack, _sendWeight, _writeWeighOpLog, _queryOrder, getWorkbenchBindClientCacheKey, getWorkbenchBindCodeCacheKey, getWorkbenchTokenCacheKey, generateRandomChars, generateWorkbenchToken, generateWorkbenchLoginCode, normalizeWorkbenchBindCode, generateUniqueWorkbenchLoginCode, createUniqueWorkbenchClientCode, createUniqueWorkbenchBindCode, buildWorkbenchBindState, getWorkbenchBindRemainingSeconds, setWorkbenchBindState, createWorkbenchBindSession, refreshWorkbenchBindCode, formatWorkbenchBindData, waitForWorkbenchBindComplete, getWorkbenchBindCode, formatWorkbenchTokenInfo, bindWorkbench, getWorkbenchInfoByToken, loginWorkbenchByCode, resetLoginCode, resolveWorkbenchContext, resolveWorkbenchByToken, normalizeWorkbenchMemberIds, removeWorkbenchMember, bindWorkbenchMember, packOrderByToken, finishPackByToken, sendWeightByToken, queryOrderByToken
- app/service/systems/workbench.js (61)
- list, detail, create, update, delete, bindCamera, business, _countWaveOrders, _countWaveOrdersCached, SUM, _sumWaveItemsTotal, _sumWaveItemsTotalCached, _getWaveOrderIds, Set, _buildPackChangeSummary, _writePackOperationLog, _updateOrderPackStatus, _packOrder, resolvePackTaskEndTime, _finishPack, _sendWeight, _writeWeighOpLog, _queryOrder, getWorkbenchBindClientCacheKey, getWorkbenchBindCodeCacheKey, getWorkbenchTokenCacheKey, generateRandomChars, generateWorkbenchToken, generateWorkbenchLoginCode, normalizeWorkbenchBindCode, generateUniqueWorkbenchLoginCode, createUniqueWorkbenchClientCode, createUniqueWorkbenchBindCode, buildWorkbenchBindState, getWorkbenchBindRemainingSeconds, setWorkbenchBindState, createWorkbenchBindSession, refreshWorkbenchBindCode, formatWorkbenchBindData, waitForWorkbenchBindComplete, getWorkbenchBindCode, formatWorkbenchTokenInfo, listWorkbenchMembers, listCurrentPackTasks, buildCurrentPackingInfo, invalidateWorkbenchTokenCacheByWorkbenchId, buildWorkbenchTokenInfo, bindWorkbench, getWorkbenchInfoByToken, loginWorkbenchByCode, resetLoginCode, clearExpiredWorkbenchTokens, resolveWorkbenchContext, resolveWorkbenchByToken, packOrderByToken, finishPackByToken, sendWeightByToken, queryOrderByToken, normalizeWorkbenchMemberIds, removeWorkbenchMember, bindWorkbenchMember
- app/service/warehouse.js (7)
- resolveWarehouseMethod, getWarehouseMethodService, dispatchWarehouseMethod, validateWarehouseParams, parseJsonBody, normalizeSignFields, processRequest
- app/service/warehouseMethods/inbox.js (2)
@ -634,3 +636,5 @@ rg "class .*Service|module.exports" app/service/qimenMethods

View File

@ -1,7 +1,7 @@
'use strict';
module.exports = app => {
const { BIGINT, DATE } = app.Sequelize;
const { BIGINT, DATE, JSON: JSON_TYPE } = app.Sequelize;
const EntryOrderReceiving = app.model.define('wms_entry_order_receiving', {
id: {
@ -20,6 +20,12 @@ module.exports = app => {
allowNull: false,
comment: '收货单ID,关联 wms_receiving.id',
},
allocated_quantity: {
type: JSON_TYPE,
allowNull: true,
defaultValue: null,
comment: '数量台账:收货明细ID→已分配数量(JSON对象,如 {"123":8});null 表示旧数据未初始化',
},
created_at: {
type: DATE,
allowNull: false,

View File

@ -1177,7 +1177,7 @@ class InboundDirectLogService extends Service {
}
// 回写收货单和收货明细的入库状态(绑定模式:按 receiving_detail_id 优先扣减)
await this._syncReceivingStorageStatus({ entryItemIds, transaction });
await this._syncReceivingStorageStatus({ entryItemIds, transaction, entryOrderId: eo.id });
// 非绑定模式剩余导入量:按 stock_id 匹配绑定收货单明细占用(绑定模式优先,剩余兜底)
await this._applyReceivingStockOccupancy({ entryOrder: eo, directLogs, transaction });
@ -1729,9 +1729,10 @@ class InboundDirectLogService extends Service {
* @param {Object} params 参数
* @param {number[]} params.entryItemIds 当前入库单的所有明细 ID 列表
* @param {Object} params.transaction Sequelize 事务对象
* @param {number} [params.entryOrderId] 入库单 ID(用于同步数量台账)
* @return {Promise<void>}
*/
async _syncReceivingStorageStatus({ entryItemIds, transaction }) {
async _syncReceivingStorageStatus({ entryItemIds, transaction, entryOrderId = null }) {
const { ctx, app } = this;
// 查询所有 committed 状态的绑定记录(从 InboundDirectLog 中筛选有 receiving_detail_id 的记录)
@ -1775,6 +1776,7 @@ class InboundDirectLogService extends Service {
// 逐条计算并更新收货明细
const receivingIdSet = new Set();
const ledgerQuantityMap = new Map();
for (const detail of details) {
const storedQuantity = detailQuantityMap.get(detail.id) || 0;
const actualQuantity = Number(detail.actual_quantity) || 0;
@ -1795,6 +1797,12 @@ class InboundDirectLogService extends Service {
transaction,
}
);
// 台账覆盖条目:绑定模式对收货明细为直接覆写语义
ledgerQuantityMap.set(detail.id, {
receivingId: Number(detail.receiving_id),
quantity: storedQuantity,
});
}
// 按收货单汇总,更新 wms_receiving.storage_status
@ -1847,6 +1855,15 @@ class InboundDirectLogService extends Service {
}
);
}
// 同步数量台账:绑定模式按 committed 汇总量覆写对应明细条目(保持台账与 stored_quantity 一致)
if (entryOrderId && ledgerQuantityMap.size > 0) {
await ctx.service.systems.receivingEntryMatch.setLedgerAllocation({
entryOrderId,
detailQuantityMap: ledgerQuantityMap,
transaction,
});
}
}
/**
@ -1907,6 +1924,7 @@ class InboundDirectLogService extends Service {
receivingDetailRows: boundDetails,
stockInboundQtyMap,
transaction,
entryOrderId: entryOrder.id,
});
ctx.logger.info(

File diff suppressed because it is too large Load Diff

View File

@ -1119,39 +1119,23 @@ class EntryService extends Service {
/**
* 回退入库单关联收货单的入库状态(入库单作废时调用)。
* 失败不阻塞主流程,仅打印日志。
* 按绑定行数量台账逐单回收本入库单在收货单上的占用(不影响其他入库单的占用),
* 并清空台账;失败不阻塞主流程,仅打印日志。
* @param {number} entryOrderId 入库单ID
* @return {Promise<void>}
*/
async _rollbackReceivingStorageStatus(entryOrderId) {
const { ctx } = this;
try {
// 1. 查询关联的收货单ID列表
const bindings = await ctx.model.EntryOrderReceiving.findAll({
where: { entry_order_id: entryOrderId, deleted_at: null },
attributes: [ 'receiving_id' ],
raw: true,
const result = await ctx.service.systems.receivingEntryMatch.rollbackEntryOrderBindings({
entryOrderId,
receivingId: null,
softDeleteBinding: false,
});
const receivingIds = (bindings || [ ]).map(b => b.receiving_id).filter(Boolean);
if (receivingIds.length === 0) {
return;
}
// 2. 回退收货单主表 storage_status → 'none'
await ctx.model.Receiving.update(
{ storage_status: 'none', updated_at: new Date() },
{ where: { id: { [ctx.app.Sequelize.Op.in]: receivingIds } } }
);
// 3. 回退收货单明细 storage_status → 'none', stored_quantity → 0
await ctx.model.ReceivingDetail.update(
{ storage_status: 'none', stored_quantity: 0, updated_at: new Date() },
{ where: { receiving_id: { [ctx.app.Sequelize.Op.in]: receivingIds } } }
);
ctx.logger.info(
`[storage.entry.cancel] 入库单 ${entryOrderId} 作废,已回退收货单入库状态,receivingIds=[${receivingIds.join(',')}]`
`[storage.entry.cancel] 入库单 ${entryOrderId} 作废,已按台账回退收货单入库状态,` +
`rolledBack=${JSON.stringify((result && result.rolled_back) || [])}`
);
} catch (err) {
ctx.logger.error(
@ -1426,9 +1410,10 @@ class EntryService extends Service {
* @param {Array<Object>} params.receivingDetailRows 收货明细快照 [{ id, receiving_id, system_product_id, actual_quantity, stored_quantity }]
* @param {Map<number, {inboundQty: number}>} params.stockInboundQtyMap stock_id -> 本次入库量
* @param {Object} params.transaction Sequelize 事务对象
* @param {number} [params.entryOrderId] 入库单 ID(传入时同步累加数量台账)
* @return {Promise<void>}
*/
async _applyReceivingInboundUsage({ receivingDetailRows, stockInboundQtyMap, transaction }) {
async _applyReceivingInboundUsage({ receivingDetailRows, stockInboundQtyMap, transaction, entryOrderId = null }) {
const { ctx, app } = this;
if (!receivingDetailRows || receivingDetailRows.length === 0) return;
@ -1453,6 +1438,7 @@ class EntryService extends Service {
}
const touchedReceivingIds = new Set();
const detailDeltaMap = new Map();
// 3. 逐商品分配本次入库量:使用了多少就写多少
for (const [ stockId, plan ] of stockInboundQtyMap) {
@ -1476,6 +1462,10 @@ class EntryService extends Service {
transaction,
});
touchedReceivingIds.add(Number(detail.receiving_id));
detailDeltaMap.set(Number(detail.id), {
receivingId: Number(detail.receiving_id),
quantity: delta,
});
left -= delta;
}
}
@ -1511,6 +1501,15 @@ class EntryService extends Service {
ctx.logger.info(
`[storage.entry] 已回写收货单入库状态,receivingIds=[${[ ...touchedReceivingIds ].join(',')}]`
);
// 5. 同步数量台账:本次落到各收货明细的分配量累加到对应绑定行
if (entryOrderId && detailDeltaMap.size > 0) {
await ctx.service.systems.receivingEntryMatch.recordLedgerAllocation({
entryOrderId,
detailDeltaMap,
transaction,
});
}
}
/**
@ -1859,6 +1858,7 @@ class EntryService extends Service {
receivingDetailRows: receivingDetailsSnapshot,
stockInboundQtyMap: stockPlanMap,
transaction,
entryOrderId: eo.id,
});
}

View File

@ -0,0 +1,72 @@
'use strict';
/**
* wms_entry_order_receiving 绑定表增加 allocated_quantity(数量台账)字段。
*
* 背景:入库单-收货单绑定后按入库单计划数量向收货单明细累加 stored_quantity,
* 同一入库单绑定多个收货单时会重复全额分配(合计超出计划数量)。
* 修复方案 A:在绑定行上维护数量台账(收货明细ID → 已分配数量),
* 分配时按 SKU 封顶 min(入库单计划数 − 其他绑定已分配量, 收货明细剩余可入量)。
*
* 取值约定:JSON,可空。
* - NULL:迁移前的历史绑定行(未初始化台账,业务代码按“收货单侧已累计量”兜底重建);
* - {}:新链路创建/解绑清零后的空台账;
* - {"<receiving_detail_id>": <qty>}:明细级分配数量台账。
*
* 幂等:列已存在则跳过。仅基表(无分表)。
*/
const TABLE_NAME = 'wms_entry_order_receiving';
const COLUMN_NAME = 'allocated_quantity';
/**
* 判断列是否已存在。
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
* @param {string} tableName 表名。
* @param {string} columnName 列名。
* @return {Promise<boolean>} 是否存在。
*/
async function columnExists(queryInterface, tableName, columnName) {
const described = await queryInterface.describeTable(tableName);
return Boolean(described && described[columnName]);
}
module.exports = {
/**
* 执行迁移:为绑定表增加 allocated_quantity 台账列。
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
* @param {import('sequelize')} Sequelize Sequelize 构造器。
* @return {Promise<void>} 无返回值。
*/
async up(queryInterface, Sequelize) {
if (await columnExists(queryInterface, TABLE_NAME, COLUMN_NAME)) {
console.log(`[20260907160000-add-allocated-quantity-to-wms-entry-order-receiving] up skip: ${TABLE_NAME}.${COLUMN_NAME} exists`);
return;
}
await queryInterface.addColumn(TABLE_NAME, COLUMN_NAME, {
type: Sequelize.JSON,
allowNull: true,
defaultValue: null,
comment: '数量台账:收货明细ID→已分配数量(JSON对象);null 表示旧数据未初始化',
});
console.log(`[20260907160000-add-allocated-quantity-to-wms-entry-order-receiving] up added: ${TABLE_NAME}.${COLUMN_NAME}`);
},
/**
* 回滚迁移:移除台账列。
* @param {import('sequelize').QueryInterface} queryInterface 查询接口。
* @return {Promise<void>} 无返回值。
*/
async down(queryInterface) {
if (!await columnExists(queryInterface, TABLE_NAME, COLUMN_NAME)) {
console.log(`[20260907160000-add-allocated-quantity-to-wms-entry-order-receiving] down skip: ${TABLE_NAME}.${COLUMN_NAME} missing`);
return;
}
await queryInterface.removeColumn(TABLE_NAME, COLUMN_NAME);
console.log(`[20260907160000-add-allocated-quantity-to-wms-entry-order-receiving] down removed: ${TABLE_NAME}.${COLUMN_NAME}`);
},
};

View File

@ -1,4 +1,68 @@
[
{
"version": "2026.09.07-ai-method-routing-service-inventory-refresh",
"date": "2026-09-07",
"type": "changed",
"summary": "AI_METHOD_ROUTING.md 第 6 节「全量 Service Method 能力清单」按项目维护脚本重新扫描刷新:receiving_entry_match.js 由 12 个函数更新为 27 个(补齐台账/防超扣链路的 _bindReceivingsWithStorageSync、_bindOneReceivingAndSyncStorage、_syncReceivingStorageByEntryItems、_parseLedgerMap、_serializeLedgerMap、_buildLegacyBaselineLedger、_bindingAllocationByStock、_recalcReceivingStorageStatus、_reconcileEntryReceivedQuantity、recordLedgerAllocation、setLedgerAllocation、rollbackEntryOrderBindings、_rollbackOneBindingStorage 等),并同步刷新 workbench.js(52→61)、express_platform.js(16→17)、intercept_auto_confirm.js(新增)等存量漂移条目;本节内容由自动扫描脚本生成,仅函数清单、无接口行为描述。",
"methods": [
"storage.entry.bindReceiving",
"storage.entry.unbindReceiving",
"storage.entry.cancel",
"storage.entry.commit",
"storage.entry.quickInbound"
],
"notes": [
"本记录是对 2026.09.07-entry-receiving-binding-allocated-quantity-ledger 同任务的补充记录:该记录撰写时判定 AI_METHOD_ROUTING.md 无需同步,随后按文件内维护说明执行刷新脚本同步了第 6 节自动扫描清单(本任务涉及 receiving_entry_match.js 新增 13 个台账/防超扣相关方法)",
"刷新方式:node .\\script\\tmp-gen-service-method-inventory.cjs(扫描 app/service/**/*.js 输出 temp/tmp-service-method-inventory.md)→ node .\\script\\tmp-update-ai-method-routing.cjs(注入 AI_METHOD_ROUTING.md 第 6 节 BEGIN/END 标记内),自动生成时间 2026-09-06 → 2026-09-07、文件数 203 → 204",
"生成器按类方法扫描,个别内置标识符(如 max、min、Set、Date、NOW)会被一并列出为方法名,属于既有生成器口径,非手工修改",
"methods/system.json 无实质变化:本次 spec 复用 storage.entry.unbindReceiving 现有条目内容,upsert 为无差异重写;接口行为、参数、响应、错误码均不变",
"本次仅同步文档,未修改任何业务代码,未执行数据库/Redis 写操作"
],
"module": "storage.entry"
},
{
"version": "2026.09.07-entry-receiving-binding-allocated-quantity-ledger",
"date": "2026-09-07",
"type": "changed",
"summary": "入库单绑定收货单链路防超扣修复文档同步:wms_entry_order_receiving 新增 allocated_quantity 数量台账列(JSON,收货明细ID→分配数量,迁移 20260907160000 仅基表);storage.entry.bindReceiving COMPLETED 绑定改为台账制归一化分配(每 SKU 分配目标 = min(入库单计划数 − 其他绑定已占用, 收货单剩余可入量),多退少补、旧超分数据回收、重复绑定幂等跳过、软删恢复仅分配剩余量),并同步 entry_items.received_quantity 口径;新增 storage.entry.unbindReceiving 接口文档(解绑按台账回滚 stored_quantity、重算 storage_status、清空台账,响应新增 rolled_back_quantity);storage.entry.cancel 作废回滚改台账制逐绑定回收(不再整体清零共享收货单);storage.entry.commit / storage.entry.quickInbound 分别按覆写/累计语义同步台账。",
"methods": [
"storage.entry.bindReceiving",
"storage.entry.unbindReceiving",
"storage.entry.cancel",
"storage.entry.commit",
"storage.entry.quickInbound"
],
"notes": [
"app/model/entry_order_receiving.js 新增 allocated_quantity 列(JSON 可空,comment 数量台账:收货明细ID→已分配数量(JSON对象,如 {\"123\":8});null 表示旧数据未初始化);数据库迁移 database/migrations/20260907160000-add-allocated-quantity-to-wms-entry-order-receiving.js 仅基表(describeTable 幂等检测)",
"app/service/systems/receiving_entry_match.js _syncReceivingStorageByEntryItems(方案A台账版):FOR UPDATE 行锁入库单主行 + 该入库单全部未删除绑定行 + 绑定收货单明细行,串行化同一入库单的分配事务;每 SKU 分配目标 target = min(max(0, 入库单计划数 − 其他绑定已分配), 当前绑定已分配 + 收货单剩余可入量),多退少补(旧数据超分回收、亏分补分配);明细级结果回写绑定行台账 allocated_quantity,重算收货单主表 storage_status,并经 _reconcileEntryReceivedQuantity 同步 entry_items.received_quantity;返回的 storage_sync.stored_total 仅计补分配量(归一化回收不计入)",
"幂等/恢复语义:绑定已存在且未删除 → skipped(error_code=ALREADY_BOUND,不重复分配);已软删除 → restore 后按归一化目标仅分配剩余量(restored=true);并发唯一索引冲突按已绑定跳过。旧绑定行(台账 null)由 _buildLegacyBaselineLedger 按收货侧累计量兜底重建明细级台账,新链路绑定行台账初始化为 {}(非 null)",
"新增 unbindEntryOrderReceiving(对应 storage.entry.unbindReceiving):仅 CREATED / PENDING 可解绑(COMPLETED / CANCELLED 拒绝),解绑不回退入库单状态;事务内行锁后按台账逐明细回收该收货单 stored_quantity、重算明细与主表 storage_status、台账重置为 {},软删除主表绑定与关联明细绑定(InboundDirectLog status=committed 且 receiving_detail_id 非空的记录);返回 success/failed/success_count/failed_count,success 项含 released_detail_ids / released_detail_count / rolled_back_quantity(本次回滚的 stored_quantity 总量,无可回滚量为 0);不影响同一收货单上其他入库单的占用",
"app/service/systems/storage/entry.js cancel → _rollbackReceivingStorageStatus → rollbackEntryOrderBindings(receivingId=null、softDeleteBinding=false):按台账逐绑定回收、清空台账(绑定行保留)、重算 received_quantity;回滚失败仅日志不阻塞作废主流程;QM 来源入库单作废前先发送奇门取消同步,sync_status=SUCCESS 不可取消",
"app/service/systems/inbound_direct_log.js commit 绑定模式 _syncReceivingStorageStatus → receivingEntryMatch.setLedgerAllocation(按 committed 汇总量覆写台账条目);app/service/systems/storage/entry.js quickInbound _applyReceivingInboundUsage → receivingEntryMatch.recordLedgerAllocation(按本次落到收货明细的分配量累计台账)。说明:receiving_entry_match._commitBinding(PDA 明细绑定)内部调用 recordLedgerAllocation,但当前无调用方(实际 addItem 绑定走 inboundDirectLog._bindReceivingDetail),本次按实际生效链路记录,addItem 文档不改动",
"methods/system.json:storage.entry.bindReceiving 条目 description/storage_sync.stored_total 说明按台账归一化语义更新;新增 storage.entry.unbindReceiving 条目(按脚本规则追加到 storage.entry 组列表末尾);storage.entry.cancel / commit / quickInbound 描述补充台账行为;cancel errors 补充「入库单已完成回传,不可取消」;版本 0.3.96 -> 0.3.97(docMeta.version),updatedAt 保持 2026-09-07",
"README.md / AI_TOOLBOX.md / AI_METHOD_ROUTING.md 检索确认:无本链路行为描述(AI_METHOD_ROUTING.md 仅函数清单,无行为描述),无需同步",
"本次仅同步文档,未修改任何业务代码,未执行数据库/Redis 写操作"
],
"module": "storage.entry"
},
{
"version": "2026.09.07-entry-bindReceiving-completed-storage-sync",
"date": "2026-09-07",
"type": "changed",
"summary": "storage.entry.bindReceiving 契约变更:可绑定状态由 CREATED/PENDING 调整为 CREATED/COMPLETED;COMPLETED 绑定在事务内联动同步收货单入库进度(SKU 级累加 stored_quantity、重算明细与主表 storage_status);绑定已存在时幂等跳过不重复累加、软删除恢复后执行同步;返回结构由 success/failed/success_count/failed_count 修正为实际返回的 bound/skipped/summary,并在 COMPLETED 结果中新增 restored 与 storage_sync(含 unmatched_items)。",
"methods": [
"storage.entry.bindReceiving"
],
"notes": [
"app/service/systems/receiving_entry_match.js bindEntryOrderReceiving:ALLOWED_BIND_STATUSES = [CREATED, COMPLETED],其他状态抛错「入库单状态不允许绑定,当前状态: {status},仅 CREATED、COMPLETED 状态可操作」;收货单校验含 存在未删除、同仓库、同货主、未取消、已审核(is_review)",
"COMPLETED 路径新增 _bindReceivingsWithStorageSync / _bindOneReceivingAndSyncStorage / _syncReceivingStorageByEntryItems:事务内逐收货单主表绑定 + 入库明细按 stock_id(≡ wms_receiving_detail.system_product_id)汇总,FOR UPDATE 行锁后逐明细累加 stored_quantity(上限 actual_quantity),按 stored vs actual 重算明细 storage_status(none/partial/all)并汇总更新收货单主表 storage_status;SKU 未匹配明细汇总进 unmatched_items;任一异常整体回滚",
"幂等语义:绑定已存在且未删除 → skipped(error_code=ALREADY_BOUND,不重复累加);已软删除 → restore 并执行进度同步(restored=true);并发唯一索引冲突 → 按已绑定跳过",
"methods/system.json:storage.entry.bindReceiving 条目 description/errors 按代码更新;response 由 success/failed/success_count/failed_count 修正为实际返回的 flag/code/message/bound/skipped/summary/timestamp(bound 项 CREATED 含 receiving_id/receiving_number/created,COMPLETED 新增 restored 与 storage_sync.stored_total/matched_item_count/unmatched_items;skipped 项 error_code 枚举 ALREADY_BOUND/BINDING_WRITE_FAILED;收货单校验失败不返回明细、仅 summary.skipped_count 计数);错误码同步为实际文案(抛错经 /system 全局异常处理返回 500「接口错误: ...」);版本 0.3.95 -> 0.3.96(docMeta.version),updatedAt 保持 2026-09-07",
"README.md / AI_TOOLBOX.md / AI_METHOD_ROUTING.md 检索确认:无本接口状态规则描述(AI_METHOD_ROUTING.md 仅函数清单,无行为描述),无需同步",
"本次仅同步文档,未修改任何业务代码"
],
"module": "storage.entry"
},
{
"version": "2026.09.07-store-openAccount-remove-logo-url-domain",
"date": "2026-09-07",

View File

@ -1,7 +1,7 @@
{
"module": "system",
"description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内",
"version": "0.3.95",
"version": "0.3.97",
"updatedAt": "2026-09-07",
"headers": [
{
@ -22722,7 +22722,7 @@
},
{
"method": "storage.entry.cancel",
"description": "作废入库单(支持单条或批量作废)。CREATED(已创建待审核)和 PENDING(已审核)状态的入库单可以直接作废;已完成(COMPLETED)入库单不允许作废。",
"description": "作废入库单(支持单条或批量作废)。CREATED(已创建待审核)和 PENDING(已审核)状态的入库单可以直接作废;已完成(COMPLETED)入库单不允许作废,sync_status=SUCCESS(已完成回传)的入库单也不允许作废;QM 来源入库单作废前先发送奇门取消同步。作废成功后按绑定行数量台账(wms_entry_order_receiving.allocated_quantity,旧数据按收货侧累计量兜底)逐绑定回收本入库单在收货单上的 stored_quantity 占用、重算各收货单 storage_status、清空台账(绑定行保留不软删),并同步重算入库单明细 received_quantity;同一收货单上其他入库单的占用不受影响(不再整体清零共享收货单);回滚失败不阻塞作废主流程(仅记录日志)。",
"isNeedAuth": false,
"isNeedLogin": true,
"headers": [
@ -22765,11 +22765,15 @@
],
"errors": [
{
"code": "400",
"code": 400,
"message": "参数错误/参数不合法:需传入非空的 id 或 ids;ids 必须为数字数组且不得包含非法或重复值;已完成(COMPLETED)入库单不允许作废"
},
{
"code": "404",
"code": 400,
"message": "入库单已完成回传,不可取消"
},
{
"code": 404,
"message": "入库单不存在或无权访问"
}
]
@ -22973,7 +22977,7 @@
},
{
"method": "storage.entry.commit",
"description": "提交确认完成导入/PDA 入库。先同步奇门/API 回传,成功后在 onSuccess 回调内开启事务写入库存(wms_stock_warehouse.quantity 增量、wms_stock_transaction 流水),将 pending 状态的 InboundDirectLog 更新为 committed,更新入库单状态为 COMPLETED,同步 sync_status=SUCCESS。不足量提交时未入库商品跳过。noNeedNotice=1 时跳过入库完成通知(默认 0 通知)。",
"description": "提交确认完成导入/PDA 入库。先同步奇门/API 回传,成功后在 onSuccess 回调内开启事务写入库存(wms_stock_warehouse.quantity 增量、wms_stock_transaction 流水),将 pending 状态的 InboundDirectLog 更新为 committed,更新入库单状态为 COMPLETED,同步 sync_status=SUCCESS。绑定收货明细的入库(InboundDirectLog.receiving_detail_id 非空)在事务内按 committed 汇总量覆写收货明细 stored_quantity/storage_status 并重算收货单主表 storage_status,同时覆写绑定行数量台账 allocated_quantity(与 stored_quantity 保持一致,setLedgerAllocation 覆写语义)。不足量提交时未入库商品跳过。noNeedNotice=1 时跳过入库完成通知(默认 0 通知)。",
"isNeedAuth": false,
"isNeedLogin": true,
"headers": [
@ -23118,7 +23122,7 @@
},
{
"method": "storage.entry.quickInbound",
"description": "快捷直入(虚拟入库):将入库单商品直入到虚拟库位(space_id=2),跳过收货/质检流程。有绑定收货单时,只取收货单中与入库单明细有交集(按 stock_id 判断)且剩余可入数量(actual_quantity - stored_quantity)的商品直入,实际入库量 = min(明细计划数量, 收货单剩余可入数量),并在事务内回写收货单明细已入库数量与收货单入库状态;未绑定收货单时按明细计划数量全量直入。仅支持 CREATED 状态的入库单;CANCELLED(已作废)、COMPLETED(已完成)、PENDING 等其他状态均拒绝操作。事务内操作:更新入库明细收货量、累加库存总量、写入库存流水、写入虚拟库位库存、回写收货单明细、变更入库单状态为 COMPLETED,并在同一事务内回写入库单 is_virtual_inbound(是否虚拟入库):有绑定收货单 → 0(非虚拟入库),无绑定收货单 → 1(虚拟入库)。事务外异步回传奇门/API。noNeedNotice=1 时跳过入库完成通知(默认 0 通知)。",
"description": "快捷直入(虚拟入库):将入库单商品直入到虚拟库位(space_id=2),跳过收货/质检流程。有绑定收货单时,只取收货单中与入库单明细有交集(按 stock_id 判断)且剩余可入数量(actual_quantity - stored_quantity)的商品直入,实际入库量 = min(明细计划数量, 收货单剩余可入数量),并在事务内回写收货单明细已入库数量与收货单入库状态、同步累加绑定行数量台账 allocated_quantity(recordLedgerAllocation 累计语义,旧台账为 null 的绑定行先按收货侧累计量兜底初始化);未绑定收货单时按明细计划数量全量直入。仅支持 CREATED 状态的入库单;CANCELLED(已作废)、COMPLETED(已完成)、PENDING 等其他状态均拒绝操作。事务内操作:更新入库明细收货量、累加库存总量、写入库存流水、写入虚拟库位库存、回写收货单明细、变更入库单状态为 COMPLETED,并在同一事务内回写入库单 is_virtual_inbound(是否虚拟入库):有绑定收货单 → 0(非虚拟入库),无绑定收货单 → 1(虚拟入库)。事务外异步回传奇门/API。noNeedNotice=1 时跳过入库完成通知(默认 0 通知)。",
"isNeedAuth": false,
"isNeedLogin": true,
"headers": [],
@ -23398,7 +23402,7 @@
},
{
"method": "storage.entry.bindReceiving",
"description": "将收货单绑定到入库单(仅建立主表级关联,不做明细数量分配)。校验入库单状态(需为 CREATED 或 PENDING)、收货单有效性(存在、同仓库、未取消)后,逐个建立 wms_entry_order_receiving 绑定记录。支持部分成功:校验通过的写入绑定,不通过的在 failed 列表中返回原因。",
"description": "将收货单绑定到入库单(主表级关联 wms_entry_order_receiving)。入库单仅 CREATED、COMPLETED 状态允许绑定,其他状态抛错;收货单须存在且未删除、与入库单同仓库、同货主、未取消(status≠cancelled)、已审核(is_review)。CREATED 绑定:逐条写入主表绑定(幂等,已存在跳过),绑定行数量台账 allocated_quantity 初始化为空对象 {}(区别于旧数据 null),仅建立关联、不做入库进度同步。COMPLETED 绑定:事务内完成主表绑定 + 收货单入库进度同步(数量台账版防超扣)——FOR UPDATE 行锁入库单主行、该入库单全部未删除绑定行及相关收货单明细行,串行化同一入库单的分配事务;入库单明细按 SKU 汇总(entry_items.stock_id ≡ wms_receiving_detail.system_product_id),每 SKU 分配目标 = min(入库单计划数量 − 其他未删除绑定已分配量, 当前收货单该 SKU 剩余可入量),按明细 id 升序逐行补分配或回收(多退少补:旧数据超分回收、亏分补分配),同步更新收货明细 stored_quantity/storage_status(none/partial/all)、回写绑定行台账 allocated_quantity(收货明细ID→分配数量)、重算收货单主表 storage_status,并同步重算 entry_items.received_quantity(入库单侧已入库量,与各绑定收货单 stored_quantity 之和可对账);绑定已存在且未删除时跳过进度同步(幂等不重复分配),软删除绑定恢复后按归一化目标仅分配剩余量(旧超分数据归一化回收);SKU 未匹配的入库明细仅记录 unmatched_items 不阻塞;任一异常事务整体回滚。creator_id 由服务端从登录态自动注入,无需前端传值。支持部分成功:逐个收货单处理,跳过项计入 skipped。",
"isNeedAuth": false,
"isNeedLogin": true,
"headers": [
@ -23427,67 +23431,162 @@
],
"response": [
{
"name": "success",
"type": "array",
"name": "flag",
"type": "string",
"required": true,
"description": "绑定成功列表,每项包含 receiving_id、receiving_number"
"description": "success"
},
{
"name": "failed",
"name": "code",
"type": "number",
"required": true,
"description": "1"
},
{
"name": "message",
"type": "string",
"required": true,
"description": "提示信息(绑定完成)"
},
{
"name": "bound",
"type": "array",
"required": true,
"description": "绑定失败列表,每项包含 receiving_id、error_code、message",
"items": {
"type": "object",
"properties": {
"receiving_id": {
"type": "number",
"description": "收货单ID"
},
"receiving_number": {
"type": "string",
"description": "收货单号(部分失败项可能不返回)"
},
"error_code": {
"type": "string",
"description": "错误码,可能值:RECEIVING_NOT_FOUND(收货单不存在或已删除)、RECEIVING_NOT_REVIEWED(收货单未审核)、WAREHOUSE_MISMATCH(收货单与入库单仓库不一致)、RECEIVING_CANCELLED(收货单已取消)、OWNER_MISMATCH(收货单与入库单货主不一致)、BIND_ERROR(绑定过程异常)"
},
"message": {
"type": "string",
"description": "中文错误描述"
}
"description": "绑定/进度同步成功列表。CREATED 每项含 receiving_id、receiving_number、created;COMPLETED 每项额外含 restored(软删除恢复为 true)与 storage_sync(入库进度同步结果,含 stored_total、matched_item_count、unmatched_items)",
"children": [
{
"name": "receiving_id",
"type": "number",
"required": true,
"description": "收货单ID"
},
{
"name": "receiving_number",
"type": "string",
"required": true,
"description": "收货单号"
},
{
"name": "created",
"type": "boolean",
"required": true,
"description": "本次是否新建绑定(CREATED 为 findOrCreate 结果;COMPLETED 新建或恢复均为 true)"
},
{
"name": "restored",
"type": "boolean",
"required": false,
"description": "仅 COMPLETED:是否由已软删除的绑定关系恢复(恢复后按归一化目标执行进度同步)"
},
{
"name": "storage_sync",
"type": "object",
"required": false,
"description": "仅 COMPLETED 新建/恢复绑定时返回的入库进度同步结果",
"children": [
{
"name": "stored_total",
"type": "number",
"required": true,
"description": "本次补分配到收货单明细 stored_quantity 的总数量(归一化回收的超分数量不计入;无分配变化时可为 0)"
},
{
"name": "matched_item_count",
"type": "number",
"required": true,
"description": "成功补分配数量(allocated>0)的 SKU 数量"
},
{
"name": "unmatched_items",
"type": "array",
"required": true,
"description": "未匹配到收货明细的入库明细 SKU 列表(仅记录跳过,不影响绑定),每项含 stock_id、item_code、count"
}
]
}
}
]
},
{
"name": "success_count",
"type": "number",
"name": "skipped",
"type": "array",
"required": true,
"description": "成功数量"
"description": "跳过列表,每项含 receiving_id、receiving_number、error_code、message。error_code 可能值:ALREADY_BOUND(绑定已存在,COMPLETED 幂等跳过进度同步,不重复分配)、BINDING_WRITE_FAILED(CREATED 写入绑定失败)。收货单校验失败(不存在/跨仓/跨货主/已取消/未审核)时 skipped 为空数组、仅 summary.skipped_count 计数(失败明细仅服务端日志)"
},
{
"name": "failed_count",
"name": "summary",
"type": "object",
"required": true,
"description": "汇总统计",
"children": [
{
"name": "bound_count",
"type": "number",
"required": true,
"description": "成功数量"
},
{
"name": "skipped_count",
"type": "number",
"required": true,
"description": "跳过/失败数量(含收货单校验失败数)"
}
]
},
{
"name": "timestamp",
"type": "number",
"required": true,
"description": "失败数量"
"description": "响应时间戳(秒)"
}
],
"errors": [
{
"code": 400,
"message": "参数校验失败:entry_order_id 必填 / receiving_ids 必填且为非空数组 / 入库单状态不允许绑定(当前状态非 CREATED/PENDING)"
"code": 500,
"message": "接口错误: entry_order_id 不能为空"
},
{
"code": 404,
"message": "入库单不存在"
"code": 500,
"message": "接口错误: receiving_ids 不能为空且必须为数组"
},
{
"code": 500,
"message": "接口错误: 入库单不存在"
},
{
"code": 500,
"message": "接口错误: 入库单状态不允许绑定,当前状态: {当前状态},仅 CREATED、COMPLETED 状态可操作"
},
{
"code": 500,
"message": "接口错误: 入库单绑定收货单失败,已回滚: {原因}(COMPLETED 事务内主表绑定+进度同步任一异常整体回滚)"
},
{
"code": "RECEIVING_NOT_FOUND",
"message": "收货单不存在或已删除(业务校验失败不抛错:skipped 为空数组,计入 summary.skipped_count,失败明细仅服务端日志)"
},
{
"code": "WAREHOUSE_MISMATCH",
"message": "收货单与入库单不属于同一仓库(处理同上)"
},
{
"code": "OWNER_MISMATCH",
"message": "收货单与入库单货主不一致"
"message": "收货单与入库单货主不一致(处理同上)"
},
{
"code": "RECEIVING_CANCELLED",
"message": "收货单已取消(处理同上)"
},
{
"code": "RECEIVING_NOT_REVIEWED",
"message": "收货单未审核"
"message": "收货单未审核(处理同上)"
},
{
"code": "ALREADY_BOUND",
"message": "绑定关系已存在,跳过入库进度同步(COMPLETED 幂等,计入 skipped,不重复分配 stored_quantity)"
},
{
"code": "BINDING_WRITE_FAILED",
"message": "写入绑定失败: {原因}(CREATED 逐条写入异常,计入 skipped)"
}
]
},
@ -23727,6 +23826,144 @@
"message": "查询失败"
}
]
},
{
"method": "storage.entry.unbindReceiving",
"description": "解除入库单与收货单的主表绑定关系,并按数量台账回滚该收货单的入库进度。仅 CREATED / PENDING 状态的入库单可解绑(COMPLETED / CANCELLED 不允许),解绑不回退入库单状态。逐个收货单处理:主表绑定不存在计入 failed(BINDING_NOT_FOUND);存在则在事务内 FOR UPDATE 行锁入库单主行与绑定行,按绑定行台账(wms_entry_order_receiving.allocated_quantity,旧数据按收货侧累计量兜底)逐明细回收该收货单 stored_quantity、重算明细与主表 storage_status、台账重置为空对象 {},软删除主表绑定与关联明细绑定(InboundDirectLog 中 status=committed 且 receiving_detail_id 非空、属于该收货单的记录);同一收货单上其他入库单的占用不受影响。返回 success/failed/success_count/failed_count,success 项含 rolled_back_quantity(本次回滚的 stored_quantity 总量)。",
"isNeedAuth": false,
"isNeedLogin": true,
"headers": [
{
"name": "Authorization",
"type": "string",
"required": true,
"description": "Bearer token"
}
],
"params": [
{
"name": "entry_order_id",
"type": "number",
"required": true,
"source": "body",
"description": "入库单ID"
},
{
"name": "receiving_ids",
"type": "array",
"required": true,
"source": "body",
"description": "要解除绑定的收货单ID列表,每项为 integer"
}
],
"response": [
{
"name": "flag",
"type": "string",
"required": true,
"description": "success"
},
{
"name": "code",
"type": "number",
"required": true,
"description": "1"
},
{
"name": "message",
"type": "string",
"required": true,
"description": "提示信息(解绑完成)"
},
{
"name": "success",
"type": "array",
"required": true,
"description": "解绑成功列表,每项含 receiving_id、released_detail_ids、released_detail_count、rolled_back_quantity、message",
"children": [
{
"name": "receiving_id",
"type": "number",
"required": true,
"description": "收货单ID"
},
{
"name": "released_detail_ids",
"type": "array",
"required": true,
"description": "已软删除的关联明细绑定对应的收货明细ID列表(wms_receiving_detail.id)"
},
{
"name": "released_detail_count",
"type": "number",
"required": true,
"description": "已软删除的关联明细绑定数(InboundDirectLog 中 status=committed 且 receiving_detail_id 非空的记录数)"
},
{
"name": "rolled_back_quantity",
"type": "number",
"required": true,
"description": "本次按台账回滚的该收货单 stored_quantity 总量(无可回滚量时为 0)"
},
{
"name": "message",
"type": "string",
"required": true,
"description": "处理结果说明(已解除绑定并回滚收货单入库进度)"
}
]
},
{
"name": "failed",
"type": "array",
"required": true,
"description": "解绑失败列表,每项含 receiving_id、error_code、message。error_code 可能值:BINDING_NOT_FOUND(主表绑定不存在)、ENTRY_ORDER_NOT_FOUND(入库单不存在)、ENTRY_ORDER_STATUS_INVALID(入库单状态不允许解绑)、UNBIND_ERROR(解绑过程异常)"
},
{
"name": "success_count",
"type": "number",
"required": true,
"description": "解绑成功数量"
},
{
"name": "failed_count",
"type": "number",
"required": true,
"description": "解绑失败数量"
},
{
"name": "timestamp",
"type": "number",
"required": true,
"description": "响应时间戳(秒)"
}
],
"errors": [
{
"code": 500,
"message": "接口错误: entry_order_id 不能为空"
},
{
"code": 500,
"message": "接口错误: receiving_ids 不能为空且必须为数组"
},
{
"code": "ENTRY_ORDER_NOT_FOUND",
"message": "入库单不存在(业务校验失败不抛错:success 为空数组,全部收货单计入 failed,failed_count=请求收货单数)"
},
{
"code": "ENTRY_ORDER_STATUS_INVALID",
"message": "入库单状态不允许解绑,当前状态: {状态}(仅 CREATED、PENDING 可解绑;处理同上不抛错)"
},
{
"code": "BINDING_NOT_FOUND",
"message": "主表绑定不存在(计入 failed)"
},
{
"code": "UNBIND_ERROR",
"message": "解绑过程异常: {原因}(计入 failed,已执行的回滚在事务内回退)"
}
]
}
]
},