库存报表导出增加新字段
This commit is contained in:
parent
525e222351
commit
7d92522c2f
@ -331,11 +331,17 @@ class StorageReportService extends Service {
|
||||
storeIds = [],
|
||||
spaceIds = [],
|
||||
includeBarcode = false,
|
||||
entryOrderIds = [],
|
||||
orderIds = [],
|
||||
warehouseId = null,
|
||||
} = {}) {
|
||||
const { ctx } = this;
|
||||
const { ctx, app } = this;
|
||||
const normalizedStockIds = [ ...new Set((stockIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedStoreIds = [ ...new Set((storeIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedSpaceIds = [ ...new Set((spaceIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedEntryOrderIds = [ ...new Set((entryOrderIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedOrderIds = [ ...new Set((orderIds || []).map(item => Number(item)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const normalizedWarehouseId = Number(warehouseId);
|
||||
|
||||
// 从 getStockDetails 获取商品名称、条码信息
|
||||
const stockMap = new Map();
|
||||
@ -366,7 +372,7 @@ class StorageReportService extends Service {
|
||||
}
|
||||
}
|
||||
|
||||
const [ storeRows, spaceRows ] = await Promise.all([
|
||||
const [ storeRows, spaceRows, entryOrderRows, orderDeliveryRows, orderExpressRows, storeWarehouseRows ] = await Promise.all([
|
||||
normalizedStoreIds.length > 0
|
||||
? ctx.model.Store.findAll({
|
||||
where: {
|
||||
@ -385,16 +391,87 @@ class StorageReportService extends Service {
|
||||
raw: true,
|
||||
})
|
||||
: [],
|
||||
normalizedEntryOrderIds.length > 0
|
||||
? ctx.model.query(
|
||||
'SELECT id, entry_order_code, express_code, logistics_code, logistics_name, source_type FROM wms_entry_order WHERE id IN (:ids)',
|
||||
{
|
||||
replacements: { ids: normalizedEntryOrderIds },
|
||||
type: app.Sequelize.QueryTypes.SELECT,
|
||||
}
|
||||
)
|
||||
: [],
|
||||
normalizedOrderIds.length > 0
|
||||
? ctx.model.query(
|
||||
'SELECT id, source_order_codes FROM wms_order_delivery WHERE id IN (:ids)',
|
||||
{
|
||||
replacements: { ids: normalizedOrderIds },
|
||||
type: app.Sequelize.QueryTypes.SELECT,
|
||||
}
|
||||
)
|
||||
: [],
|
||||
normalizedOrderIds.length > 0
|
||||
? ctx.model.query(
|
||||
'SELECT order_id, waybill_code FROM wms_order_express WHERE order_id IN (:ids)',
|
||||
{
|
||||
replacements: { ids: normalizedOrderIds },
|
||||
type: app.Sequelize.QueryTypes.SELECT,
|
||||
}
|
||||
)
|
||||
: [],
|
||||
normalizedStoreIds.length > 0 && Number.isInteger(normalizedWarehouseId) && normalizedWarehouseId > 0
|
||||
? ctx.model.StoreWarehouse.findAll({
|
||||
where: {
|
||||
store_id: { [app.Sequelize.Op.in]: normalizedStoreIds },
|
||||
warehouse_id: normalizedWarehouseId,
|
||||
},
|
||||
attributes: [ 'store_id', 'store_remask' ],
|
||||
raw: true,
|
||||
})
|
||||
: [],
|
||||
]);
|
||||
|
||||
const storeMap = new Map((storeRows || []).map(item => [ Number(item.id), item ]));
|
||||
const spaceMap = new Map((spaceRows || []).map(item => [ Number(item.id), item ]));
|
||||
|
||||
// 入库单映射:entry_order_id → { entry_order_code, express_code, logistics_code, logistics_name, source_type }
|
||||
const entryOrderMap = new Map();
|
||||
for (const eo of (Array.isArray(entryOrderRows) ? entryOrderRows : [])) {
|
||||
entryOrderMap.set(Number(eo.id), eo);
|
||||
}
|
||||
|
||||
// 发货单映射:order_id → source_order_codes
|
||||
const orderDeliveryMap = new Map();
|
||||
for (const od of (Array.isArray(orderDeliveryRows) ? orderDeliveryRows : [])) {
|
||||
orderDeliveryMap.set(Number(od.id), od);
|
||||
}
|
||||
|
||||
// 运单映射:order_id → waybill_code(取第一条)
|
||||
const orderExpressMap = new Map();
|
||||
for (const oe of (Array.isArray(orderExpressRows) ? orderExpressRows : [])) {
|
||||
const oid = Number(oe.order_id);
|
||||
if (oid > 0 && !orderExpressMap.has(oid)) {
|
||||
orderExpressMap.set(oid, String(oe.waybill_code || '').trim());
|
||||
}
|
||||
}
|
||||
|
||||
// 货主自定义名称映射:store_id → store_remask
|
||||
const storeWarehouseMap = new Map();
|
||||
for (const sw of (Array.isArray(storeWarehouseRows) ? storeWarehouseRows : [])) {
|
||||
const sid = Number(sw.store_id);
|
||||
if (sid > 0 && !storeWarehouseMap.has(sid)) {
|
||||
storeWarehouseMap.set(sid, String(sw.store_remask || '').trim());
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
stockMap,
|
||||
storeMap,
|
||||
spaceMap,
|
||||
barcodeMap,
|
||||
entryOrderMap,
|
||||
orderDeliveryMap,
|
||||
orderExpressMap,
|
||||
storeWarehouseMap,
|
||||
};
|
||||
}
|
||||
|
||||
@ -511,6 +588,8 @@ class StorageReportService extends Service {
|
||||
const detailStockIds = [ ...new Set(safeDetailRows.map(item => Number(item.stock_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailStoreIds = [ ...new Set(safeDetailRows.map(item => Number(item.store_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailSpaceIds = [ ...new Set(safeDetailRows.map(item => Number(item.space_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailEntryOrderIds = [ ...new Set(safeDetailRows.map(item => Number(item.entry_order_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const detailOrderIds = [ ...new Set(safeDetailRows.map(item => Number(item.order_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
|
||||
const summaryStockIds = [ ...new Set(summaryList.map(item => Number(item.stock_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
const summaryStoreIds = [ ...new Set(summaryList.map(item => Number(item.store_id)).filter(item => Number.isInteger(item) && item > 0)) ];
|
||||
@ -523,6 +602,9 @@ class StorageReportService extends Service {
|
||||
storeIds: [ ...new Set([ ...summaryStoreIds, ...detailStoreIds ]) ],
|
||||
spaceIds: [ ...new Set([ ...summarySpaceIds, ...detailSpaceIds ]) ],
|
||||
includeBarcode: true,
|
||||
entryOrderIds: detailEntryOrderIds,
|
||||
orderIds: detailOrderIds,
|
||||
warehouseId,
|
||||
});
|
||||
|
||||
const summaryColumns = [
|
||||
@ -576,11 +658,24 @@ class StorageReportService extends Service {
|
||||
const space = maps.spaceMap.get(spaceId) || {};
|
||||
const barcodeSet = maps.barcodeMap.get(stockId);
|
||||
|
||||
const entryOrderId = toNumber(item.entry_order_id);
|
||||
const entryOrder = entryOrderId > 0 ? (maps.entryOrderMap.get(entryOrderId) || {}) : {};
|
||||
const isQimenEntry = entryOrder.source_type === 'QM';
|
||||
|
||||
const orderId = toNumber(item.order_id);
|
||||
const orderDelivery = orderId > 0 ? (maps.orderDeliveryMap.get(orderId) || {}) : {};
|
||||
const waybillCode = maps.orderExpressMap.get(orderId) || '';
|
||||
|
||||
// 运单号:出库取 order_express.waybill_code,入库取 entry_order.express_code
|
||||
const generalWaybillNo = waybillCode
|
||||
|| (entryOrderId > 0 ? String(entryOrder.express_code || '').trim() : '');
|
||||
|
||||
return {
|
||||
created_at: formatDateTime(item.created_at),
|
||||
transaction_type: formatTransactionType(item.transaction_type),
|
||||
store_id: storeId,
|
||||
store_name: store.company_name || '',
|
||||
store_remask: maps.storeWarehouseMap.get(storeId) || '',
|
||||
stock_id: stockId,
|
||||
item_code: stock.item_code || '',
|
||||
item_name: stock.item_name || '',
|
||||
@ -596,11 +691,17 @@ class StorageReportService extends Service {
|
||||
inventory_type: item.inventory_type || '',
|
||||
order_type: item.order_type || '',
|
||||
order_no: item.order_no || '',
|
||||
order_id: toNumber(item.order_id),
|
||||
order_id: orderId,
|
||||
receiving_id: toNumber(item.receiving_id),
|
||||
entry_order_id: toNumber(item.entry_order_id),
|
||||
entry_order_id: entryOrderId,
|
||||
operator_name: item.operator_name || '',
|
||||
remark: item.remark || '',
|
||||
// 新增字段
|
||||
qimen_entry_order_code: isQimenEntry ? String(entryOrder.entry_order_code || '').trim() : '',
|
||||
platform_trade_no: String(orderDelivery.source_order_codes || item.order_no || '').trim(),
|
||||
entry_order_waybill_no: entryOrderId > 0 ? String(entryOrder.express_code || '').trim() : '',
|
||||
entry_order_express_company: entryOrderId > 0 ? String(entryOrder.logistics_name || '').trim() : '',
|
||||
waybill_no: String(generalWaybillNo || '').trim(),
|
||||
};
|
||||
});
|
||||
|
||||
@ -608,6 +709,7 @@ class StorageReportService extends Service {
|
||||
{ header: '时间', key: 'created_at' },
|
||||
{ header: '类型', key: 'transaction_type' },
|
||||
{ header: '货主名称', key: 'store_name' },
|
||||
{ header: '自定义店铺名称', key: 'store_remask' },
|
||||
{ header: '商品库存ID', key: 'stock_id' },
|
||||
{ header: '商品编码', key: 'item_code' },
|
||||
{ header: '商品名称', key: 'item_name' },
|
||||
@ -624,6 +726,11 @@ class StorageReportService extends Service {
|
||||
{ header: '单据类型', key: 'order_type' },
|
||||
{ header: '单据号', key: 'order_no' },
|
||||
{ header: '单据ID', key: 'order_id' },
|
||||
{ header: '奇门入库单号', key: 'qimen_entry_order_code' },
|
||||
{ header: '平台交易单号', key: 'platform_trade_no' },
|
||||
{ header: '运单号', key: 'waybill_no' },
|
||||
{ header: '入库单运单号', key: 'entry_order_waybill_no' },
|
||||
{ header: '入库单快递公司', key: 'entry_order_express_company' },
|
||||
{ header: '收货单ID', key: 'receiving_id' },
|
||||
{ header: '入库单ID', key: 'entry_order_id' },
|
||||
{ header: '操作人', key: 'operator_name' },
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user