refactor: stock.transaction 导出列调整为库存变动/锁定变动分离

- 库存变动量(INBOUND/OUTBOUND 有值,LOCK/UNLOCK 为 0)
- 库存变更前/后
- 锁定变动量(计算 after_locked - before_locked,库存流水中为 0)
- 锁定变更前/后
This commit is contained in:
liufumingren 2026-07-17 02:37:54 +08:00
parent 04305fffd6
commit 1537c1ac10

View File

@ -830,27 +830,37 @@ class StockTransactionService extends Service {
);
const safeRows = Array.isArray(rows) ? rows : [];
const excelRows = safeRows.map((item, index) => ({
序号: index + 1,
创建时间: item.created_at ? app.formatDate(item.created_at) : '',
流水类型: item.transaction_type || '',
仓库ID: Number(item.warehouse_id) || 0,
货主ID: Number(item.store_id) || 0,
商品ID: Number(item.stock_id) || 0,
变动数量: Number(item.quantity) || 0,
变更前库存: Number(item.before_quantity) || 0,
变更后库存: Number(item.after_quantity) || 0,
变更前锁定: Number(item.before_locked_quantity) || 0,
变更后锁定: Number(item.after_locked_quantity) || 0,
批次号: item.batch_no || '',
单据类型: item.order_type || '',
单据号: item.order_no || '',
收货单ID: Number(item.receiving_id) || 0,
入库单ID: Number(item.entry_order_id) || 0,
发货单ID: Number(item.order_id) || 0,
操作人: item.operator_name || '',
备注: item.remark || '',
}));
const excelRows = safeRows.map((item, index) => {
const qty = Number(item.quantity) || 0;
const beforeQty = Number(item.before_quantity) || 0;
const afterQty = Number(item.after_quantity) || 0;
const beforeLocked = Number(item.before_locked_quantity) || 0;
const afterLocked = Number(item.after_locked_quantity) || 0;
const lockedChange = afterLocked - beforeLocked;
return {
序号: index + 1,
创建时间: item.created_at ? app.formatDate(item.created_at) : '',
流水类型: item.transaction_type || '',
仓库ID: Number(item.warehouse_id) || 0,
货主ID: Number(item.store_id) || 0,
商品ID: Number(item.stock_id) || 0,
库存变动量: qty,
库存变更前: beforeQty,
库存变更后: afterQty,
锁定变动量: lockedChange,
锁定变更前: beforeLocked,
锁定变更后: afterLocked,
批次号: item.batch_no || '',
单据类型: item.order_type || '',
单据号: item.order_no || '',
收货单ID: Number(item.receiving_id) || 0,
入库单ID: Number(item.entry_order_id) || 0,
发货单ID: Number(item.order_id) || 0,
操作人: item.operator_name || '',
备注: item.remark || '',
};
});
const titleSuffix = isStoreMode ? '货主侧' : '仓库侧';
const warehouseIdForPath = warehouseId || storeId || 'unknown';
@ -869,11 +879,12 @@ class StockTransactionService extends Service {
{ header: '仓库ID', key: '仓库ID' },
{ header: '货主ID', key: '货主ID' },
{ header: '商品ID', key: '商品ID' },
{ header: '变动数量', key: '变动数量' },
{ header: '变更前库存', key: '变更前库存' },
{ header: '变更后库存', key: '变更后库存' },
{ header: '变更前锁定', key: '变更前锁定' },
{ header: '变更后锁定', key: '变更后锁定' },
{ header: '库存变动量', key: '库存变动量' },
{ header: '库存变更前', key: '库存变更前' },
{ header: '库存变更后', key: '库存变更后' },
{ header: '锁定变动量', key: '锁定变动量' },
{ header: '锁定变更前', key: '锁定变更前' },
{ header: '锁定变更后', key: '锁定变更后' },
{ header: '批次号', key: '批次号' },
{ header: '单据类型', key: '单据类型' },
{ header: '单据号', key: '单据号' },