feat(stock.check): 商品视图按商品汇总、账面按静态标记取值、静态盘点锁定缓存与库存操作拦截
盘点作业数据(workData / workDataDetail) - workData goods 视图按 stock_id 汇总为一行(同商品多库位明细合并):行级账面=各库位之和, 作业记录跨明细按库位合并,locations 每项补 detail_id/snapshot_quantity,行级不再返回 detail_id。 - workDataDetail 商品分支改为 id + stock_id 钻取,返回 summary(汇总)+ rows(按库位分行: 明细ID/库位ID/账面快照/当前账面/实盘/差异);兼容传商品范围 detail_id。 - 账面取值按任务 is_static 区分:静态盘点取明细快照(冻结基准),普通盘点取当前 wms_storage; 新增 storage_quantity / is_static / book_source 字段,差异统一为「实盘 - system_quantity」。 - report 的 detail_id 改为可选:商品行可只传 id + stock_id + space_id,服务端按库位明细反查。 静态盘点(is_static) - wms_stock_check 新增 is_static(TINYINT(1) DEFAULT 0,迁移 20261028010000);create 支持 is_static (仅商品盘点有效,库位盘点恒 0);静态定式 pattern=static 创建的任务自动置 1。 - 新增公共查询 stock.check.staticLockList:返回 is_static=1 且 approved/checking 任务的商品集合, 按仓库缓存(TTL 300s、状态流转先递增代次再重建、回源前后代次校验防脏读、空集合也缓存、 进程内 singleflight 防击穿),并提供 isStockStaticLocked / getStaticLockConflict 供内部判断。 - 审核通过时刷新商品明细账面快照(快照基准=开始盘点时点),finish 立即释放锁定并返回 released_stock_ids。 - 库存操作拦截:分配储位命中锁定商品时按「库存不足」同流程将该订单标记失败(storage_status=error + order_flag),同批次其它订单继续;移库(transferLocation / transferByProduct)命中锁定直接 400。 其他 - 新增开发环境实测脚本 script/stock-check-goods-summary-verify.cjs。 - 测试:stock_check.test.js 覆盖汇总/钻取/静态标记/锁定缓存/账面口径;新增 static_lock_guard.test.js 覆盖分配与移库拦截;methods/system.json 与 changes 更新至 0.3.318。 Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
This commit is contained in:
parent
8f2e141fe0
commit
562f63f18e
@ -6,7 +6,7 @@
|
||||
* @return {import('sequelize').ModelCtor<import('sequelize').Model>} Sequelize 模型。
|
||||
*/
|
||||
module.exports = app => {
|
||||
const { BIGINT, STRING, INTEGER, DATE, JSON: JSON_TYPE } = app.Sequelize;
|
||||
const { BIGINT, STRING, INTEGER, TINYINT, DATE, JSON: JSON_TYPE } = app.Sequelize;
|
||||
|
||||
const StockCheck = app.model.define('wms_stock_check', {
|
||||
id: {
|
||||
@ -47,6 +47,12 @@ module.exports = app => {
|
||||
allowNull: true,
|
||||
comment: '货主ID,按货主盘点时必填(type=store)',
|
||||
},
|
||||
is_static: {
|
||||
type: TINYINT(1),
|
||||
allowNull: false,
|
||||
defaultValue: 0,
|
||||
comment: '是否静态盘点(1=静态盘点(静态定式创建或创建时开启),0=普通盘点)',
|
||||
},
|
||||
scope_snapshot: {
|
||||
type: JSON_TYPE,
|
||||
allowNull: true,
|
||||
|
||||
@ -8,8 +8,8 @@ const STOCK_CHECK_EXPORT_TASK_CACHE_TTL_SECONDS = 1800;
|
||||
/** 单次导出任务允许的最大盘点任务数量 */
|
||||
const STOCK_CHECK_EXPORT_MAX_TASK_IDS = 50;
|
||||
|
||||
/** 全部 24 个 method 名(免权限/免鉴权清单共用) */
|
||||
const ALL_METHOD_NAMES = 'create,list,addDetail,addLocationDetail,detailDelete,detail,result,workData,workDataSpaceDetails,workDataDetail,report,markEmpty,recordList,recordDelete,recheckClearLocation,finish,submit,cancel,audit,batchDelete,export,exportDetail,exportTaskProgress,patternList,patternCreate';
|
||||
/** 全部 25 个 method 名(免权限/免鉴权清单共用) */
|
||||
const ALL_METHOD_NAMES = 'create,list,addDetail,addLocationDetail,detailDelete,detail,result,workData,workDataSpaceDetails,workDataDetail,report,markEmpty,recordList,recordDelete,recheckClearLocation,finish,submit,cancel,audit,batchDelete,export,exportDetail,exportTaskProgress,patternList,patternCreate,staticLockList';
|
||||
|
||||
/**
|
||||
* 系统方法层:stock.check(库存盘点模块接口包装层)。
|
||||
@ -24,7 +24,7 @@ class StockCheckMethodService extends MainService {
|
||||
// 免权限方法列表:全部 20 个方法免 API 权限校验(与 stock/transaction.js 口径一致)
|
||||
const _noNeedRight = ALL_METHOD_NAMES;
|
||||
// 免日志方法列表:查询类与导出类不记录操作日志(recordDelete/patternCreate 为写操作,保留操作日志)
|
||||
const _noNeedLog = 'list,detail,result,workData,workDataSpaceDetails,workDataDetail,recordList,export,exportDetail,exportTaskProgress,patternList';
|
||||
const _noNeedLog = 'list,detail,result,workData,workDataSpaceDetails,workDataDetail,recordList,staticLockList,export,exportDetail,exportTaskProgress,patternList';
|
||||
// 免鉴权(仓库有效期检查)方法列表:全部方法免鉴权(与 stock/transaction.js 口径一致)
|
||||
const _noNeedAuth = ALL_METHOD_NAMES;
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
@ -63,6 +63,8 @@ class StockCheckMethodService extends MainService {
|
||||
* @param {string} [data.mode] 盘点方式:open=明盘/blind=盲盘;
|
||||
* 按库位盘点(location)一律盲盘,忽略前端传入;按商品盘点(store/goods)按传入值(默认明盘)。
|
||||
* @param {number} [data.store_id] 货主ID(按货主盘点时必填)。
|
||||
* @param {boolean|number} [data.is_static] 是否静态盘点(纯标记,0/1 或布尔;兼容 isStatic 驼峰写法;
|
||||
* 缺省 0=普通盘点;仅对商品盘点有效,按库位盘点一律 0。静态盘点定式创建的任务由服务端自动置 1)。
|
||||
* @param {string} [data.remark] 备注。
|
||||
* 盘点日期固定为今天,前端不传。
|
||||
* @return {Promise<Object>} 统一 success 包装,返回新建的盘点任务信息。
|
||||
@ -72,7 +74,18 @@ class StockCheckMethodService extends MainService {
|
||||
const warehouseId = Number(ctx.user && ctx.user.store_id) || 0;
|
||||
const creatorId = ctx.user ? (ctx.user.id || ctx.user.user_id || 0) : 0;
|
||||
const creatorName = ctx.user ? (ctx.user.employees_name || ctx.user.real_name || '') : '';
|
||||
const { title, type, mode, store_id: storeId, remark } = data || {};
|
||||
const {
|
||||
title,
|
||||
type,
|
||||
mode,
|
||||
store_id: storeIdSnake,
|
||||
storeId: storeIdCamel,
|
||||
is_static: isStaticSnake,
|
||||
isStatic: isStaticCamel,
|
||||
remark,
|
||||
} = data || {};
|
||||
const storeId = storeIdSnake !== undefined ? storeIdSnake : storeIdCamel;
|
||||
const isStatic = isStaticSnake !== undefined ? isStaticSnake : isStaticCamel;
|
||||
|
||||
return this._call(
|
||||
() => this.service.systems.stockCheck.create({
|
||||
@ -81,6 +94,7 @@ class StockCheckMethodService extends MainService {
|
||||
type,
|
||||
mode,
|
||||
storeId,
|
||||
isStatic,
|
||||
remark,
|
||||
creatorId,
|
||||
creatorName,
|
||||
@ -102,6 +116,26 @@ class StockCheckMethodService extends MainService {
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 拉取「静态盘点锁定中」的库存商品列表(公共查询,供库存操作前置判断)。
|
||||
* warehouse_id 由服务端从当前上下文自动注入,前端无需传递。
|
||||
* 口径:is_static=1 且状态为 approved(审核完成)/checking(盘点作业中)任务的商品明细 stock_id 去重集合;
|
||||
* 结果按仓库维度缓存(TTL 300 秒,状态流转时主动失效)。
|
||||
*
|
||||
* @return {Promise<Object>} 统一 success 包装,返回
|
||||
* { warehouse_id, stock_ids, rows, total, cached, updated_at };
|
||||
* rows 每个 stock_id 一条:{ stock_id, item_code, item_name, check_ids, check_nos, location_codes }。
|
||||
*/
|
||||
async staticLockList() {
|
||||
const { ctx } = this;
|
||||
const warehouseId = Number(ctx.user && ctx.user.store_id) || 0;
|
||||
|
||||
return this._call(
|
||||
() => this.service.systems.stockCheck.staticLockList({ warehouseId }),
|
||||
'拉取静态盘点锁定商品列表失败'
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 按定式快速创建盘点任务。
|
||||
* warehouse_id 由服务端从当前上下文自动注入,前端无需传递。
|
||||
@ -357,8 +391,9 @@ class StockCheckMethodService extends MainService {
|
||||
* @param {Object} [data.pagination] 分页配置 { page, pageSize }。
|
||||
* @return {Promise<Object>} 统一 success 包装,返回 { view, rows, total, page, pageSize };rows 结构按视图不同:
|
||||
* location=库位结构(任务库位范围行为列表,行内挂 goods/unknown 作业记录子列表);
|
||||
* goods=商品结构(任务商品范围行为列表,行内挂按库位聚合的 locations 作业记录,
|
||||
* 明盘返回数量与差异,盲盘不返回数量字段);
|
||||
* goods=商品结构(按商品 stock_id 汇总,一个商品一行——同商品的库位明细行合并:
|
||||
* 行内 locations 每项带该库位明细ID detail_id 与账面快照 snapshot_quantity(明盘),
|
||||
* 明盘返回数量与差异,盲盘不返回数量字段;逐库位明细请调 workDataDetail(id + stock_id));
|
||||
* space=聚合库位结构(任务商品所在库位为列表,按拣货路径排序,行内挂该库位的任务商品,
|
||||
* 明盘返回账面/实盘数量,盲盘不返回数量字段)。
|
||||
*/
|
||||
@ -415,27 +450,41 @@ class StockCheckMethodService extends MainService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 拉取单条盘点明细的作业数据(workData 单行版)。
|
||||
* 拉取盘点作业数据明细(库位明细单行 / 商品钻取)。
|
||||
* warehouse_id 由服务端从当前上下文自动注入,前端无需传递。
|
||||
* 按明细范围类型分流,均返回单行对象(与对应视图单行结构一致):
|
||||
* 库位明细(scope_type=location)行结构同 workData location 视图单行
|
||||
* (detail_id/location_id/location_code/location_name/status/has_unknown/is_empty/
|
||||
* checked_at/checkers/goods);商品明细(scope_type=goods)行结构同 workData goods 视图行
|
||||
* (detail_id/stock_id/item_code/item_name/spec/store_id/store_name/barcode/images/locations,
|
||||
* 明盘含 system_quantity/checked_quantity/diff_quantity/is_diff,盲盘不含数量字段)。
|
||||
* ① 库位明细(detail_id 指向 scope_type=location 的行)返回单行,
|
||||
* 结构与 workData location 视图单行一致(detail_id/location_id/location_code/location_name/
|
||||
* status/has_unknown/is_empty/checked_at/checkers/goods);
|
||||
* ② 商品(id=盘点任务ID + stock_id,或 detail_id 指向商品范围行)返回该商品的库位分行数据 + 汇总:
|
||||
* { check_id, stock_id, item_code/item_name/spec/store_id/store_name/barcode/images,
|
||||
* summary 商品级汇总(明盘含 system_quantity 账面快照合计/checked_quantity 实盘合计/
|
||||
* diff_quantity/is_diff;盲盘不含数量字段),
|
||||
* rows 按库位分行(detail_id 该库位明细ID/location_id 与同义 space_id/location_code,
|
||||
* 明盘另含 system_quantity 该库位当前账面/snapshot_quantity 该库位账面快照/locked_quantity/
|
||||
* checked_quantity 该库位实盘/diff_quantity 该库位差异,另有 checked_at/checker_name/record_ids/images) }。
|
||||
*
|
||||
* @param {Object} data 请求体。
|
||||
* @param {number} data.detail_id 盘点明细ID(库位范围行或商品范围行;兼容 detailId 驼峰写法)。
|
||||
* @return {Promise<Object>} 统一 success 包装,data 为单行作业数据(结构随明细范围类型)。
|
||||
* @param {number} [data.id] 盘点任务ID(商品钻取必传,与 stock_id 搭配)。
|
||||
* @param {number} [data.stock_id] 商品库存ID(商品钻取必传;兼容 stockId 驼峰写法)。
|
||||
* @param {number} [data.detail_id] 盘点明细ID(库位明细必传;商品可只传本参数按明细商品钻取;
|
||||
* 兼容 detailId 驼峰写法)。
|
||||
* @return {Promise<Object>} 统一 success 包装,data 为库位单行或商品 { summary, rows } 结构。
|
||||
*/
|
||||
async workDataDetail(data = {}) {
|
||||
const { ctx } = this;
|
||||
const warehouseId = Number(ctx.user && ctx.user.store_id) || 0;
|
||||
const { detail_id: detailIdSnake, detailId: detailIdCamel } = data || {};
|
||||
const {
|
||||
id,
|
||||
detail_id: detailIdSnake,
|
||||
detailId: detailIdCamel,
|
||||
stock_id: stockIdSnake,
|
||||
stockId: stockIdCamel,
|
||||
} = data || {};
|
||||
const detailId = detailIdSnake !== undefined ? detailIdSnake : detailIdCamel;
|
||||
const stockId = stockIdSnake !== undefined ? stockIdSnake : stockIdCamel;
|
||||
|
||||
return this._call(
|
||||
() => this.service.systems.stockCheck.workDataDetail({ warehouseId, detailId }),
|
||||
() => this.service.systems.stockCheck.workDataDetail({ warehouseId, id, stockId, detailId }),
|
||||
'拉取盘点明细作业数据失败'
|
||||
);
|
||||
}
|
||||
@ -449,7 +498,8 @@ class StockCheckMethodService extends MainService {
|
||||
*
|
||||
* @param {Object} data 请求体。
|
||||
* @param {number} data.id 盘点任务ID。
|
||||
* @param {number} data.detail_id 明细ID。
|
||||
* @param {number} [data.detail_id] 明细ID(可选:商品行可不传,服务端按 id + stock_id + space_id
|
||||
* 反查该商品的库位明细;库位盘点行仍必传)。
|
||||
* @param {number} data.space_id 库位ID(wms_location_space.id,**必传**;兼容 spaceId / location_id / locationId 写法)。
|
||||
* 必须属于本仓库且所属分区有效;服务端以该 ID 为准落库,不再按库位编码猜库位。
|
||||
* @param {string} [data.location] 库位编码(可选,仅做一致性校验:与 space_id 对应库位编码不一致报 400)。
|
||||
|
||||
@ -799,6 +799,36 @@ class OrderStorageAllocationService extends MainService {
|
||||
|
||||
const stockIds = Array.from(stockIdSet);
|
||||
|
||||
// 静态盘点锁定:与「库存不足」同流程——命中锁定的订单标记失败(storage_status=error/order_flag),
|
||||
// 其余订单继续正常分配,不整单中断(最终由 shortage_order_ids / shortage_messages 返回)
|
||||
const staticLockRowByStock = new Map();
|
||||
const stockCheckService = ctx.service && ctx.service.systems && ctx.service.systems.stockCheck;
|
||||
if (stockIds.length > 0 && stockCheckService && typeof stockCheckService.getStaticLockConflict === 'function') {
|
||||
try {
|
||||
const lockConflict = await stockCheckService.getStaticLockConflict({
|
||||
warehouseId,
|
||||
stockIds,
|
||||
actionLabel: '分配储位',
|
||||
});
|
||||
if (lockConflict.locked) {
|
||||
for (const row of lockConflict.rows) {
|
||||
staticLockRowByStock.set(Number(row.stock_id), row);
|
||||
}
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 命中静态盘点锁定,相关订单将标记分配失败', {
|
||||
warehouseId,
|
||||
orderIds,
|
||||
lockedStockIds: [ ...staticLockRowByStock.keys() ],
|
||||
message: lockConflict.message,
|
||||
});
|
||||
}
|
||||
} catch (error) {
|
||||
// 锁定查询异常不阻断分配主流程(按未锁定处理),仅记录日志
|
||||
if (ctx.logger && typeof ctx.logger.warn === 'function') {
|
||||
ctx.logger.warn(`[OrderStorageAllocationService.allocatePicking] 静态盘点锁定查询失败: ${error && error.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 订单明细归集完成', {
|
||||
warehouseId,
|
||||
pendingOrderCount: pendingOrderIds.length,
|
||||
@ -1022,10 +1052,38 @@ class OrderStorageAllocationService extends MainService {
|
||||
const storageRowErrors = [];
|
||||
let allocatedQuantityForOrder = 0;
|
||||
|
||||
// 静态盘点锁定:本订单明细中含锁定商品时,整单标记失败(与库存不足同流程)
|
||||
const lockedStockIdsInOrder = [];
|
||||
for (const orderItem of orderItems) {
|
||||
const lockedStockId = toNumber(orderItem.stock_id, 0);
|
||||
if (lockedStockId > 0 && staticLockRowByStock.has(lockedStockId) && !lockedStockIdsInOrder.includes(lockedStockId)) {
|
||||
lockedStockIdsInOrder.push(lockedStockId);
|
||||
}
|
||||
}
|
||||
const staticLockMessage = lockedStockIdsInOrder.length > 0
|
||||
? `静态盘点锁定:${lockedStockIdsInOrder.map(lockedStockId => {
|
||||
const lockRow = staticLockRowByStock.get(lockedStockId) || {};
|
||||
const checkNos = (Array.isArray(lockRow.check_nos) ? lockRow.check_nos : []).filter(Boolean).join('/');
|
||||
return checkNos ? `sku(${lockedStockId}) 盘点单 ${checkNos}` : `sku(${lockedStockId})`;
|
||||
}).join('|')}`
|
||||
: '';
|
||||
if (staticLockMessage) {
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 订单命中静态盘点锁定,跳过分配', {
|
||||
orderId,
|
||||
lockedStockIds: lockedStockIdsInOrder,
|
||||
staticLockMessage,
|
||||
});
|
||||
}
|
||||
|
||||
for (const orderItem of orderItems) {
|
||||
const stockId = toNumber(orderItem.stock_id, 0);
|
||||
const requiredQuantity = toNumber(orderItem.plan_qty ?? orderItem.planQty ?? orderItem.count ?? 0, 0);
|
||||
|
||||
// 静态盘点锁定商品:不参与分配(不查储位、不加锁),整单由 staticLockMessage 标记失败
|
||||
if (stockId > 0 && staticLockRowByStock.has(stockId)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (stockId <= 0 || requiredQuantity <= 0) {
|
||||
shortageItems.push({
|
||||
stock_id: stockId,
|
||||
@ -1324,7 +1382,7 @@ class OrderStorageAllocationService extends MainService {
|
||||
const spaceErrorMessage = storageRowErrors.length > 0 && shortageMessage
|
||||
? `库位未设置(storage_id:${storageRowErrors.map(e => e.storage_id).join(',')})`
|
||||
: '';
|
||||
const finalShortageMessage = [ shortageMessage, spaceErrorMessage ].filter(Boolean).join('|');
|
||||
const finalShortageMessage = [ staticLockMessage, shortageMessage, spaceErrorMessage ].filter(Boolean).join('|');
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 订单缺货信息汇总', {
|
||||
orderId,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -305,6 +305,75 @@ function parseStorageDateInput(value) {
|
||||
|
||||
class InventoryService extends Service {
|
||||
|
||||
/**
|
||||
* 静态盘点锁定校验(移库等库存操作前置拦截)。
|
||||
* 商品若处于静态盘点锁定中(stock_check.is_static=1 且任务 approved/checking),返回冲突文案;
|
||||
* 若 stockCheck 服务不可用(单测桩等)则视为未锁定,不阻断既有流程。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Array<number>|number} stockIds 商品库存ID(单值或数组)。
|
||||
* @param {string} actionLabel 被禁止的操作名(文案用)。
|
||||
* @return {Promise<{locked: boolean, message: string, rows: Array<Object>}>} 锁定冲突信息。
|
||||
*/
|
||||
async _getStaticLockConflict(warehouseId, stockIds, actionLabel) {
|
||||
const { ctx } = this;
|
||||
const stockCheckService = ctx && ctx.service && ctx.service.systems && ctx.service.systems.stockCheck;
|
||||
if (!stockCheckService || typeof stockCheckService.getStaticLockConflict !== 'function') {
|
||||
return { locked: false, message: '', rows: [] };
|
||||
}
|
||||
const normalizedWarehouseId = Number(warehouseId) || 0;
|
||||
if (normalizedWarehouseId <= 0) {
|
||||
return { locked: false, message: '', rows: [] };
|
||||
}
|
||||
try {
|
||||
return await stockCheckService.getStaticLockConflict({
|
||||
warehouseId: normalizedWarehouseId,
|
||||
stockIds,
|
||||
actionLabel,
|
||||
});
|
||||
} catch (error) {
|
||||
// 锁定查询失败不阻断库存主流程(缓存/DB 异常时按未锁定处理),仅记录告警
|
||||
if (ctx.logger && typeof ctx.logger.warn === 'function') {
|
||||
ctx.logger.warn(`[InventoryStaticLock] 查询静态盘点锁定失败 action=${actionLabel}: ${error && error.message}`);
|
||||
}
|
||||
return { locked: false, message: '', rows: [] };
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算单条库存记录的可用数量,口径与 `updateQuantity` 保持一致:
|
||||
* `available = quantity - locked_quantity - intercept_locked_quantity`。
|
||||
*
|
||||
* 同时与库内 `available_quantity` 字段取较小值:`available_quantity` 为页面展示口径,
|
||||
* 任一字段显示为 0(例如被拦截锁定)时都不允许移库,避免把锁定/拦截锁定库存移走。
|
||||
*
|
||||
* @param {Object} record wms_storage 记录
|
||||
* @return {number} 可用数量(不小于 0)
|
||||
*/
|
||||
_resolveAvailableQuantity(record) {
|
||||
const quantity = Number(record?.quantity || 0);
|
||||
const lockedQuantity = Number(record?.locked_quantity || 0);
|
||||
const interceptLockedQuantity = Number(record?.intercept_locked_quantity || 0);
|
||||
const physicalAvailable = quantity - lockedQuantity - interceptLockedQuantity;
|
||||
const storedAvailable = Number(record?.available_quantity);
|
||||
const available = Number.isFinite(storedAvailable)
|
||||
? Math.min(physicalAvailable, storedAvailable)
|
||||
: physicalAvailable;
|
||||
return Math.max(available, 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算单条库存记录中不可移库的数量(锁定 + 拦截锁定)。
|
||||
*
|
||||
* @param {Object} record wms_storage 记录
|
||||
* @return {number} 锁定与拦截锁定数量之和
|
||||
*/
|
||||
_resolveLockedQuantity(record) {
|
||||
const lockedQuantity = Number(record?.locked_quantity || 0);
|
||||
const interceptLockedQuantity = Number(record?.intercept_locked_quantity || 0);
|
||||
return lockedQuantity + interceptLockedQuantity;
|
||||
}
|
||||
|
||||
/**
|
||||
* 写入移库双向库位流水(移库出/移库入)。
|
||||
*
|
||||
@ -445,6 +514,13 @@ class InventoryService extends Service {
|
||||
|
||||
const warehouseId = srcRecord.warehouse_id;
|
||||
|
||||
// 静态盘点锁定校验:商品在静态盘点中禁止移库
|
||||
const lockConflict = await this._getStaticLockConflict(warehouseId, [ srcRecord.stock_id ], '移库');
|
||||
if (lockConflict.locked) {
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: lockConflict.message, data: null };
|
||||
}
|
||||
|
||||
const stockWarehouseSnapshot = await ctx.model.StockWarehouse.findOne({
|
||||
where: { id: srcRecord.stock_id },
|
||||
attributes: [ 'id', 'quantity', 'locked_quantity' ],
|
||||
@ -484,12 +560,20 @@ class InventoryService extends Service {
|
||||
}
|
||||
|
||||
// ────────── 5. 处理移库 ──────────
|
||||
const availableQty = srcRecord.quantity - srcRecord.locked_quantity;
|
||||
const availableQty = this._resolveAvailableQuantity(srcRecord);
|
||||
const transferQty = (data.quantity !== undefined && data.quantity !== null)
|
||||
? Number(data.quantity)
|
||||
: availableQty;
|
||||
|
||||
// 校验移库数量
|
||||
if (availableQty <= 0) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
code: 400,
|
||||
message: `库存记录 ${storageId} 可用数量为 0(锁定 ${Number(srcRecord.locked_quantity) || 0}、拦截锁定 ${Number(srcRecord.intercept_locked_quantity) || 0}),不可移库`,
|
||||
data: null,
|
||||
};
|
||||
}
|
||||
if (transferQty > availableQty) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
@ -817,6 +901,15 @@ class InventoryService extends Service {
|
||||
* @param {number} data.target_space_id 目标库位ID(必填)
|
||||
* @param {number} data.quantity 移库数量(必填)
|
||||
* @return {Promise<Object>} code/data/message 结构
|
||||
*
|
||||
* 说明:
|
||||
* 1) 可用量口径与 `updateQuantity` 一致:`quantity - locked_quantity - intercept_locked_quantity`,
|
||||
* 并与库内 `available_quantity` 取较小值;锁定/拦截锁定(`available_quantity=0`)的记录一律不参与移库;
|
||||
* 2) 只按请求数量移库(不足整条时按数量拆分),不会清空库位;目标库位已有同批次同类型记录时合并;
|
||||
* 3) 循环结束后复核实际移库量,未移满请求数量(并发改动、可用量不足等)时整单回滚并返回 409,
|
||||
* 不会出现"提示成功但少移"的情况;成功时返回真实移库数量 `transfer_quantity` 与
|
||||
* 移库后原库位该商品剩余可用量 `remaining_quantity`、剩余锁定/拦截锁定数量
|
||||
* `remaining_locked_quantity`(并发写入原库位的新记录不会被本次移库带走)。
|
||||
*/
|
||||
async transferByProduct(data = {}) {
|
||||
const { ctx, app } = this;
|
||||
@ -895,7 +988,21 @@ class InventoryService extends Service {
|
||||
return { code: 404, message: `原库位 ${spaceId} 下未找到商品 ${stockId} 的库存记录`, data: null };
|
||||
}
|
||||
|
||||
const totalAvailable = srcRecords.reduce((sum, r) => sum + (r.quantity - r.locked_quantity), 0);
|
||||
// 静态盘点锁定校验:商品在静态盘点中禁止移库
|
||||
const lockConflict = await this._getStaticLockConflict(
|
||||
Number(srcRecords[0].warehouse_id) || 0,
|
||||
[ stockId ],
|
||||
'移库'
|
||||
);
|
||||
if (lockConflict.locked) {
|
||||
await transaction.rollback();
|
||||
return { code: 400, message: lockConflict.message, data: null };
|
||||
}
|
||||
|
||||
const totalAvailable = srcRecords.reduce(
|
||||
(sum, r) => sum + this._resolveAvailableQuantity(r),
|
||||
0
|
||||
);
|
||||
if (quantity > totalAvailable) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
@ -965,7 +1072,7 @@ class InventoryService extends Service {
|
||||
for (const srcRecord of srcRecords) {
|
||||
if (remainingQty <= 0) break;
|
||||
|
||||
const available = srcRecord.quantity - srcRecord.locked_quantity;
|
||||
const available = this._resolveAvailableQuantity(srcRecord);
|
||||
const toTransfer = Math.min(available, remainingQty);
|
||||
if (toTransfer <= 0) continue;
|
||||
|
||||
@ -1083,6 +1190,53 @@ class InventoryService extends Service {
|
||||
remainingQty -= toTransfer;
|
||||
}
|
||||
|
||||
// ── 复核实际移库数量:若循环因记录被并发改动/可用量不足而提前结束,整单回滚,避免"提示成功但少移" ──
|
||||
if (remainingQty > 0) {
|
||||
await transaction.rollback();
|
||||
ctx.logger.warn('[inventory.transferByProduct] 实际移库数量不足,已回滚', {
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
target_space_id: targetSpaceId,
|
||||
request_quantity: quantity,
|
||||
transferred_quantity: quantity - remainingQty,
|
||||
remaining_quantity: remainingQty,
|
||||
available_snapshot: totalAvailable,
|
||||
});
|
||||
return {
|
||||
code: 409,
|
||||
message: `可用库存不足:请求移库 ${quantity},实际只移了 ${quantity - remainingQty},剩余 ${remainingQty} 未移库,请刷新库存后重试`,
|
||||
data: {
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
target_space_id: targetSpaceId,
|
||||
transfer_quantity: 0,
|
||||
remaining_quantity: remainingQty,
|
||||
status: 'rolled_back',
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
const transferredQuantity = quantity - remainingQty;
|
||||
|
||||
// ── 复核原库位剩余可用量:并发写入的新记录不会被本次移库带走,需明确回给调用方 ──
|
||||
const remainRows = await ctx.model.Storage.findAll({
|
||||
where: {
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
const remainingQuantity = remainRows.reduce(
|
||||
(sum, r) => sum + this._resolveAvailableQuantity(r),
|
||||
0
|
||||
);
|
||||
const remainingLockedQuantity = remainRows.reduce(
|
||||
(sum, r) => sum + this._resolveLockedQuantity(r),
|
||||
0
|
||||
);
|
||||
|
||||
// ── 计算 SKU 维度统计变化 ──
|
||||
const remainingSrcSku = await ctx.model.Storage.count({
|
||||
where: {
|
||||
@ -1117,7 +1271,9 @@ class InventoryService extends Service {
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
target_space_id: targetSpaceId,
|
||||
transfer_quantity: quantity,
|
||||
transfer_quantity: transferredQuantity,
|
||||
remaining_quantity: remainingQuantity,
|
||||
remaining_locked_quantity: remainingLockedQuantity,
|
||||
affected_storage_count: affectedCount,
|
||||
},
|
||||
beforeChanges: {
|
||||
@ -1128,7 +1284,7 @@ class InventoryService extends Service {
|
||||
},
|
||||
afterChanges: {
|
||||
target_space_id: targetSpaceId,
|
||||
transfer_quantity: quantity,
|
||||
transfer_quantity: transferredQuantity,
|
||||
affected_storage_count: affectedCount,
|
||||
},
|
||||
});
|
||||
@ -1167,7 +1323,9 @@ class InventoryService extends Service {
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
target_space_id: targetSpaceId,
|
||||
transfer_quantity: quantity,
|
||||
transfer_quantity: transferredQuantity,
|
||||
remaining_quantity: remainingQuantity,
|
||||
remaining_locked_quantity: remainingLockedQuantity,
|
||||
affected_storage_count: affectedCount,
|
||||
});
|
||||
|
||||
@ -1178,7 +1336,9 @@ class InventoryService extends Service {
|
||||
space_id: spaceId,
|
||||
stock_id: stockId,
|
||||
target_space_id: targetSpaceId,
|
||||
transfer_quantity: quantity,
|
||||
transfer_quantity: transferredQuantity,
|
||||
remaining_quantity: remainingQuantity,
|
||||
remaining_locked_quantity: remainingLockedQuantity,
|
||||
affected_storage_count: affectedCount,
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
|
||||
@ -0,0 +1,25 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 库存盘点主表新增「是否静态盘点」标记:
|
||||
*
|
||||
* wms_stock_check 新增 is_static(TINYINT(1) NOT NULL DEFAULT 0):
|
||||
* - 1 = 静态盘点(由静态盘点定式 pattern=static 创建,或创建任务时显式开启);
|
||||
* - 0 = 普通盘点(存量数据默认值即 0,无需回填);
|
||||
* - 纯标记字段,不参与盘点流程判定(不改变模式/状态机/差异口径)。
|
||||
*/
|
||||
|
||||
const TABLE_NAME = 'wms_stock_check';
|
||||
|
||||
module.exports = {
|
||||
up: async queryInterface => {
|
||||
await queryInterface.sequelize.query(`
|
||||
ALTER TABLE \`${TABLE_NAME}\`
|
||||
ADD COLUMN \`is_static\` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '是否静态盘点(1=静态盘点(静态定式创建或创建时开启),0=普通盘点)' AFTER \`store_id\`
|
||||
`);
|
||||
},
|
||||
|
||||
down: async queryInterface => {
|
||||
await queryInterface.removeColumn(TABLE_NAME, 'is_static');
|
||||
},
|
||||
};
|
||||
@ -1,4 +1,210 @@
|
||||
[
|
||||
{
|
||||
"version": "0.3.318",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "盘点作业数据账面取值按任务 is_static 区分:stock.check.workData(goods/space 视图)与 stock.check.workDataDetail(商品钻取)对静态盘点取明细快照、对普通盘点取当前 wms_storage 账面;新增 storage_quantity / is_static / book_source 字段。",
|
||||
"methods": [
|
||||
"stock.check.workData",
|
||||
"stock.check.workDataDetail"
|
||||
],
|
||||
"notes": [
|
||||
"背景:静态盘点(is_static=1)在审核完成时会冻结账面基准(刷新明细 system_quantity 快照),盘点期间不允许出入库/移库;普通盘点则希望看到「当前账面」用于实时对比。原实现两种任务都混用了快照与 storage(goods 视图行级取快照、locations 取 storage),口径不一致。",
|
||||
"现口径:system_quantity = 本次参与差异计算的账面——is_static=1 → 该库位明细 system_quantity(快照);is_static=0 → wms_storage 该库位 SUM(available_quantity+locked_quantity)。行级(goods 视图行 / workDataDetail summary)为各库位账面之和;diff_quantity 一律 = 实盘 - system_quantity。",
|
||||
"新增字段:goods 视图行与 location item 增加 is_static / book_source(snapshot|storage)/ storage_quantity(当前 storage 账面),snapshot_quantity 继续输出明细快照;space 视图行内 goods 增加 storage_quantity / snapshot_quantity;workDataDetail 顶层增加 is_static / book_source,rows[] 增加 storage_quantity。",
|
||||
"兼容性:system_quantity 语义由「快照或 storage(视视图而定)」收紧为「按 is_static 取值」;普通盘点任务的 goods 视图行级账面可能从快照变为当前 storage(有出入库时数值不同),前端如需要基准值请改读 snapshot_quantity。",
|
||||
"未涉及:stock.check.result / finish / export 的差异汇总仍按「商品行快照、库位行 storage」的既有口径,本次未改;如需与两个作业数据接口完全对齐可另行确认。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 新增「账面取值按任务静态标记」用例——审核后人为给该库位 +7,静态任务断言 row/locations/summary system_quantity == 快照且 storage_quantity == 快照+7、差异按快照算;非静态任务断言 system_quantity == 快照+7 且差异按当前账面算;goods 视图、space 视图、workDataDetail 三处交叉验证;全量 255 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组更新 stock.check.workData(rows.description 商品/space 视图账面口径 + notes)、stock.check.workDataDetail(data.description + notes);根版本 0.3.317 → 0.3.318、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位)。",
|
||||
"代码依据:app/service/systems/stock_check.js#workData/#workDataDetail/#_buildGoodsWorkRows/#_buildSpaceWorkRows/#_formatGoodsWorkDetail。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.317",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "分配储位命中静态盘点锁定改为「订单级失败」:与库存不足同流程(该订单 storage_status=error + order_flag 静态盘点锁定原因),同批次其它订单继续分配,接口返回 200 并通过 shortage_order_ids/shortage_messages 体现。",
|
||||
"methods": [
|
||||
"order.pendingOrder.allocateStorage",
|
||||
"order.wave.batchAllocateStorage"
|
||||
],
|
||||
"notes": [
|
||||
"修正原因:储位分配支持批量订单(order_ids 数组,波次/待处理订单均走同一入口),0.3.316 的「整单 400」会把同批次未锁定订单一并打断,与既有「库存不足」的静默跳过口径不一致,前端也无法区分哪些订单失败。",
|
||||
"现行为:命中静态盘点锁定的商品行在明细循环中直接跳过(不查可用储位、不加锁、不写 picking 行);订单级 finalShortageMessage 追加「静态盘点锁定:sku(x) 盘点单 PDxxx」,走与缺货完全相同的收尾——回滚该订单已锁定库存、置 storage_status=error、step=异常、order_flag=原因,并进入 orderResults(status=error)。",
|
||||
"响应:接口整体 200(除非仓库上下文/订单为空等参数错误);shortage_order_ids 含命中锁定的订单,shortage_messages 含静态盘点锁定文案与盘点单号;orders 中该订单 status=error;allocated_order_ids 仅含成功订单。",
|
||||
"与移库的区别:移库(storage.inventory.transferLocation/transferByProduct)是单条/单商品同步操作,仍保持 400 直接失败。",
|
||||
"测试:test/app/service/systems/static_lock_guard.test.js 改为批量口径——两个订单(1 命中锁定、2 正常)断言 code=200、shortage_order_ids=[1]、allocated_order_ids=[2]、锁定订单 order_flag 含静态盘点锁定、仅未锁定商品被加锁(lockCalls 仅 501/3)、picking 仅 1 行;另加「全部订单命中锁定仍返回 200、无加锁、事务正常提交」;5 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 order.pendingOrder 分组更新 order.pendingOrder.allocateStorage(description 改为订单级失败、移除静态盘点 400 错误项、notes 补充)、order.wave 分组更新 order.wave.batchAllocateStorage(notes);根版本 0.3.316 → 0.3.317、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位)。",
|
||||
"代码依据:app/service/systems/order_storage_allocation.js#allocatePicking、app/service/systems/stock_check.js#getStaticLockConflict。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.316",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "静态盘点锁定拦截库存操作:分配储位(order.pendingOrder.allocateStorage / order.wave.batchAllocateStorage)与移库(storage.inventory.transferLocation / transferByProduct)在商品处于静态盘点锁定中时直接失败(400),返回冲突商品与来源盘点单号。",
|
||||
"methods": [
|
||||
"order.pendingOrder.allocateStorage",
|
||||
"order.wave.batchAllocateStorage",
|
||||
"storage.inventory.transferLocation",
|
||||
"storage.inventory.transferByProduct"
|
||||
],
|
||||
"notes": [
|
||||
"需求:静态盘点(is_static=1,审核完成后锁定)期间,商品库存不允许被分配储位/移库,否则盘点实盘与账面基准错位;要求相关操作直接失败并给出明确原因。",
|
||||
"判定口径:复用 stock_check.staticLockList(按仓库缓存,TTL 300 秒 + 状态流转立即重建 + 代次防脏读)——is_static=1 且任务状态 approved/checking 的商品为锁定;审核完成即锁、完成/取消即释放。",
|
||||
"新增业务方法 stock_check.getStaticLockConflict({ warehouseId, stockIds, actionLabel }):返回 { locked, rows, message },message 形如「商品正在静态盘点中,禁止移库:编码(库存ID) 盘点单 PDxxxx」,供库存操作直接返回/抛出(systemMethods 未暴露,内部调用)。",
|
||||
"分配储位:orderStorageAllocation.allocatePicking 在归集订单明细 stock_id 后、查询可用储位库存之前校验,命中即回滚事务并返回 400 + data.locked_stock_ids/locked_items;allocateStorage 为其兼容入口,待处理订单分配、波次分配等内部调用全部生效。",
|
||||
"移库:storage.inventory.transferLocation(按库存记录)与 transferByProduct(按库位+商品)在锁定/读取原库存记录后校验 stock_id,命中即回滚并返回 400;未命中时行为与之前完全一致。",
|
||||
"降级策略:锁定查询异常(缓存/数据库故障)时按「未锁定」放行并写 warn 日志,避免因盘点缓存故障阻断出入库主流程;如需强一致可改为失败即拒绝。",
|
||||
"测试:新增 test/app/service/systems/static_lock_guard.test.js(4 个用例:transferLocation/transferByProduct 命中锁定 400+回滚+不写库存、未锁定时走原有可用量校验、allocatePicking 命中锁定 400+回滚+未查询储位库存);stock_check.test.js 新增 getStaticLockConflict 文案与空入参用例;相关套件 258 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 更新 storage.inventory.transferLocation、storage.inventory.transferByProduct、order.pendingOrder.allocateStorage(description/errors/notes)与 order.wave.batchAllocateStorage(notes);根版本 0.3.315 → 0.3.316、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位)。",
|
||||
"代码依据:app/service/systems/stock_check.js#getStaticLockConflict/#isStockStaticLocked、app/service/systems/storage/inventory.js#transferLocation/#transferByProduct/#_getStaticLockConflict、app/service/systems/order_storage_allocation.js#allocatePicking。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.315",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "静态盘点锁定缓存增加防脏读机制:状态流转(审核/完成/取消/批量删除)先递增锁定代次再重建缓存,回源前后代次不一致则放弃写缓存(响应 cache_skipped=true),杜绝旧快照覆盖新缓存的脏读。",
|
||||
"methods": [
|
||||
"stock.check.staticLockList",
|
||||
"stock.check.audit",
|
||||
"stock.check.finish"
|
||||
],
|
||||
"notes": [
|
||||
"问题:原实现为「状态更新 → 重建缓存(查询后写回)」,若两个流转并发(如审核 A 与完成 B),B 的重建可能先写入新快照,A 的旧快照随后覆盖 → 最长 300 秒脏读(锁定集合与库内状态不符)。",
|
||||
"方案(乐观锁/代次):新增代次键 `stock_check:static_lock_gen:{warehouseId}`,Redis 用 INCR 原子递增,Redis 不可用时退化为进程内计数;所有状态流转统一走 refreshStaticLockCache:递增代次 → 回源查询 → 写缓存;_loadStaticLockCache 在查询前后各读一次代次,不一致则判定为并发流转,跳过写缓存并清除缓存(返回 cache_skipped=true)。",
|
||||
"正确性:① 流转先提交数据库、再递增代次,故代次变化一定意味数据库已变;② 查询前读到的代次若在查询后被改,旧快照不会落盘;③ 未发生流转时的回源之间结果等价,覆盖无影响;④ 读取侧(staticLockList 缓存命中的分支)不受影响,缓存为空时回源保证最终一致。",
|
||||
"审核路径:audit(approve) → 刷新明细快照 → 更新状态 → refreshStaticLockCache(递增代次 + 重建),接口返回时缓存已包含新任务且无脏读窗口;reject 同理(重建后移除该任务)。",
|
||||
"性能:每次流转多 2 次 Redis 读 + 1 次 INCR(本地降级为内存操作),回源仍是 2 条 SQL;不影响常规查询(命中缓存时无额外开销)。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 新增「防脏读:回源期间发生状态流转时不写入旧快照」用例——在 _queryStaticLockRows 内递增代次模拟并发流转,断言 cache_skipped=true 且缓存未被写入,并校验 refreshStaticLockCache 会递增代次;全量 253 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组更新 stock.check.staticLockList(新增 cache_skipped 响应字段 + 缓存设计/防脏读 notes)、stock.check.audit 与 stock.check.finish(notes 各追加代次说明);根版本 0.3.314 → 0.3.315、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位)。",
|
||||
"代码依据:app/service/systems/stock_check.js#refreshStaticLockCache/#_loadStaticLockCache/#_readStaticLockGeneration/#_bumpStaticLockGeneration/#staticLockList。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.314",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "静态盘点锁定缓存策略加固:状态流转(审核/完成/取消/批量删除)由「删除缓存」改为「立即重建缓存」,消除审核后仍读到旧缓存的空窗;空集合也缓存(不穿透)、并发未命中用进程内 singleflight 去重(不击穿);TTL 仍为 300 秒兜底。",
|
||||
"methods": [
|
||||
"stock.check.staticLockList"
|
||||
],
|
||||
"notes": [
|
||||
"缓存时长:TTL 300 秒(STATIC_LOCK_CACHE_TTL_SECONDS),仅作兜底;正常路径由状态流转触发重建,不依赖 TTL 到期。",
|
||||
"是否穿透:不会。回源结果(包括 rows 为空、stock_ids=[] 的空集合)都会写入缓存,因此「当前没有锁定商品」的仓库也不会每次查库;命中空缓存时返回 cached=true、total=0。",
|
||||
"是否击穿:同一进程内对同一仓库的并发未命中通过 STATIC_LOCK_INFLIGHT(Map<cacheKey, Promise>)合并为一次回源,其余请求复用同一结果;跨实例的极短并发仍可能各自回源一次(2 条 SQL,成本低),数据结果一致。",
|
||||
"新审核是否清缓存:audit(approve) 在状态更新后调用 refreshStaticLockCache,回源并写回缓存(不是只删除),因此审核接口返回时缓存已包含新任务;reject 同样重建(移除该任务)。finish/cancel/batchDelete 亦为重建(移除对应任务,其它任务仍保留)。",
|
||||
"窗口评估:① 审核前查询到「未锁定」属于正确语义(审核未生效);② 审核接口返回后不存在旧缓存窗口;③ 若重建失败(Redis 异常等)会降级删除缓存并在日志留 warn,下一次查询回源,最坏 300 秒自愈;④ 仅 Redis 整体不可用时多实例的进程内缓存可能短暂不一致(各自最长 300 秒),该场景建议库存操作按 fail-safe(保守判定为锁定)处理。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 调整/新增——审核后缓存已重建且查询命中(cached=true)、完成后重建缓存不包含该任务、取消后重建不包含该任务、空仓库集合缓存(首查回源/二次命中)、5 个并发未命中结果一致且均 cached=false、forceRefresh 强制回源;全量 252 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组仅更新 stock.check.staticLockList(cached 字段说明 + 缓存设计 notes + 本次策略答疑);根版本 0.3.313 → 0.3.314、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位);其余 method 未改动。",
|
||||
"代码依据:app/service/systems/stock_check.js#staticLockList/#_readStaticLockCache/#_loadStaticLockCache/#_queryStaticLockRows/#refreshStaticLockCache/#clearStaticLockCache。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.313",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "库存盘点完成(stock.check.finish)立即释放静态盘点锁定:清除仓库级锁定缓存并返回 released_stock_ids(本任务覆盖的商品ID),同一商品若仍被其它静态任务覆盖则继续锁定。",
|
||||
"methods": [
|
||||
"stock.check.finish"
|
||||
],
|
||||
"notes": [
|
||||
"需求:盘点完成时商品必须立刻解除锁定,不能等到缓存 TTL(300 秒)自然过期,否则完成后的出入库仍会被 staticLockList / isStockStaticLocked 判为锁定中。",
|
||||
"实现:finish 在状态置 completed 后调用 clearStaticLockCache(warehouseId) 删除 `stock_check:static_lock:{warehouseId}`(Redis 与进程内缓存同时清理,失败仅 warn 日志,靠 TTL 兜底);并在状态更新前用 _collectGoodsStockIds 记录本任务商品明细覆盖的 stock_id,随响应 released_stock_ids 返回、随操作日志 extras.releasedStockIds 落库,便于追溯「哪张单释放了哪些商品」。",
|
||||
"多任务叠加:锁定集合是「全部 approved/checking 静态任务的并集」,完成其中一张单只会移除该单贡献的商品;若商品仍被其它静态任务覆盖,缓存回源后依旧锁定(正确行为)。",
|
||||
"其它释放路径:cancel(取消)与 batchDelete(作废删除)同样会清除缓存;audit(approve/reject)清除缓存使锁定集合及时更新;report 仅 approved→checking 流转,不改变锁定集合、不失效。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 新增「完成盘点立即释放锁定」用例——构造独有商品 → 审核通过后 isStockStaticLocked=true → finish 返回 released_stock_ids=[该商品] 且缓存已清 → isStockStaticLocked=false(回源);全量 251 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组仅更新 stock.check.finish(响应新增 released_stock_ids、notes 补充释放口径);根版本 0.3.312 → 0.3.313、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位);其余 method 未改动。",
|
||||
"代码依据:app/service/systems/stock_check.js#finish/#_collectGoodsStockIds/#clearStaticLockCache、app/service/systemMethods/stock/check.js#finish、app/extend/application.js#delCacheAsync。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.312",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "库存盘点新增公共查询 stock.check.staticLockList(静态盘点锁定中的商品清单,按仓库缓存,供库存操作前置判断);stock.check.audit 审核通过时刷新商品明细账面快照(快照基准以「审核完成=开始盘点」时点为准)并返回 snapshot_refreshed,同时失效/进入静态锁定缓存。",
|
||||
"methods": [
|
||||
"stock.check.staticLockList",
|
||||
"stock.check.audit",
|
||||
"stock.check.submit"
|
||||
],
|
||||
"notes": [
|
||||
"新增方法 stock.check.staticLockList:返回 is_static=1 且状态为 approved/checking 的任务所覆盖的商品 stock_id 集合(rows 附带来源任务ID/单号/库位编码),供出入库、移库、拣货等库存操作判断商品是否被静态盘点锁定;库位盘点任务 is_static 恒为 0,不参与锁定。",
|
||||
"锁定时机:审核完成(approved)即开始锁定、盘点作业中(checking)持续锁定;提交审核前不锁定;completed/cancelled/rejected 解锁。",
|
||||
"缓存:键 `stock_check:static_lock:{warehouseId}`,TTL 300 秒,走 app.setCacheAsync/getCacheAsync(Redis 优先、异常降级进程内缓存);audit/finish/cancel/batchDelete 主动失效;响应含 cached(是否命中)与 updated_at(缓存生成时间)。",
|
||||
"内部接口 isStockStaticLocked({ warehouseId, stockId }):读同一份缓存做单/多商品命中判断,返回 { locked, locked_stock_ids, rows, cached },供库存模块直接调用(systemMethods 层未暴露)。",
|
||||
"audit 刷新快照:approve 时把 scope_type=goods 明细行 system_quantity 刷新为该库位当前账面 SUM(available_quantity+locked_quantity)(仅统计启用存储,无记录按 0),覆盖「提交审核 → 审核完成」之间发生的出入库,保证账面基准=开始盘点时点;返回 snapshot_refreshed=本次刷新的明细行数(值无变化不计)。submit 的提交时刷新逻辑不变,两者叠加后以审核时点为准。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 新增「staticLockList 静态盘点锁定商品(公共查询 + 缓存 + 审核刷新快照)」5 个用例——锁定口径(仅 approved/checking、submitted 与非静态任务不计入)、缓存命中与 audit/finish/cancel 主动失效、isStockStaticLocked 单商品判断与参数校验、审核刷新快照(提交后库存 +5,审核后快照等于审核时点账面,并回滚人为变更)、方法层仓库注入与 cached 透出;全量 250 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组新增 stock.check.staticLockList 一条(共 26 条),并更新 stock.check.audit(响应新增 snapshot_refreshed、notes 补充刷新口径与缓存失效)与 stock.check.submit(notes 补充审核再刷新说明);根版本 0.3.311 → 0.3.312、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位)。",
|
||||
"代码依据:app/service/systems/stock_check.js#staticLockList/#isStockStaticLocked/#clearStaticLockCache/#_refreshGoodsBookSnapshot/#audit、app/service/systemMethods/stock/check.js#staticLockList、app/extend/application.js#setCacheAsync/#getCacheAsync/#delCacheAsync。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.311",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "库存盘点 is_static(是否静态盘点)口径收窄:仅商品盘点(type=store/goods)有效,按库位盘点(type=location)一律为 0(create 传入 1/true 也忽略),静态定式(pattern=static)仅商品类任务自动置 1。",
|
||||
"methods": [
|
||||
"stock.check.create",
|
||||
"stock.check.patternCreate",
|
||||
"stock.check.list",
|
||||
"stock.check.detail"
|
||||
],
|
||||
"notes": [
|
||||
"口径说明:静态盘点针对「长期停收停发商品」,只对商品盘点(type=store/goods)有意义;库位盘点是按库位清点全部商品,不存在静态商品概念,因此 is_static 恒为 0,避免前端误把全仓库位盘点标成静态。",
|
||||
"create(本次修正):normalizedIsStatic = (type === 'location') ? 0 : (requested ? 1 : 0)——库位盘点即使传 is_static=1/true 也落库 0 且不报错(保持向后兼容、不新增 400);商品盘点沿用原归一化规则(true/'true'/1/'1' 记为 1,其余 0)。",
|
||||
"patternCreate(本次修正):is_static = (pattern.id === 'static' && pattern.type !== 'location') ? 1 : 0——静态定式为商品类(type=goods)恒为 1;库位类定式(empty_location)与其它商品定式(mis_shipment/expiring/warning)均为 0。",
|
||||
"响应口径:create/patternCreate 返回的 check、detail 的 check、list 的行对象均为 is_static(number,0|1);库位盘点任务读取时恒为 0。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 的「is_static 静态标记」用例扩展——新增 type=location 传 is_static=1/true/'true' 均返回并落库 0 的断言;全量 245 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组更新 stock.check.create(is_static 参数说明补充「仅商品盘点有效」+响应字段文案+notes)、stock.check.patternCreate(静态定式口径+notes)、stock.check.list / stock.check.detail(返回口径 notes);根版本 0.3.310 → 0.3.311、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位);其余 method 未改动。",
|
||||
"代码依据:app/service/systems/stock_check.js#create/#patternCreate、app/service/systemMethods/stock/check.js#create、app/model/stock_check.js(is_static)。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.310",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "库存盘点主表新增 is_static(是否静态盘点)标记:stock.check.create 支持入参 is_static(兼容 isStatic 驼峰与布尔/字符串写法),静态盘点定式(pattern=static)创建的任务自动置 1;stock.check.list / stock.check.detail / stock.check.patternCreate 返回该字段(0=普通盘点、1=静态盘点)。",
|
||||
"methods": [
|
||||
"stock.check.create",
|
||||
"stock.check.list",
|
||||
"stock.check.detail",
|
||||
"stock.check.patternCreate"
|
||||
],
|
||||
"notes": [
|
||||
"需求背景:盘点任务需要区分「静态盘点」(针对长期停收停发商品的盘点)与普通盘点,原主表只有 type/mode/status,无法在列表/详情上识别任务来源与性质,静态定式创建的任务与手工任务混在一起。",
|
||||
"库表变更:database/migrations/20261028010000-add-is-static-to-stock-check.js 给 wms_stock_check 新增 is_static(TINYINT(1) NOT NULL DEFAULT 0,注释「是否静态盘点(1=静态盘点(静态定式创建或创建时开启),0=普通盘点)」,位于 store_id 之后);存量数据默认 0,无需回填;down 迁移删除该列。",
|
||||
"create 入参(新增):is_static 可选,纯标记——true / 'true' / 1 / '1' 记为 1,其余(含缺省、0、'false'、空串)记为 0;兼容 isStatic 驼峰写法;不参与模式强制(type=location 仍强制 blind)、状态机与差异计算;操作日志 STOCK_CHECK_CREATE 的 changeSummary/extras 追加静态标记。",
|
||||
"patternCreate(自动判定):pattern_id=static 的任务 is_static=1,其余定式(empty_location/mis_shipment/expiring/warning)为 0;日志同样带「静态盘点」字样。",
|
||||
"响应字段:create/detail/patternCreate 的 check(_formatCheckRow 口径)与 list 的行对象均返回 is_static(number,0|1);list 未新增 is_static 筛选条件。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 新增「is_static 静态标记」用例(缺省 0、isStatic=1 落库 1、detail/list 返回、方法层 is_static/isStatic 透传、0/'false'/空串/false 记 0),并在 static/warning 定式用例中断言 1/0;全量 245 用例通过、ESLint 0 错误;迁移已在本地开发库执行(information_schema 校验列存在)。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组更新 stock.check.create(新增 is_static 参数 + 响应字段说明 + notes)、stock.check.list(rows 返回字段 + notes)、stock.check.detail(check 返回字段 + notes)、stock.check.patternCreate(静态定式自动置 1 + notes);根版本 0.3.309 → 0.3.310、updatedAt 2026-10-28;methods/changes/system.json 新增本条(插入数组首位);其余 method 未改动。",
|
||||
"代码依据:app/model/stock_check.js(is_static 字段)、app/service/systems/stock_check.js#create/#patternCreate/#_formatCheckRow、app/service/systemMethods/stock/check.js#create、database/migrations/20261028010000-add-is-static-to-stock-check.js。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.309",
|
||||
"date": "2026-10-28",
|
||||
"type": "updated",
|
||||
"summary": "库存盘点作业数据商品视图改为按商品汇总:stock.check.workData(goods 视图)同商品多库位明细合并为一行且行级不再返回 detail_id;stock.check.workDataDetail 改为传 id + stock_id 返回 summary 汇总 + rows 按库位分行(明细ID/库位ID/账面快照/实盘/差异);stock.check.report 的 detail_id 改为可选,缺失时按 id + stock_id + space_id 反查明细。",
|
||||
"methods": [
|
||||
"stock.check.workData",
|
||||
"stock.check.workDataDetail",
|
||||
"stock.check.report"
|
||||
],
|
||||
"notes": [
|
||||
"问题现象:goods 视图同一 stock_id 出现多条 detail_id(如盘点单里 stock_id=143270 出现 5 行、160240 出现 2 行),各行商品信息与 locations 库位列表完全相同,但行级 system_quantity/checked_quantity 只反映其中一条库位明细(该明细下作业记录),前端无法区分行间差异,跨行求和还会重复计数。",
|
||||
"根因:商品盘点明细按「商品+库位」拆行落库(wms_stock_check_detail 唯一键 uk_check_stock_location = check_id+stock_id+location_id,addDetail 为该商品每个启用库存库位生成一行,system_quantity 为对应库位账面快照),而 _buildGoodsWorkRows 原以明细行为列表输出;locations 却按 stock_id 整商品计算,导致同商品多行内容高度重复而数量各管一个库位。",
|
||||
"workData(goods 视图)改造:app/service/systems/stock_check.js#_buildGoodsWorkRows 先按 stock_id 分组(分组顺序沿用明细 id 升序,stock_id 为空/异常的明细行各自成行),再按组合并输出——行级 system_quantity=各库位明细行 system_quantity 之和、作业记录跨该商品全部明细合并后按库位编码聚合、checked_quantity/diff_quantity/is_diff 按合并后合计计算(无作业记录时差异仍恒 0);行级不再返回 detail_id/detail_ids(汇总行无单一明细语义),改为 locations 每项返回 detail_id(该库位盘点明细ID,供逐库位上报/删除)与 snapshot_quantity(该库位账面快照,明盘)。",
|
||||
"workDataDetail 改造:商品分支入参改为 id(盘点任务ID)+ stock_id(商品库存ID,兼容 stockId),返回 { check_id, stock_id, 商品信息, summary, rows }——summary 为商品级 system_quantity(账面快照合计)/checked_quantity(实盘合计)/diff_quantity/is_diff;rows 每个库位一行,含 detail_id、location_id 与同义 space_id(可直接回传 report)、location_code、system_quantity(该库位当前账面=可用+锁定)、locked_quantity、snapshot_quantity(该库位账面快照)、checked_quantity(该库位实盘)、diff_quantity(实盘-快照)与 checked_at/checker_name/record_ids/images;盲盘不返回 summary 与任何数量字段;库位明细(detail_id 指向 scope_type=location 行)分支与原返回结构不变;传商品范围 detail_id 仍可用(服务端按明细商品解析 id + stock_id)。",
|
||||
"report 兼容改造:detail_id 改为可选——未传时按 id + stock_id + space_id 反查明细(先命中 location_id=space_id 的该商品明细,未命中取该商品任一明细),反查不到报 400「盘点明细不存在(该商品不在本任务盘点范围内,或库位盘点任务需传 detail_id)」;既无 detail_id 也无 stock_id 仍报 400「盘点明细ID不能为空」;落库与覆盖式查重口径不变(作业记录仍挂 detail_id)。",
|
||||
"响应兼容性(破坏性提示):① workData goods 视图行不再返回 detail_id/detail_ids,按明细操作(detailDelete 等)需改用 locations[].detail_id 或 workDataDetail rows[].detail_id;② workDataDetail 商品分支返回结构由「goods 视图单行」变为「summary + rows」钻取结构,旧前端读取 locations/checked_quantity 的代码需改读 summary/rows;③ 商品任务 workData goods 视图 total/rows 由「库位明细行数」变为「商品行数」(与主表 total_items 按商品计数一致)。",
|
||||
"测试:test/app/service/systems/stock_check.test.js 新增/改写——「goods 视图多库位商品按商品汇总为一行」(两库位分别上报后断言 total=1、行级快照合计、跨明细合并实盘与 record_ids、locations 带 detail_id/snapshot_quantity)、「workDataDetail 商品钻取(summary + rows,含库位ID/明细ID/账面快照/实盘/差异)」「商品钻取盲盘不返回数量字段」「report 不传 detail_id 按 id + stock_id + space_id 反查上报」「方法层 stock_id/stockId/detail_id 兼容」;全量 244 用例通过、ESLint 0 错误。",
|
||||
"文档变更范围:methods/system.json 的 module=stock.check 分组更新 stock.check.workData(description/response.rows/notes 的商品视图口径与 locations 新字段)、stock.check.workDataDetail(params 改为 id/stock_id/detail_id 三选、description/response.data/notes 改为 summary+rows 钻取结构)、stock.check.report(detail_id 必填改可选 + stock_id 反查说明);根版本 0.3.308 → 0.3.309、updatedAt 2026-10-27 → 2026-10-28;methods/changes/system.json 新增本条(插入数组首位);其余 method 未改动。",
|
||||
"代码依据:app/service/systems/stock_check.js#_buildGoodsWorkRows/#workData/#workDataDetail/#_formatGoodsWorkDetail/#report、app/service/systemMethods/stock/check.js#workData/#workDataDetail/#report、app/model/stock_check_detail.js(uk_check_stock_location)。"
|
||||
]
|
||||
},
|
||||
{
|
||||
"version": "0.3.308",
|
||||
"date": "2026-10-27",
|
||||
|
||||
File diff suppressed because one or more lines are too long
182
script/stock-check-goods-summary-verify.cjs
Normal file
182
script/stock-check-goods-summary-verify.cjs
Normal file
@ -0,0 +1,182 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 开发环境实测脚本:盘点商品视图汇总 + workDataDetail 商品钻取 + report 免 detail_id。
|
||||
*
|
||||
* 直连本地开发库(config.local.js,127.0.0.1:3307),全程走 systemMethods 方法层(含统一 success 包装),
|
||||
* 完整复现一条盘点到上报链路:
|
||||
* 1. 取一个多库位库存商品(模拟同 stock_id 多条库位明细);
|
||||
* 2. create → addDetail → submit → audit(approve);
|
||||
* 3. report 只传 id + stock_id + space_id(不传 detail_id),验证反查明细;
|
||||
* 4. workData(is_goods=true) 校验商品视图汇总(行级无 detail_id、locations 带 detail_id/snapshot_quantity);
|
||||
* 5. workDataDetail(id + stock_id) 校验 summary + 按库位分行(明细ID/库位ID/账面快照/实盘/差异);
|
||||
* 6. 交叉校验明细快照合计 = goods 行级账面 = summary 账面,分行实盘合计 = 行级实盘 = summary 实盘。
|
||||
*
|
||||
* 数据策略:脚本会在开发库新建一条盘点任务(单号 PD+日期+序号,标题以「实测_商品汇总_」开头)
|
||||
* 作为核对样张保留,不做清理;不要在预发/生产库执行。
|
||||
*
|
||||
* 用法:node script/stock-check-goods-summary-verify.cjs
|
||||
*/
|
||||
|
||||
const mm = require('egg-mock');
|
||||
|
||||
const WAREHOUSE_ID = 100000;
|
||||
const CREATOR_ID = 4;
|
||||
const CREATOR_NAME = '阿猫';
|
||||
|
||||
function log(title, payload) {
|
||||
console.log(`\n===== ${title} =====`);
|
||||
console.log(typeof payload === 'string' ? payload : JSON.stringify(payload, null, 2));
|
||||
}
|
||||
|
||||
(async () => {
|
||||
const app = mm.app({
|
||||
baseDir: process.cwd(),
|
||||
env: 'local',
|
||||
clean: false,
|
||||
cache: false,
|
||||
});
|
||||
await app.ready();
|
||||
const ctx = app.createAnonymousContext();
|
||||
ctx.user = { id: CREATOR_ID, store_id: WAREHOUSE_ID, employees_name: CREATOR_NAME };
|
||||
const { Op, literal } = app.Sequelize;
|
||||
|
||||
const validSpaceSql = '(SELECT ls.id FROM wms_location_space ls '
|
||||
+ 'JOIN wms_location_zone z ON z.id = ls.zone_id AND z.deleted_at IS NULL '
|
||||
+ 'WHERE ls.deleted_at IS NULL)';
|
||||
|
||||
try {
|
||||
// 1. 找一个在两个及以上有效库位都有库存的商品(模拟生产里同 stock_id 多库位明细的场景)
|
||||
const storageRows = await ctx.model.Storage.findAll({
|
||||
where: {
|
||||
warehouse_id: WAREHOUSE_ID,
|
||||
is_enabled: 1,
|
||||
space_id: { [Op.in]: literal(validSpaceSql) },
|
||||
},
|
||||
attributes: [ 'stock_id', 'space_id', [ literal('SUM(available_quantity + locked_quantity)'), 'qty' ]],
|
||||
group: [ 'stock_id', 'space_id' ],
|
||||
raw: true,
|
||||
});
|
||||
const spacesByStock = new Map();
|
||||
for (const row of storageRows) {
|
||||
const stockId = Number(row.stock_id);
|
||||
if (!spacesByStock.has(stockId)) {
|
||||
spacesByStock.set(stockId, []);
|
||||
}
|
||||
spacesByStock.get(stockId).push(row);
|
||||
}
|
||||
const multiEntry = [ ...spacesByStock.entries() ]
|
||||
.filter(([ , rows ]) => rows.length >= 2)
|
||||
.sort((left, right) => left[0] - right[0])[0];
|
||||
if (!multiEntry) {
|
||||
throw new Error('开发库中未找到多库位库存商品,无法实测汇总口径');
|
||||
}
|
||||
const [ stockId, stockSpaces ] = multiEntry;
|
||||
const stock = await ctx.model.StockWarehouse.findOne({ where: { id: stockId, warehouse_id: WAREHOUSE_ID }, raw: true });
|
||||
log('1. 选中的多库位商品', {
|
||||
stock_id: stockId,
|
||||
item_code: stock.item_code,
|
||||
item_name: stock.item_name,
|
||||
store_id: stock.store_id,
|
||||
spaces: stockSpaces.map(row => ({ space_id: Number(row.space_id), qty: Number(row.qty) })),
|
||||
});
|
||||
|
||||
// 2. 创建任务 → 添加明细 → 提交 → 审核(走方法层,含 success 包装)
|
||||
const created = await ctx.service.systemMethods.stock.check.create({
|
||||
title: `实测_商品汇总_${Date.now()}`,
|
||||
type: 'goods',
|
||||
mode: 'open',
|
||||
store_id: stock.store_id || undefined,
|
||||
});
|
||||
if (created.flag !== 'success') {
|
||||
throw new Error(`create 失败: ${created.message}`);
|
||||
}
|
||||
const checkId = Number(created.data.id);
|
||||
|
||||
const added = await ctx.service.systemMethods.stock.check.addDetail({ id: checkId, stock_ids: [ stockId ] });
|
||||
console.log(`\n2. 任务创建 ${created.data.check_no}(id=${checkId}),添加明细:added=${added.data.added} skipped=${added.data.skipped}`);
|
||||
|
||||
await ctx.service.systemMethods.stock.check.submit({ id: checkId });
|
||||
const audited = await ctx.service.systemMethods.stock.check.audit({ id: checkId, action: 'approve' });
|
||||
if (audited.flag !== 'success') {
|
||||
throw new Error(`audit 失败: ${JSON.stringify(audited)}`);
|
||||
}
|
||||
|
||||
const detailRows = await ctx.model.StockCheckDetail.findAll({
|
||||
where: { check_id: checkId, scope_type: 'goods' },
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
});
|
||||
log('3. 明细行(商品按库位拆行,账面快照逐库位)', detailRows.map(row => ({
|
||||
detail_id: Number(row.id),
|
||||
stock_id: Number(row.stock_id),
|
||||
location_id: Number(row.location_id),
|
||||
location_code: row.location_code,
|
||||
system_quantity: Number(row.system_quantity),
|
||||
})));
|
||||
|
||||
// 4. report 免 detail_id:只传 id + stock_id + space_id(goods 汇总视图行不再带明细ID)
|
||||
const reportTargets = detailRows.slice(0, 2);
|
||||
for (const [ index, detailRow ] of reportTargets.entries()) {
|
||||
const reported = await ctx.service.systemMethods.stock.check.report({
|
||||
id: checkId,
|
||||
stock_id: stockId,
|
||||
space_id: Number(detailRow.location_id),
|
||||
quantity: index === 0 ? 7 : 3,
|
||||
});
|
||||
log(`4.${index + 1} report 免 detail_id(space_id=${detailRow.location_id})`, {
|
||||
flag: reported.flag,
|
||||
code: reported.code,
|
||||
message: reported.message,
|
||||
resolved_detail_id: reported.data && reported.data.detail_id,
|
||||
record: reported.data && {
|
||||
id: reported.data.record.id,
|
||||
detail_id: reported.data.record.detail_id,
|
||||
stock_id: reported.data.record.stock_id,
|
||||
location_id: reported.data.record.location_id,
|
||||
location_code: reported.data.record.location_code,
|
||||
quantity: reported.data.record.quantity,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
// 5. workData goods 视图:一个商品一行,行级无 detail_id,locations 带 detail_id/snapshot_quantity
|
||||
const workData = await ctx.service.systemMethods.stock.check.workData({ id: checkId, is_goods: true });
|
||||
const goodsRow = workData.data.rows[0];
|
||||
log('5. workData(is_goods=true) 商品视图行', {
|
||||
view: workData.data.view,
|
||||
total: workData.data.total,
|
||||
row: goodsRow,
|
||||
});
|
||||
console.log(' → 行级是否含 detail_id:', Object.prototype.hasOwnProperty.call(goodsRow, 'detail_id'));
|
||||
|
||||
// 6. workDataDetail 商品钻取:id + stock_id → summary + rows
|
||||
const drill = await ctx.service.systemMethods.stock.check.workDataDetail({ id: checkId, stock_id: stockId });
|
||||
log('6. workDataDetail(id + stock_id) 商品钻取', {
|
||||
flag: drill.flag,
|
||||
data: drill.data,
|
||||
});
|
||||
|
||||
// 7. 口径交叉校验
|
||||
const snapshotTotal = detailRows.reduce((sum, row) => sum + Number(row.system_quantity), 0);
|
||||
const rowsChecked = drill.data.rows.reduce((sum, row) => sum + Number(row.checked_quantity), 0);
|
||||
log('7. 口径交叉校验', {
|
||||
明细快照合计: snapshotTotal,
|
||||
'goods 行级 system_quantity': goodsRow.system_quantity,
|
||||
'goods 行级 checked_quantity': goodsRow.checked_quantity,
|
||||
'drill.summary.system_quantity': drill.data.summary.system_quantity,
|
||||
'drill.summary.checked_quantity': drill.data.summary.checked_quantity,
|
||||
'drill.rows 实盘合计': rowsChecked,
|
||||
'locations[].detail_id': goodsRow.locations.map(item => ({ code: item.location_code, detail_id: item.detail_id, snapshot: item.snapshot_quantity })),
|
||||
一致: snapshotTotal === goodsRow.system_quantity
|
||||
&& goodsRow.system_quantity === drill.data.summary.system_quantity
|
||||
&& goodsRow.checked_quantity === drill.data.summary.checked_quantity
|
||||
&& rowsChecked === drill.data.summary.checked_quantity,
|
||||
});
|
||||
} finally {
|
||||
await app.close();
|
||||
}
|
||||
})().catch(error => {
|
||||
console.error('实测失败:', error && error.stack || error);
|
||||
process.exit(1);
|
||||
});
|
||||
350
test/app/service/systems/static_lock_guard.test.js
Normal file
350
test/app/service/systems/static_lock_guard.test.js
Normal file
@ -0,0 +1,350 @@
|
||||
'use strict';
|
||||
|
||||
const assert = require('node:assert/strict');
|
||||
const Sequelize = require('sequelize');
|
||||
const InventoryService = require('../../../../app/service/systems/storage/inventory');
|
||||
const OrderStorageAllocationService = require('../../../../app/service/systems/order_storage_allocation');
|
||||
|
||||
/**
|
||||
* 构造锁定冲突桩(模拟 stock_check.getStaticLockConflict)。
|
||||
*
|
||||
* @param {boolean} locked 是否锁定。
|
||||
* @return {Object} 桩服务。
|
||||
*/
|
||||
function createStockCheckStub(locked) {
|
||||
const calls = [];
|
||||
return {
|
||||
calls,
|
||||
async getStaticLockConflict(params = {}) {
|
||||
calls.push(params);
|
||||
if (!locked) {
|
||||
return { locked: false, rows: [], message: '' };
|
||||
}
|
||||
return {
|
||||
locked: true,
|
||||
rows: [{ stock_id: 301, item_code: 'LOCKED-ITEM', check_nos: [ 'PD20261028000001' ], check_ids: [ 1 ] }],
|
||||
message: '商品正在静态盘点中,禁止移库:LOCKED-ITEM(301) 盘点单 PD20261028000001',
|
||||
};
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 创建移库(transferLocation)测试上下文。
|
||||
*
|
||||
* @param {boolean} locked 静态盘点是否锁定。
|
||||
* @return {Object} { service, captures, stockCheck }。
|
||||
*/
|
||||
function createTransferLocationHarness(locked) {
|
||||
const captures = { rollbacks: 0, commits: 0, storageUpdates: 0, storageTransactions: 0 };
|
||||
const stockCheck = createStockCheckStub(locked);
|
||||
const srcRecord = {
|
||||
id: 11,
|
||||
warehouse_id: 100000,
|
||||
store_id: 100001,
|
||||
space_id: 21,
|
||||
stock_id: 301,
|
||||
batch_no: 'B1',
|
||||
inventory_type: 'ZP',
|
||||
quantity: 10,
|
||||
locked_quantity: 0,
|
||||
intercept_locked_quantity: 0,
|
||||
available_quantity: 10,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
};
|
||||
|
||||
const ctx = {
|
||||
app: { Sequelize },
|
||||
logger: { info() {}, warn() {}, error() {} },
|
||||
user: { employees_id: 'E1', employees_name: '测试员' },
|
||||
model: {
|
||||
async transaction() {
|
||||
return {
|
||||
LOCK: { UPDATE: 'UPDATE' },
|
||||
async commit() { captures.commits += 1; },
|
||||
async rollback() { captures.rollbacks += 1; },
|
||||
};
|
||||
},
|
||||
Storage: {
|
||||
async findOne() {
|
||||
return srcRecord;
|
||||
},
|
||||
async update() {
|
||||
captures.storageUpdates += 1;
|
||||
},
|
||||
async count() {
|
||||
return 0;
|
||||
},
|
||||
async findAll() {
|
||||
return [ srcRecord ];
|
||||
},
|
||||
async create() {
|
||||
return srcRecord;
|
||||
},
|
||||
},
|
||||
StockWarehouse: {
|
||||
async findOne() {
|
||||
return { id: 301, quantity: 10, locked_quantity: 0, warehouse_id: 100000, is_batch_mgmt: 'N' };
|
||||
},
|
||||
},
|
||||
LocationSpace: {
|
||||
async findOne() {
|
||||
return { id: 22, warehouse_id: 100000, is_enabled: true, space_status: 'AVAILABLE', space_code: 'A-22' };
|
||||
},
|
||||
async update() { return null; },
|
||||
},
|
||||
StorageTransaction: {
|
||||
async create() {
|
||||
captures.storageTransactions += 1;
|
||||
return { id: 1 };
|
||||
},
|
||||
},
|
||||
},
|
||||
service: {
|
||||
systems: {
|
||||
stockCheck,
|
||||
operationLog: { async createOperationLog() { return null; } },
|
||||
notice: { async send() { return null; } },
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
return { service: new InventoryService(ctx), captures, stockCheck };
|
||||
}
|
||||
|
||||
describe('静态盘点锁定拦截:分配储位 / 移库', () => {
|
||||
it('transferLocation:商品静态盘点中 → 400、事务回滚、不写库存', async () => {
|
||||
const { service, captures, stockCheck } = createTransferLocationHarness(true);
|
||||
const result = await service.transferLocation({ storage_id: 11, target_space_id: 22, quantity: 1 });
|
||||
|
||||
assert.equal(result.code, 400);
|
||||
assert.match(result.message, /静态盘点/);
|
||||
assert.match(result.message, /PD20261028000001/);
|
||||
assert.equal(captures.rollbacks, 1, '命中锁定应回滚事务');
|
||||
assert.equal(captures.storageUpdates, 0, '不应更新库存');
|
||||
assert.equal(captures.storageTransactions, 0, '不应写库存流水');
|
||||
assert.equal(stockCheck.calls.length, 1, '应调用一次锁定校验');
|
||||
assert.deepEqual(stockCheck.calls[0].stockIds, [ 301 ]);
|
||||
assert.equal(stockCheck.calls[0].actionLabel, '移库');
|
||||
});
|
||||
|
||||
it('transferByProduct:商品静态盘点中 → 400、事务回滚、不写库存', async () => {
|
||||
const { service, captures } = createTransferLocationHarness(true);
|
||||
const result = await service.transferByProduct({ space_id: 21, stock_id: 301, target_space_id: 22, quantity: 2 });
|
||||
|
||||
assert.equal(result.code, 400);
|
||||
assert.match(result.message, /静态盘点/);
|
||||
assert.equal(captures.rollbacks, 1);
|
||||
assert.equal(captures.storageUpdates, 0);
|
||||
assert.equal(captures.storageTransactions, 0);
|
||||
});
|
||||
|
||||
it('未锁定时移库不拦截(保持原有可用量校验路径)', async () => {
|
||||
const { service, stockCheck } = createTransferLocationHarness(false);
|
||||
const result = await service.transferByProduct({ space_id: 21, stock_id: 301, target_space_id: 22, quantity: 99 });
|
||||
|
||||
assert.equal(result.code, 400);
|
||||
assert.match(result.message, /可用数量不足/, '未锁定时进入原有校验分支');
|
||||
assert.equal(stockCheck.calls.length, 1);
|
||||
});
|
||||
|
||||
/**
|
||||
* 创建储位分配测试上下文(可含多个订单,模拟批量分配)。
|
||||
*
|
||||
* @param {Object} options 配置。
|
||||
* @param {boolean} options.locked 静态盘点是否锁定。
|
||||
* @param {Array<Object>} options.orders 订单行。
|
||||
* @param {Array<Object>} options.orderItems 订单明细行。
|
||||
* @param {Array<Object>} options.storageRows 库存行(仅未锁定商品)。
|
||||
* @return {Object} { service, captures, stockCheck }。
|
||||
*/
|
||||
function createAllocateHarness(options = {}) {
|
||||
const captures = {
|
||||
commits: 0,
|
||||
rollbacks: 0,
|
||||
orderUpdates: [],
|
||||
lockCalls: [],
|
||||
pickingRows: [],
|
||||
storageQueries: 0,
|
||||
};
|
||||
const stockCheck = createStockCheckStub(options.locked === true);
|
||||
const storageRows = (options.storageRows || []).map(row => ({ ...row }));
|
||||
|
||||
const ctx = {
|
||||
user: { store_id: 100000, id: 1, employees_id: 'E1', employees_name: '测试员' },
|
||||
logger: { debug() {}, info() {}, warn() {}, error() {} },
|
||||
app: { Sequelize, config: {} },
|
||||
model: {
|
||||
async transaction() {
|
||||
return {
|
||||
LOCK: { UPDATE: 'UPDATE' },
|
||||
async commit() { captures.commits += 1; },
|
||||
async rollback() { captures.rollbacks += 1; },
|
||||
};
|
||||
},
|
||||
OrderDeliveryFactory: {
|
||||
async getCurrentModel() {
|
||||
return {
|
||||
async findAll() {
|
||||
return (options.orders || []).map(row => ({ ...row }));
|
||||
},
|
||||
async update(values, opts = {}) {
|
||||
captures.orderUpdates.push({ values, where: opts.where });
|
||||
return [ 1 ];
|
||||
},
|
||||
};
|
||||
},
|
||||
},
|
||||
OrderItemsFactory: {
|
||||
async getCurrentModel() {
|
||||
return {
|
||||
async findAll() {
|
||||
return (options.orderItems || []).map(row => ({ ...row }));
|
||||
},
|
||||
};
|
||||
},
|
||||
},
|
||||
Picking: {
|
||||
async bulkCreate(rows) {
|
||||
captures.pickingRows.push(...rows.map(row => ({ ...row })));
|
||||
return rows;
|
||||
},
|
||||
async findAll() {
|
||||
return [];
|
||||
},
|
||||
},
|
||||
StockWarehouse: {
|
||||
async findAll() {
|
||||
return [ ...new Set((options.orderItems || []).map(row => Number(row.stock_id))) ].map(id => ({ id }));
|
||||
},
|
||||
},
|
||||
Storage: {
|
||||
async findAll() {
|
||||
captures.storageQueries += 1;
|
||||
return storageRows.map(row => ({ ...row }));
|
||||
},
|
||||
async update() {
|
||||
return [ 1 ];
|
||||
},
|
||||
},
|
||||
StorageTransaction: {
|
||||
async create(payload) {
|
||||
return { id: 1, ...payload };
|
||||
},
|
||||
},
|
||||
},
|
||||
service: {
|
||||
systems: {
|
||||
stockCheck,
|
||||
storage: {
|
||||
index: {
|
||||
async lockQuantity(storageId, quantity) {
|
||||
captures.lockCalls.push({ storageId, quantity });
|
||||
const row = storageRows.find(item => Number(item.id) === Number(storageId));
|
||||
if (row) {
|
||||
row.available_quantity = Number(row.available_quantity) - quantity;
|
||||
row.locked_quantity = Number(row.locked_quantity) + quantity;
|
||||
}
|
||||
return [ 1 ];
|
||||
},
|
||||
async unlockQuantity(storageId, quantity) {
|
||||
const row = storageRows.find(item => Number(item.id) === Number(storageId));
|
||||
if (row) {
|
||||
row.available_quantity = Number(row.available_quantity) + quantity;
|
||||
row.locked_quantity = Number(row.locked_quantity) - quantity;
|
||||
}
|
||||
return [ 1 ];
|
||||
},
|
||||
},
|
||||
},
|
||||
stockStore: {
|
||||
async getStoreWarehousePolicyConfigByStockId() {
|
||||
return { policyConfig: { storage_separation: false, allow_storage_location: true } };
|
||||
},
|
||||
},
|
||||
orderPendingException: {
|
||||
async reversePendingException() {
|
||||
return null;
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
};
|
||||
|
||||
return { service: new OrderStorageAllocationService(ctx), captures, stockCheck };
|
||||
}
|
||||
|
||||
it('allocatePicking 批量分配:锁定商品订单标记失败(同库存不足流程),其余订单照常分配', async () => {
|
||||
const { service, captures, stockCheck } = createAllocateHarness({
|
||||
locked: true,
|
||||
orders: [
|
||||
{ id: 1, warehouse_id: 100000, status: 'padding', storage_status: 'none', intercept_status: null, lock_status: null },
|
||||
{ id: 2, warehouse_id: 100000, status: 'padding', storage_status: 'none', intercept_status: null, lock_status: null },
|
||||
],
|
||||
orderItems: [
|
||||
{ id: 11, order_id: 1, stock_id: 301, plan_qty: 2, order_line_no: 1 },
|
||||
{ id: 12, order_id: 2, stock_id: 302, plan_qty: 3, order_line_no: 1 },
|
||||
],
|
||||
storageRows: [
|
||||
// 仅未锁定商品 302 有可用库存(锁定商品 301 即便有库存也不应被分配)
|
||||
{
|
||||
id: 501, stock_id: 302, space_id: 601, store_id: 100001, batch_no: 'B302', inventory_type: 'ZP',
|
||||
quantity: 10, available_quantity: 10, locked_quantity: 0, intercept_locked_quantity: 0,
|
||||
production_date: null, inbound_time: null,
|
||||
},
|
||||
{
|
||||
id: 502, stock_id: 301, space_id: 602, store_id: 100001, batch_no: 'B301', inventory_type: 'ZP',
|
||||
quantity: 10, available_quantity: 10, locked_quantity: 0, intercept_locked_quantity: 0,
|
||||
production_date: null, inbound_time: null,
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
const result = await service.allocatePicking({ order_ids: [ 1, 2 ], allow_storage_location: true });
|
||||
|
||||
assert.equal(result.code, 200, '批量分配不因单个订单命中锁定而整体失败');
|
||||
assert.deepEqual(result.data.shortage_order_ids, [ 1 ], '锁定商品所在订单计入失败列表');
|
||||
assert.deepEqual(result.data.allocated_order_ids, [ 2 ], '其余订单正常分配');
|
||||
assert.ok(result.data.shortage_messages.some(message => /静态盘点锁定/.test(message)), '失败原因应含静态盘点锁定');
|
||||
assert.ok(result.data.shortage_messages.some(message => /PD20261028000001/.test(message)), '失败原因应含来源盘点单号');
|
||||
|
||||
const lockedOrderResult = result.data.orders.find(item => Number(item.order_id) === 1);
|
||||
assert.equal(lockedOrderResult.status, 'error', '锁定订单状态应为 error');
|
||||
assert.match(lockedOrderResult.shortage_message, /静态盘点锁定/);
|
||||
|
||||
// 订单状态写库:锁定订单 storage_status=error 且 order_flag 带原因
|
||||
const lockedUpdate = captures.orderUpdates.find(item => Number(item.where.id) === 1);
|
||||
assert.equal(lockedUpdate.values.storage_status, 'error');
|
||||
assert.match(String(lockedUpdate.values.order_flag), /静态盘点锁定/);
|
||||
const normalUpdate = captures.orderUpdates.find(item => Number(item.where.id) === 2);
|
||||
assert.equal(normalUpdate.values.storage_status, 'fin', '未锁定订单应正常完成分配');
|
||||
|
||||
// 库存锁定只发生在未锁定商品 302 上,锁定商品 301 一行都不加锁
|
||||
assert.deepEqual(captures.lockCalls, [{ storageId: 501, quantity: 3 }]);
|
||||
assert.equal(captures.pickingRows.length, 1, '仅未锁定订单写拣货行');
|
||||
assert.equal(Number(captures.pickingRows[0].order_id), 2);
|
||||
assert.deepEqual(stockCheck.calls[0].stockIds.slice().sort((left, right) => left - right), [ 301, 302 ]);
|
||||
assert.equal(stockCheck.calls[0].actionLabel, '分配储位');
|
||||
});
|
||||
|
||||
it('allocatePicking 全部订单命中锁定:返回 200 且全部计入失败列表(不中断批量)', async () => {
|
||||
const { service, captures } = createAllocateHarness({
|
||||
locked: true,
|
||||
orders: [
|
||||
{ id: 1, warehouse_id: 100000, status: 'padding', storage_status: 'none', intercept_status: null, lock_status: null },
|
||||
],
|
||||
orderItems: [{ id: 11, order_id: 1, stock_id: 301, plan_qty: 2, order_line_no: 1 }],
|
||||
storageRows: [],
|
||||
});
|
||||
|
||||
const result = await service.allocatePicking({ order_ids: [ 1 ], allow_storage_location: true });
|
||||
|
||||
assert.equal(result.code, 200, '全部命中锁定时仍按批量口径返回 200(与库存不足一致)');
|
||||
assert.deepEqual(result.data.shortage_order_ids, [ 1 ]);
|
||||
assert.deepEqual(result.data.allocated_order_ids, []);
|
||||
assert.equal(result.data.picking_count, 0);
|
||||
assert.equal(captures.lockCalls.length, 0, '不应锁定任何库存');
|
||||
assert.equal(captures.commits, 1, '事务正常提交(订单标记失败但流程完成)');
|
||||
});
|
||||
});
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user