feat(order): 订单新增包裹总重量 packages_weight(称重回写与各端展示)

This commit is contained in:
liufumingren 2026-09-30 03:08:49 +08:00
parent 0bfc1ab5b2
commit 576eb1b2e8
12 changed files with 274 additions and 6 deletions

View File

@ -408,6 +408,12 @@ module.exports = app => {
defaultValue: 0,
comment: '总重量(g)',
},
packages_weight: {
type: INTEGER(11),
allowNull: false,
defaultValue: 0,
comment: '所有包裹总重量(g)',
},
items_hash: {
type: CHAR(32),
allowNull: false,

View File

@ -733,7 +733,7 @@ class InboxFunctionsService extends Service {
'id', 'delivery_order_code', 'source_platform_code', 'source_order_codes',
'store_id', 'warehouse_id', 'status', 'step',
'name', 'mobile', 'province', 'city', 'area', 'detail_address',
'items_count', 'items_total', 'items_weight',
'items_count', 'items_total', 'items_weight', 'packages_weight',
'express_code', 'logistics_name', 'logistics_code',
'total_amount', 'freight',
'create_at', 'updated_at', 'delivery_time',
@ -859,6 +859,8 @@ class InboxFunctionsService extends Service {
// 重量信息(必须区分说明)
items_weight: found.items_weight || 0,
items_weight_note: '商品总重量(克),订单中所有商品SKU的合计重量',
packages_weight: found.packages_weight || 0,
packages_weight_note: '所有包裹总重量(克),订单全部运单称重重量之和',
has_waybill: hasWaybill,
has_waybill_note: hasWaybill ? '' : '该订单尚未分配运单号,无实际称重重量',
waybills: linkedExpress.map(e => ({

View File

@ -39,7 +39,7 @@ const ORDER_LIST_BASE_ATTRIBUTES = [
'province', 'city', 'area', 'town', 'detail_address',
'id_type', 'id_number',
'sync_status',
'items', 'items_count', 'items_total', 'items_weight',
'items', 'items_count', 'items_total', 'items_weight', 'packages_weight',
'wave_id',
'wave_no',
'wave_strategy_version',

View File

@ -301,7 +301,7 @@ class DeliveryOrderService extends OrderBaseService {
'name', 'mobile', 'province', 'city', 'area', 'detail_address',
'buyer_nick', 'seller_nick', 'shop_nick',
'total_amount', 'item_amount', 'freight',
'items_count', 'items_weight',
'items_count', 'items_weight', 'packages_weight',
'wave_no', 'delivery_time', 'create_at',
],
where: whereClause,
@ -371,6 +371,7 @@ class DeliveryOrderService extends OrderBaseService {
buyer_nick: order.buyer_nick || '', seller_nick: order.seller_nick || '', shop_nick: order.shop_nick || '',
total_amount: order.total_amount || 0, item_amount: order.item_amount || 0, freight: order.freight || 0,
items_count: order.items_count || 0, items_weight: order.items_weight || 0,
packages_weight: order.packages_weight || 0,
wave_no: order.wave_no || '',
delivery_time: order.delivery_time ? app.formatDate(order.delivery_time) : null,
create_at: order.create_at ? app.formatDate(order.create_at) : null,
@ -396,6 +397,7 @@ class DeliveryOrderService extends OrderBaseService {
buyer_nick: order.buyer_nick || '', seller_nick: order.seller_nick || '', shop_nick: order.shop_nick || '',
total_amount: order.total_amount || 0, item_amount: order.item_amount || 0, freight: order.freight || 0,
items_count: order.items_count || 0, items_weight: order.items_weight || 0,
packages_weight: order.packages_weight || 0,
wave_no: order.wave_no || '',
delivery_time: order.delivery_time ? app.formatDate(order.delivery_time) : null,
create_at: order.create_at ? app.formatDate(order.create_at) : null,
@ -453,7 +455,7 @@ class DeliveryOrderService extends OrderBaseService {
'name', 'mobile', 'province', 'city', 'area', 'detail_address',
'buyer_nick', 'seller_nick', 'shop_nick',
'total_amount', 'item_amount', 'freight',
'items_count', 'items_weight',
'items_count', 'items_weight', 'packages_weight',
'wave_no', 'delivery_time', 'create_at',
];

View File

@ -1118,6 +1118,7 @@ class RecheckOrderService extends OrderBaseService {
'store_id',
'intercept_status',
'items_weight',
'packages_weight',
'items_hash',
'items_crc',
],
@ -1242,6 +1243,7 @@ class RecheckOrderService extends OrderBaseService {
: '',
intercept_status: String(row.intercept_status || '').trim(),
items_weight: Number(row.items_weight || 0),
packages_weight: Number(row.packages_weight || 0),
items_hash: String(row.items_hash || '').trim(),
items_crc: Number(row.items_crc || 0),
};
@ -3595,6 +3597,7 @@ class RecheckOrderService extends OrderBaseService {
o.items_count,
o.items_total,
o.items_weight,
o.packages_weight,
o.weight_type,
o.status,
o.create_at,
@ -3642,6 +3645,7 @@ class RecheckOrderService extends OrderBaseService {
items_count: Number(row?.items_count || 0),
items_total: Number(row?.items_total || 0),
items_weight: row?.items_weight != null ? Number(row.items_weight) : null,
packages_weight: row?.packages_weight != null ? Number(row.packages_weight) : null,
weight_type: this.formatWeightTypeLabel(row?.weight_type),
waybill_code: String(row?.waybill_code || '').trim(),
wave_index: Number(row?.wave_index || 0),

View File

@ -2943,7 +2943,7 @@ class WaveService extends OrderBaseService {
attributes: [
'id', 'store_id', 'logistics_name',
'sys_logistics_code', 'sys_logistics_name',
'items_hash', 'items', 'items_total', 'items_weight',
'items_hash', 'items', 'items_total', 'items_weight', 'packages_weight',
'post_status', 'pick_status', 'outbound_status', 'create_at',
],
raw: true,
@ -3078,6 +3078,7 @@ class WaveService extends OrderBaseService {
group_count: g.orders.length,
items_total,
items_weight: firstOrder.items_weight != null ? Number(firstOrder.items_weight) : null,
packages_weight: firstOrder.packages_weight != null ? Number(firstOrder.packages_weight) : null,
store_id: store_ids.length === 1 ? store_ids[0] : 0,
store_ids,
logistics_code: logisticsCode,
@ -3196,7 +3197,7 @@ class WaveService extends OrderBaseService {
attributes: [
'id', 'store_id', 'logistics_name',
'sys_logistics_code', 'sys_logistics_name',
'items_hash', 'items', 'items_total', 'items_weight',
'items_hash', 'items', 'items_total', 'items_weight', 'packages_weight',
'post_status', 'pick_status', 'outbound_status', 'create_at',
],
raw: true,
@ -3331,6 +3332,7 @@ class WaveService extends OrderBaseService {
group_count: g.orders.length,
items_total,
items_weight: firstOrder.items_weight != null ? Number(firstOrder.items_weight) : null,
packages_weight: firstOrder.packages_weight != null ? Number(firstOrder.packages_weight) : null,
store_id: store_ids.length === 1 ? store_ids[0] : 0,
store_ids,
logistics_code: logisticsCode,
@ -5026,6 +5028,7 @@ class WaveService extends OrderBaseService {
items_count: normalizedOrderRow.items_count ?? null,
items_total: normalizedOrderRow.items_total ?? null,
items_weight: normalizedOrderRow.items_weight != null ? Number(normalizedOrderRow.items_weight) : null,
packages_weight: normalizedOrderRow.packages_weight != null ? Number(normalizedOrderRow.packages_weight) : null,
weight_type: this.formatWeightTypeLabel(normalizedOrderRow.weight_type),
sys_logistics_name: this.resolveWaveStrategyFallbackSysLogisticsName(normalizedOrderRow),
store_name: this.resolveWaveStrategyFallbackStoreName(normalizedOrderRow),

View File

@ -685,6 +685,7 @@ class AfterSaleService extends Service {
store_id: order.store_id,
// 重量(g)
items_weight: order.items_weight || 0,
packages_weight: order.packages_weight || 0,
// 波次
wave_id: order.wave_id || 0,
wave_no: order.wave_no || '',

View File

@ -437,6 +437,138 @@ class OrderExpressService extends Service {
return Array.isArray(rows) ? rows : [];
}
/**
* 回写订单表的 packages_weight(所有包裹总重量 = 该订单全部有效运单称重之和)。
*
* 称重主流程的补充回写动作,失败仅告警不阻断称重流程。
*
* @param {number} orderId 订单ID。
* @param {number|null} warehouseId 仓库ID,缺失时跳过回写。
* @param {Object|null} [orderDeliveryModel] 已知的订单分表模型;缺省时按 current → dispatch → history 自动定位。
* @return {Promise<number>} 计算出的包裹总重量(g),失败返回 0。
*/
async _syncOrderPackagesWeight(orderId, warehouseId, orderDeliveryModel = null) {
const { ctx } = this;
const normalizedOrderId = Number(orderId || 0);
if (normalizedOrderId <= 0 || !warehouseId) {
return 0;
}
try {
const orderExpressModel = ctx.model && ctx.model.OrderExpress;
if (!orderExpressModel || typeof orderExpressModel.sum !== 'function') {
return 0;
}
const sumResult = await orderExpressModel.sum('weighing_weight', {
where: {
order_id: normalizedOrderId,
delete_at: null,
warehouse_id: warehouseId,
},
});
const packagesWeight = Number.isFinite(Number(sumResult)) && Number(sumResult) > 0
? Math.round(Number(sumResult))
: 0;
let targetModel = orderDeliveryModel;
if (!targetModel || typeof targetModel.update !== 'function') {
const factory = ctx.model && ctx.model.OrderDeliveryFactory;
if (!factory || typeof factory.getCurrentModel !== 'function') {
return packagesWeight;
}
const tableOrders = [
{ label: 'current', getModel: () => factory.getCurrentModel(warehouseId) },
{ label: 'dispatch', getModel: () => factory.getDispatchModel(warehouseId) },
{ label: 'history', getModel: () => factory.getHistoryModel(warehouseId) },
];
for (const entry of tableOrders) {
try {
const model = await entry.getModel();
if (!model || typeof model.update !== 'function') continue;
const found = await model.findOne({
where: { id: normalizedOrderId, warehouse_id: warehouseId },
attributes: [ 'id' ],
raw: true,
});
if (found) {
targetModel = model;
break;
}
} catch (_err) { continue; }
}
}
if (targetModel && typeof targetModel.update === 'function') {
await targetModel.update(
{ packages_weight: packagesWeight },
{ where: { id: normalizedOrderId, warehouse_id: warehouseId } }
);
}
return packagesWeight;
} catch (err) {
ctx.logger && ctx.logger.warn && ctx.logger.warn(
`[order_express._syncOrderPackagesWeight] 回写包裹总重量失败 orderId=${normalizedOrderId}: ${err && err.message}`
);
return 0;
}
}
/**
* 批量回写波次内各订单的 packages_weight(所有包裹总重量 = 各订单全部有效运单称重之和)。
*
* 一次聚合查询 + 逐订单 UPDATE,失败仅告警不阻断称重流程。
*
* @param {number[]} orderIds 波次内参与称重的订单ID列表。
* @param {number} warehouseId 仓库ID。
* @param {Object} orderDeliveryModel 订单分表模型(波次订单所在分表)。
* @return {Promise<void>} 无返回值。
*/
async _syncWavePackagesWeight(orderIds, warehouseId, orderDeliveryModel) {
const { ctx } = this;
const normalizedOrderIds = (Array.isArray(orderIds) ? orderIds : [])
.map(id => Number(id || 0))
.filter(id => id > 0);
if (normalizedOrderIds.length === 0 || !warehouseId) {
return;
}
try {
const orderExpressModel = ctx.model && ctx.model.OrderExpress;
if (!orderExpressModel || typeof orderExpressModel.findAll !== 'function') {
return;
}
const { Op } = this.app.Sequelize;
const rows = await orderExpressModel.findAll({
where: {
order_id: { [Op.in]: normalizedOrderIds },
delete_at: null,
warehouse_id: warehouseId,
},
attributes: [ 'order_id', 'weighing_weight' ],
raw: true,
});
const sumMap = new Map();
for (const row of (Array.isArray(rows) ? rows : [])) {
const oid = Number(row && row.order_id || 0);
if (oid <= 0) continue;
sumMap.set(oid, (sumMap.get(oid) || 0) + Number(row.weighing_weight || 0));
}
if (orderDeliveryModel && typeof orderDeliveryModel.update === 'function') {
for (const oid of normalizedOrderIds) {
await orderDeliveryModel.update(
{ packages_weight: Math.round(sumMap.get(oid) || 0) },
{ where: { id: oid, warehouse_id: warehouseId } }
);
}
}
} catch (err) {
ctx.logger && ctx.logger.warn && ctx.logger.warn(
`[order_express._syncWavePackagesWeight] 批量回写包裹总重量失败: ${err && err.message}`
);
}
}
/**
* 更新订单运单称重重量。
*
@ -795,6 +927,9 @@ class OrderExpressService extends Service {
totalCount: orderIds.length,
});
// 回写波次内各订单的 packages_weight(所有包裹总重量 = 各订单全部运单称重之和)
await this._syncWavePackagesWeight(orderIds, warehouseId, orderDeliveryModel);
// 构建拆单汇总信息(按触发订单 ID 汇总)
const summary = await this._buildWaveWeighingSummary(waveId, orderId, warehouseId, weight);
@ -1035,6 +1170,9 @@ class OrderExpressService extends Service {
warehouseId,
});
// 回写订单表 packages_weight:所有包裹总重量 = 该订单全部有效运单称重之和
const packagesWeight = await this._syncOrderPackagesWeight(Number(targetRow.order_id), warehouseId);
// 从订单表读取当前 items_weight(只读,不做 UPDATE)
// 依次查 current / dispatch 两张表
let itemsWeight = 0;
@ -1068,6 +1206,7 @@ class OrderExpressService extends Service {
order_id: Number(targetRow.order_id),
waybill_code: String(targetRow.waybill_code || '').trim(),
weighing_weight: weight,
packages_weight: packagesWeight,
items_weight: itemsWeight,
};
}
@ -1147,6 +1286,9 @@ class OrderExpressService extends Service {
totalCount,
});
// 回写波次内各订单的 packages_weight(所有包裹总重量 = 各订单全部运单称重之和)
await this._syncWavePackagesWeight(orderIds, warehouseId, orderDeliveryModel);
// 构建拆单汇总信息(按触发订单 ID 汇总,未传时取波次下第一个订单)
const scopeOrderId = (Number.isFinite(Number(orderId)) && Number(orderId) > 0)
? Number(orderId)

View File

@ -143,6 +143,7 @@ class OrderReviewService extends OrderBaseService {
'wave_id',
'wave_no',
'items_weight',
'packages_weight',
'items_total',
'items_count',
'lock_status',
@ -478,6 +479,7 @@ class OrderReviewService extends OrderBaseService {
waybill_code: String(expressRow && expressRow.waybill_code || normalizedWaybillCode).trim(),
wave_no: String(orderRow && orderRow.wave_no || '').trim() || null,
total_weight: orderRow && orderRow.items_weight != null ? Number(orderRow.items_weight) : null,
packages_weight: orderRow && orderRow.packages_weight != null ? Number(orderRow.packages_weight) : null,
total_piece_count: totalPieceCount > 0 ? totalPieceCount : fallbackPieceCount,
total_sku_count: totalSkuCount > 0 ? totalSkuCount : fallbackSkuCount,
lock_status: lockStatus,

View File

@ -1646,6 +1646,11 @@ class WorkbenchService extends Service {
ctx.logger.info('[Workbench._sendWeight] 散单称重 barcode=%s orderId=%d weightG=%s',
normalizedBarcode, orderId, normalizedWeight);
// 回写订单表 packages_weight:所有包裹总重量 = 该订单全部有效运单称重之和
const packagesWeight = await ctx.service.systems.orderExpress._syncOrderPackagesWeight(
orderId, warehouseId, orderDeliveryModel
);
// 写入操作日志
await this._writeWeighOpLog({
orderId,
@ -1660,6 +1665,7 @@ class WorkbenchService extends Service {
waybill_code: normalizedBarcode,
order_id: orderId,
weighing_weight: normalizedWeight,
packages_weight: packagesWeight,
items_weight: Number(orderRow.items_weight || 0),
mode: 'single',
};
@ -1682,6 +1688,11 @@ class WorkbenchService extends Service {
ctx.logger.info('[Workbench._sendWeight] 非团购波次称重 barcode=%s orderId=%d weightG=%s waveType=%s',
normalizedBarcode, orderId, normalizedWeight, waveRow ? waveRow.wave_type : 'N/A');
// 回写订单表 packages_weight:所有包裹总重量 = 该订单全部有效运单称重之和
const packagesWeight = await ctx.service.systems.orderExpress._syncOrderPackagesWeight(
orderId, warehouseId, orderDeliveryModel
);
// 写入操作日志
await this._writeWeighOpLog({
orderId,
@ -1696,6 +1707,7 @@ class WorkbenchService extends Service {
waybill_code: normalizedBarcode,
order_id: orderId,
weighing_weight: normalizedWeight,
packages_weight: packagesWeight,
items_weight: Number(orderRow.items_weight || 0),
mode: 'single',
};
@ -1737,6 +1749,9 @@ class WorkbenchService extends Service {
}
);
// 回写波次内各订单的 packages_weight(所有包裹总重量 = 各订单全部运单称重之和)
await ctx.service.systems.orderExpress._syncWavePackagesWeight(orderIds, warehouseId, orderDeliveryModel);
ctx.logger.info('[Workbench._sendWeight] 团购波次批量称重 barcode=%s waveId=%d waveNo=%s orderCount=%d weightG=%s',
normalizedBarcode, waveId, waveRow.wave_no, totalCount, normalizedWeight);
@ -2459,6 +2474,7 @@ class WorkbenchService extends Service {
items_count: orderRow.items_count,
items_total: orderRow.items_total,
items_weight: orderRow.items_weight,
packages_weight: orderRow.packages_weight,
source_platform_code: orderRow.source_platform_code,
logistics_name: orderRow.logistics_name,
picker_id: pickerId,

View File

@ -0,0 +1,17 @@
'use strict';
module.exports = {
async up(queryInterface, Sequelize) {
await queryInterface.addColumn('wms_order_delivery', 'packages_weight', {
type: Sequelize.INTEGER(11),
allowNull: false,
defaultValue: 0,
comment: '所有包裹总重量(g)',
after: 'items_weight',
});
},
async down(queryInterface) {
await queryInterface.removeColumn('wms_order_delivery', 'packages_weight');
},
};

View File

@ -0,0 +1,73 @@
'use strict';
/**
* 幂等补齐订单分表的 packages_weight 列(所有包裹总重量)。
*
* 背景:该列由订单模型(app/model/order_delivery.js)定义,分表工厂
* (order_delivery_factory.js)在首次访问某张分表时自动同步;history /
* outsourced 等长期不被访问的表可能滞后,可用本脚本提前补齐。
*
* 用法:
* 开发:node script/fix-order-packages-weight-column.cjs
* 生产:PowerShell 中 $env:NODE_ENV='production'; node script/fix-order-packages-weight-column.cjs
*
* 安全:只 ADD 缺失列(INT(11) NOT NULL DEFAULT 0,与模型定义一致),
* 不触碰 id / AUTO_INCREMENT,不修改已有列,可重复执行。
*/
(async () => {
try {
const configs = require('../database/config.js');
const env = process.env.NODE_ENV || 'development';
const cfg = configs[env];
if (!cfg) {
console.error('NO_CONFIG_FOR_ENV');
process.exit(2);
}
const mysql = require('mysql2/promise');
const conn = await mysql.createConnection({
host: cfg.host,
port: cfg.port || 3306,
user: cfg.username,
password: cfg.password,
database: cfg.database,
});
const [ tables ] = await conn.query(
`SELECT TABLE_NAME FROM information_schema.TABLES
WHERE TABLE_SCHEMA = ? AND TABLE_NAME LIKE 'wms_order_delivery\\_%'
ORDER BY TABLE_NAME`,
[ cfg.database ]
);
console.log(`环境: ${env}, 库: ${cfg.host}:${cfg.port}/${cfg.database}`);
console.log(`订单分表数量: ${tables.length}\n`);
const columnSql = "ADD COLUMN packages_weight INT(11) NOT NULL DEFAULT 0 COMMENT '所有包裹总重量(g)'";
let added = 0;
let ok = 0;
for (const row of tables) {
const tableName = row.TABLE_NAME || row.table_name;
const [ columns ] = await conn.query(
`SELECT COLUMN_NAME FROM information_schema.COLUMNS
WHERE TABLE_SCHEMA = ? AND TABLE_NAME = ? AND COLUMN_NAME = 'packages_weight'`,
[ cfg.database, tableName ]
);
if (columns.length === 0) {
await conn.query(`ALTER TABLE \`${tableName}\` ${columnSql}`);
console.log(`[ADD] ${tableName} 已补齐列`);
added += 1;
} else {
ok += 1;
}
}
console.log(`\n完成: 已存在 ${ok} 张, 新增 ${added} 张`);
await conn.end();
process.exit(0);
} catch (err) {
console.error('ERROR', err.message);
process.exit(3);
}
})();