fix(stock.check): space 视图排序仅按 pick_sequence,priority 与 id 不参与(0.3.258)

This commit is contained in:
liufumingren 2026-10-09 22:18:39 +08:00
parent 9d3c6b31fd
commit e4472e2c74
3 changed files with 30 additions and 23 deletions

View File

@ -2630,8 +2630,8 @@ class StockCheckService extends Service {
* has_unknown 标记是否含未知商品);
* goods=商品结构,以任务商品范围行(scope_type=goods)为列表,行内挂按库位聚合的作业记录,
* 明盘(mode=open)返回账面快照/已盘合计/差异,盲盘(mode=blind)不返回任何数量字段;
* space=聚合库位列表,以任务商品所在库位为列表(按拣货路径 pick_sequence 升序、
* pick_priority 升序排序,与拣货模块 sort_by 规则一致),行内挂该库位的任务商品与账面/实盘数量,盲盘不返回数量字段;
* space=聚合库位列表,以任务商品所在库位为列表(仅按库位拣货顺序 pick_sequence 升序
* 排序,pick_priority/库位 id 不参与,同值保持库位查询顺序),行内挂该库位的任务商品与账面/实盘数量,盲盘不返回数量字段;
* 若任务无对应范围行(如 location 视图无库位范围行),rows 返回空数组。
* 分页:pagination.{page,pageSize}(与 stock_check.list 口径一致;未传或非法时默认 page=1、
* pageSize=20,上限 200),先构建全量行再按页切片;rows 为当前页行、total 为全部行数,
@ -3303,8 +3303,8 @@ class StockCheckService extends Service {
/**
* 构建 space 视图行:以任务商品(scope_type=goods 的 stock_id 集合)所在的库位为列表。
* 库位集合取 wms_storage(warehouse_id + stock_id 在集合内 + is_enabled=1 且未删除,DISTINCT space_id),
* 库位按拣货路径排序:pick_sequence 升序、pick_priority 升序(同值按库位 id 升序兜底),
* 与拣货模块(pick.js sort_by)排序规则一致;
* 库位仅按拣货顺序排序:pick_sequence 升序(pick_priority/库位 id 不参与排序,
* 同值保持库位查询顺序);
* 行内 goods 为该库位下的任务商品:明盘含 system_quantity(wms_storage space+stock
* SUM(available_quantity+locked_quantity))、locked_quantity(wms_storage space+stock SUM(locked_quantity))
* 与 checked_quantity(该商品在该库位的实盘合计),盲盘不返回任何数量字段;
@ -3395,7 +3395,7 @@ class StockCheckService extends Service {
warehouse_id: Number(warehouseId),
space_code: { [Op.in]: recordLocationCodes },
},
attributes: [ 'id', 'space_code', 'custom_barcode', 'custom_name', 'pick_sequence', 'pick_priority' ],
attributes: [ 'id', 'space_code', 'custom_barcode', 'custom_name', 'pick_sequence' ],
raw: true,
});
for (const row of codeMatchedLocationRows) {
@ -3414,23 +3414,15 @@ class StockCheckService extends Service {
const locationRows = await ctx.model.LocationSpace.findAll({
where: { id: { [Op.in]: spaceIds } },
attributes: [ 'id', 'space_code', 'custom_barcode', 'custom_name', 'pick_sequence', 'pick_priority' ],
attributes: [ 'id', 'space_code', 'custom_barcode', 'custom_name', 'pick_sequence' ],
raw: true,
});
// 库位按拣货路径排序:pick_sequence 升序、pick_priority 升序(同值按库位 id 升序兜底),
// 与拣货模块(pick.js sort_by:[ pick_sequence, pick_priority, space_id, item_code ])一致
const sortedLocations = locationRows.sort((left, right) => {
const sequenceDiff = Number(left.pick_sequence || 0) - Number(right.pick_sequence || 0);
if (sequenceDiff !== 0) {
return sequenceDiff;
}
const priorityDiff = Number(left.pick_priority || 0) - Number(right.pick_priority || 0);
if (priorityDiff !== 0) {
return priorityDiff;
}
return Number(left.id) - Number(right.id);
});
// 库位仅按拣货顺序排序:pick_sequence 升序(pick_priority/库位 id 不参与排序,
// 同值保持库位查询顺序,依赖 Array.sort 稳定排序)
const sortedLocations = locationRows.sort((left, right) =>
Number(left.pick_sequence || 0) - Number(right.pick_sequence || 0)
);
// 库位商品账面/锁定映射(键 `${space_id}_${stock_id}`)
const storageQuantityMap = new Map();

View File

@ -1,4 +1,19 @@
[
{
"version": "0.3.258",
"date": "2026-10-09",
"type": "updated",
"summary": "stock.check.workData / workDataSpaceDetails 空间视图库位排序修正:仅按库位拣货顺序 pick_sequence 升序排序,pick_priority 与库位 id 均不参与(同值保持库位查询顺序)(0.3.257 → 0.3.258)",
"methods": [
"stock.check.workData",
"stock.check.workDataSpaceDetails"
],
"notes": [
"变更内容:space 视图库位排序在 0.3.257(对齐拣货模块 sort_by,pick_sequence 升序 + pick_priority 升序 + 库位 id 兜底)基础上修正为仅按库位拣货顺序排序——pick_sequence 升序,pick_priority 与库位 id 均不参与排序(同值保持库位查询顺序,依赖 Array.sort 稳定排序);行内 goods 排序与分页/过滤行为不变;goods 视图 locations 排序不受影响。",
"代码依据:app/service/systems/stock_check.js#_buildSpaceWorkRows(sortedLocations 比较函数简化为仅 pick_sequence 差值;两处 LocationSpace 查询 attributes 移除 pick_priority;JSDoc 与 workData 方法注释同步);回归测试排序用例改造为两阶段(pick_sequence 升序 + pick_priority 双向设置均不影响顺序),stock_check 全量 228 用例通过、ESLint 0 错误。",
"文档变更范围:methods/system.json 的 module=stock.check 分组仅更新 stock.check.workData 与 stock.check.workDataSpaceDetails 两条(description/notes 同步排序口径);根版本 0.3.257 → 0.3.258、updatedAt 保持 2026-10-09;methods/changes/system.json 新增本条(插入数组首位);其余 22 条 method 未改动(stock.check 分组仍为 24 条)。"
]
},
{
"version": "0.3.257",
"date": "2026-10-09",

File diff suppressed because one or more lines are too long