1
This commit is contained in:
parent
0b207a1c9c
commit
025184904a
@ -540,15 +540,14 @@ function buildWaybillCustomProductInfoLines(items, policyConfig = {}, options =
|
||||
const finalTotalQty = totalQty > 0
|
||||
? totalQty
|
||||
: (Number.isFinite(fallbackTotalQtyRaw) && fallbackTotalQtyRaw > 0 ? fallbackTotalQtyRaw : 0);
|
||||
void platformsIndex;
|
||||
const hasWaveCustomPrefix = waveTotalOrders > 0
|
||||
&& waveIndex > 0
|
||||
&& platformsIndex > 0
|
||||
&& Boolean(waveNo);
|
||||
const waveHeaderText = hasWaveCustomPrefix
|
||||
? `【${waveTotalOrders}】${waveNo}_${waveIndex}_${platformsIndex}`
|
||||
? `${waveNo} [${finalTotalQty}-${waveIndex}]`
|
||||
: waveNo;
|
||||
const headerParts = [ waveHeaderText, expressInterfaceName ].filter(Boolean);
|
||||
headerParts.push(`商品数量【${finalTotalQty}】`);
|
||||
const headerLine = headerParts.join(' ');
|
||||
|
||||
if (detailLines.length === 0) {
|
||||
|
||||
@ -19,7 +19,7 @@ module.exports = app => {
|
||||
},
|
||||
},
|
||||
order_type: {
|
||||
type: ENUM('SCRK', 'LYRK', 'CCRK', 'CGRK', 'DBRK', 'QTRK', 'B2BRK', 'XNRK'),
|
||||
type: ENUM('SCRK', 'LYRK', 'CCRK', 'CGRK', 'DBRK', 'QTRK', 'B2BRK', 'XNRK','SHRK'),
|
||||
allowNull: false,
|
||||
comment: '业务类型',
|
||||
},
|
||||
@ -81,7 +81,7 @@ module.exports = app => {
|
||||
comment: '来源类型',
|
||||
},
|
||||
order_status: {
|
||||
type: ENUM('PENDING', 'CONFIRMED', 'PARTIAL_RECEIVED', 'COMPLETED', 'CANCELLED', 'CREATED', 'CREATING'),
|
||||
type: ENUM('PENDING', 'CONFIRMED', 'PARTIAL_RECEIVED', 'COMPLETED', 'CANCELLED', 'CREATING'),
|
||||
allowNull: false,
|
||||
defaultValue: 'PENDING',
|
||||
comment: '订单状态',
|
||||
@ -258,11 +258,11 @@ module.exports = app => {
|
||||
};
|
||||
|
||||
EntryOrder.prototype.canConfirm = function() {
|
||||
return [ 'PENDING', 'CREATED' ].includes(this.order_status);
|
||||
return [ 'PENDING' ].includes(this.order_status);
|
||||
};
|
||||
|
||||
EntryOrder.prototype.canCancel = function() {
|
||||
return [ 'PENDING', 'CONFIRMED', 'CREATED' ].includes(this.order_status);
|
||||
return [ 'PENDING', 'CONFIRMED' ].includes(this.order_status);
|
||||
};
|
||||
|
||||
EntryOrder.prototype.canComplete = function() {
|
||||
|
||||
@ -16,6 +16,11 @@ module.exports = app => {
|
||||
allowNull: false,
|
||||
comment: '订单ID',
|
||||
},
|
||||
warehouse_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
comment: '仓库ID',
|
||||
},
|
||||
order_item_id: {
|
||||
type: BIGINT(20).UNSIGNED,
|
||||
allowNull: false,
|
||||
@ -69,6 +74,10 @@ module.exports = app => {
|
||||
updatedAt: 'updated_at',
|
||||
comment: '订单储位分配表',
|
||||
indexes: [
|
||||
{
|
||||
name: 'idx_wms_picking_warehouse_id',
|
||||
fields: [ 'warehouse_id' ],
|
||||
},
|
||||
{
|
||||
name: 'idx_wms_picking_order_id',
|
||||
fields: [ 'order_id' ],
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
// app/model/print_item.js
|
||||
module.exports = app => {
|
||||
const { STRING, INTEGER, BOOLEAN, JSON, DATE } = app.Sequelize;
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ];
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING', 'OUTBOUND' ];
|
||||
|
||||
const PrintItem = app.model.define('print_item', {
|
||||
id: {
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
module.exports = app => {
|
||||
const { BIGINT, STRING, INTEGER, BOOLEAN, JSON, DATE, DATEONLY } = app.Sequelize;
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ];
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING', 'OUTBOUND' ];
|
||||
|
||||
const PrintTemplate = app.model.define('print_template', {
|
||||
id: {
|
||||
|
||||
@ -34,6 +34,8 @@ module.exports = app => {
|
||||
require_pack: true,
|
||||
require_weigh: true,
|
||||
require_sync: true,
|
||||
require_print: true,
|
||||
require_pick: true,
|
||||
});
|
||||
|
||||
const DEFAULT_SUBJECT_CONFIG = Object.freeze({
|
||||
@ -127,6 +129,7 @@ module.exports = app => {
|
||||
|
||||
/**
|
||||
* 规范化自动化出库规则配置。
|
||||
* 确保 enabled/require_recheck/require_pack/require_weigh/require_sync/require_print/require_pick 等字段存在且类型正确。
|
||||
*
|
||||
* @param {Object|undefined|null} rawRules 原始自动化出库规则。
|
||||
* @return {Object} 规范化后的自动化出库规则对象。
|
||||
@ -155,6 +158,8 @@ module.exports = app => {
|
||||
require_pack: parsed.require_pack !== false,
|
||||
require_weigh: parsed.require_weigh !== false,
|
||||
require_sync: parsed.require_sync !== false,
|
||||
require_print: parsed.require_print !== false,
|
||||
require_pick: parsed.require_pick !== false,
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@ -87,6 +87,14 @@ module.exports = app => {
|
||||
required: false,
|
||||
description: '控制货主推送订单创建后是否必须进入审批流程',
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'auto_sync_back',
|
||||
name: '自动同步回传',
|
||||
type: 'flag',
|
||||
default: 1,
|
||||
required: false,
|
||||
description: '快递号分配成功后是否自动同步订单信息到外部系统(奇门/API/手动)',
|
||||
}),
|
||||
Object.freeze({
|
||||
key: 'enable_external_express_code',
|
||||
name: '启用外部快递编码',
|
||||
|
||||
@ -9,6 +9,9 @@
|
||||
* 1. 已复核:recheck_status = 'fin'
|
||||
* 2. 已打包:pack_status = 'fin'
|
||||
* 3. 已称重:wms_order_express.weighing_weight > 0
|
||||
* 4. 已同步:sync_status = 'fin'
|
||||
* 5. 已打印:print_status = 'fin'
|
||||
* 6. 已拣货:pick_status = 'fin'
|
||||
*
|
||||
* 各条件是否必须可由仓库配置独立控制。
|
||||
*/
|
||||
@ -36,11 +39,9 @@ module.exports = {
|
||||
try {
|
||||
const result = await ctx.service.systems.orderAutoOutbound.executeAutoOutbound();
|
||||
|
||||
if (result && result.totalProcessed > 0) {
|
||||
ctx.logger.info(
|
||||
`[auto-outbound-order] 本轮自动化出库完成,共处理 ${result.totalProcessed} 条订单`
|
||||
);
|
||||
}
|
||||
ctx.logger.info(
|
||||
`[auto-outbound-order] 本轮自动化出库完成,共处理 ${result && result.totalProcessed || 0} 条订单`
|
||||
);
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[auto-outbound-order] 自动化出库任务执行失败: ${error.message}`);
|
||||
} finally {
|
||||
|
||||
46
app/schedule/pick_complete_compensation.js
Normal file
46
app/schedule/pick_complete_compensation.js
Normal file
@ -0,0 +1,46 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 拣货完成补偿定时任务。
|
||||
* 每 1 分钟在单 worker 中扫描一次:当 wms_picking 中存在 status='pending' 的遗漏记录,
|
||||
* 且对应订单已迁移到配送 dispatch 表且 pick_status='fin' 时,补扣库存并写入出库流水。
|
||||
*
|
||||
* 补偿判断条件:
|
||||
* 1. wms_picking.status = 'pending' 且 warehouse_id > 0
|
||||
* 2. 对应订单在 order_delivery_dispatch 表中 pick_status = 'fin'
|
||||
* 3. 对应订单不在 order_delivery 主表中(已迁移)
|
||||
*/
|
||||
module.exports = {
|
||||
schedule: {
|
||||
interval: '1m',
|
||||
type: 'worker',
|
||||
immediate: true,
|
||||
disable: false,
|
||||
},
|
||||
|
||||
/**
|
||||
* 执行拣货完成补偿任务。
|
||||
*
|
||||
* @param {Object} ctx Egg 上下文。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async task(ctx) {
|
||||
if (ctx.app._pickCompensationRunning) {
|
||||
return;
|
||||
}
|
||||
|
||||
ctx.app._pickCompensationRunning = true;
|
||||
|
||||
try {
|
||||
const result = await ctx.service.systems.pickCompensation.executeCompensation();
|
||||
|
||||
ctx.logger.info(
|
||||
`[pick-compensation] 本轮补偿完成,共处理 ${result && result.totalCompensated || 0} 条拣货记录`
|
||||
);
|
||||
} catch (error) {
|
||||
ctx.logger.error(`[pick-compensation] 补偿任务执行失败: ${error.message}`);
|
||||
} finally {
|
||||
ctx.app._pickCompensationRunning = false;
|
||||
}
|
||||
},
|
||||
};
|
||||
@ -19,7 +19,6 @@ class dashboardService extends MainService {
|
||||
}
|
||||
|
||||
const model = await ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
const dispatchModel = await ctx.model.OrderDeliveryFactory.getDispatchModel(warehouseId);
|
||||
const { Sequelize } = ctx.app;
|
||||
const { Op } = Sequelize;
|
||||
|
||||
@ -55,7 +54,7 @@ class dashboardService extends MainService {
|
||||
model.count({ where: { ...pendingBase, print_status: 'none' } }),
|
||||
model.count({ where: { ...pendingBase, pick_status: 'none' } }),
|
||||
model.count({ where: { ...pendingBase, outbound_status: { [Op.ne]: 'fin' } } }),
|
||||
dispatchModel.count({ where: { dispatch_lane: 'm4', delivery_time: { [Op.gte]: todayStart, [Op.lt]: todayEnd } } }),
|
||||
model.count({ where: { step: 4, outbound_status: 'fin', status: { [Op.ne]: 'cancel' }, delivery_time: { [Op.gte]: todayStart, [Op.lt]: todayEnd } } }),
|
||||
model.count({ where: { ...pendingBase, intercept_status: { [Op.not]: null, [Op.ne]: 'none' } } }),
|
||||
model.count({ where: { ...pendingBase, step: 3 } }),
|
||||
]);
|
||||
@ -77,7 +76,7 @@ class dashboardService extends MainService {
|
||||
code: 200,
|
||||
message: '成功',
|
||||
data: {
|
||||
todayOrders: totalPending,
|
||||
todayOrders: totalPending + todayOutbound,
|
||||
orderTrend,
|
||||
|
||||
unassignedOrders,
|
||||
@ -301,25 +300,124 @@ class dashboardService extends MainService {
|
||||
|
||||
return this.success('ok', data);
|
||||
}
|
||||
/**
|
||||
* 订单趋势统计:按小时统计当日订单数与发货数
|
||||
* @returns {Object} 包含 categories(时段)、orders(订单数)、shipments(发货数)和 summary(汇总)的响应数据
|
||||
*/
|
||||
async order_trend() {
|
||||
const { ctx } = this;
|
||||
const warehouseId = ctx.user?.store_id;
|
||||
|
||||
if (!warehouseId) {
|
||||
return this.fail('缺少仓库上下文');
|
||||
}
|
||||
|
||||
const model = await ctx.model.OrderDeliveryFactory.getCurrentModel(warehouseId);
|
||||
const dispatchModel = await ctx.model.OrderDeliveryFactory.getDispatchModel(warehouseId);
|
||||
const { Sequelize } = ctx.app;
|
||||
const { Op } = Sequelize;
|
||||
|
||||
// 今日时间范围
|
||||
const now = new Date();
|
||||
const todayStart = new Date(now.getFullYear(), now.getMonth(), now.getDate());
|
||||
const currentHour = now.getHours();
|
||||
|
||||
// 时间段:08:00 到当前小时(最晚 23:00),若当前小时早于 08:00 则从 08:00 开始
|
||||
const startHour = 8;
|
||||
const endHour = currentHour < startHour ? startHour : Math.min(currentHour, 23);
|
||||
|
||||
// 生成 categories 和初始化小时映射
|
||||
const categories = [];
|
||||
const orderMap = {};
|
||||
const shipmentMap = {};
|
||||
for (let h = startHour; h <= endHour; h++) {
|
||||
const key = `${String(h).padStart(2, '0')}:00`;
|
||||
categories.push(key);
|
||||
orderMap[h] = 0;
|
||||
shipmentMap[h] = 0;
|
||||
}
|
||||
|
||||
// 查询订单数按创建小时分组
|
||||
const orderRows = await model.findAll({
|
||||
attributes: [
|
||||
[ Sequelize.fn('HOUR', Sequelize.col('create_at')), 'hour' ],
|
||||
[ Sequelize.fn('COUNT', Sequelize.col('id')), 'cnt' ],
|
||||
],
|
||||
where: {
|
||||
step: { [Op.in]: [ 1, 2, 3 ] },
|
||||
outbound_status: { [Op.ne]: 'padding' },
|
||||
status: { [Op.ne]: 'cancel' },
|
||||
create_at: { [Op.gte]: todayStart, [Op.lte]: now },
|
||||
},
|
||||
group: [ Sequelize.fn('HOUR', Sequelize.col('create_at')) ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
// 查询发货数按发货小时分组
|
||||
const shipmentRows = await dispatchModel.findAll({
|
||||
attributes: [
|
||||
[ Sequelize.fn('HOUR', Sequelize.col('delivery_time')), 'hour' ],
|
||||
[ Sequelize.fn('COUNT', Sequelize.col('id')), 'cnt' ],
|
||||
],
|
||||
where: {
|
||||
dispatch_lane: 'm4',
|
||||
delivery_time: { [Op.gte]: todayStart, [Op.lte]: now },
|
||||
},
|
||||
group: [ Sequelize.fn('HOUR', Sequelize.col('delivery_time')) ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
// 将查询结果填充到小时映射
|
||||
for (const row of orderRows) {
|
||||
orderMap[row.hour] = Number(row.cnt);
|
||||
}
|
||||
for (const row of shipmentRows) {
|
||||
shipmentMap[row.hour] = Number(row.cnt);
|
||||
}
|
||||
|
||||
// 按 categories 顺序构建 orders / shipments 数组
|
||||
const orders = categories.map(cat => orderMap[parseInt(cat, 10)] || 0);
|
||||
const shipments = categories.map(cat => shipmentMap[parseInt(cat, 10)] || 0);
|
||||
|
||||
// 汇总计算
|
||||
const totalOrders = orders.reduce((sum, v) => sum + v, 0);
|
||||
const totalShipments = shipments.reduce((sum, v) => sum + v, 0);
|
||||
const shipmentRate = totalOrders > 0
|
||||
? parseFloat(((totalShipments / totalOrders) * 100).toFixed(1))
|
||||
: 0;
|
||||
|
||||
// 找订单峰值小时
|
||||
let peakHour = categories[0] || '08:00';
|
||||
let peakOrders = 0;
|
||||
for (let i = 0; i < categories.length; i++) {
|
||||
if (orders[i] > peakOrders) {
|
||||
peakOrders = orders[i];
|
||||
peakHour = categories[i];
|
||||
}
|
||||
}
|
||||
|
||||
// 当天日期 YYYY-MM-DD
|
||||
const dateStr = `${now.getFullYear()}-${String(now.getMonth() + 1).padStart(2, '0')}-${String(now.getDate()).padStart(2, '0')}`;
|
||||
|
||||
const data = {
|
||||
code: 200,
|
||||
message: '成功',
|
||||
data: {
|
||||
range: 'day',
|
||||
date: '2024-01-15',
|
||||
date: dateStr,
|
||||
summary: {
|
||||
total_orders: 1256,
|
||||
total_shipments: 892,
|
||||
shipment_rate: 71.0,
|
||||
peak_hour: '15:00',
|
||||
peak_orders: 178,
|
||||
total_orders: totalOrders,
|
||||
total_shipments: totalShipments,
|
||||
shipment_rate: shipmentRate,
|
||||
peak_hour: peakHour,
|
||||
peak_orders: peakOrders,
|
||||
},
|
||||
categories: [ '08:00', '09:00', '10:00', '11:00', '12:00', '13:00', '14:00', '15:00', '16:00', '17:00' ],
|
||||
orders: [ 138, 84378, 102120, 129156, 153020, 153020, 153020, 153020, 153020, 153020 ],
|
||||
shipments: [ 0, 30000, 60000, 70000, 86479, 86479, 86479, 86479, 86479, 86479 ],
|
||||
categories,
|
||||
orders,
|
||||
shipments,
|
||||
},
|
||||
};
|
||||
|
||||
return this.success('ok', data);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
'use strict';
|
||||
'use strict';
|
||||
|
||||
const OrderBaseService = require('./base');
|
||||
|
||||
@ -31,6 +31,472 @@ const BATCH_UNLOCK_TASK_CACHE_TTL_SECONDS = 60 * 60 * 24;
|
||||
const BATCH_UNINTERCEPT_TASK_CACHE_KEY_PREFIX = 'order:batch-unintercept:';
|
||||
const BATCH_UNINTERCEPT_TASK_CACHE_TTL_SECONDS = 60 * 60 * 24;
|
||||
|
||||
/**
|
||||
* 中国行政区划反向查询表。
|
||||
*
|
||||
* 用于在 AI 解析结果缺少 province/city/area 时进行兜底反向推断。
|
||||
* 覆盖三类特殊行政区:
|
||||
* - direct:省直辖县级市(如湖北仙桃、潜江、天门)
|
||||
* - no_district:不设区的地级市(如东莞、中山、嘉峪关、儋州、三沙)
|
||||
* - delegated:地级市代管县级市(如苏州代管昆山)
|
||||
*
|
||||
* 键为 area(区/县)标准名称,值为 { province, city, type }。
|
||||
* 同时提供 city -> province 的映射表用于根据城市名反查省份。
|
||||
*/
|
||||
const CHINA_ADMIN_DIVISION_MAP = Object.freeze({
|
||||
// ========== 省直辖县级市 / 省直管县 ==========
|
||||
仙桃市: { province: '湖北省', city: '湖北省', type: 'direct' },
|
||||
潜江市: { province: '湖北省', city: '湖北省', type: 'direct' },
|
||||
天门市: { province: '湖北省', city: '湖北省', type: 'direct' },
|
||||
神农架林区: { province: '湖北省', city: '湖北省', type: 'direct' },
|
||||
济源市: { province: '河南省', city: '河南省', type: 'direct' },
|
||||
五指山市: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
琼海市: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
文昌市: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
万宁市: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
东方市: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
定安县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
屯昌县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
澄迈县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
临高县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
白沙黎族自治县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
昌江黎族自治县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
乐东黎族自治县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
陵水黎族自治县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
保亭黎族苗族自治县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
琼中黎族苗族自治县: { province: '海南省', city: '海南省', type: 'direct' },
|
||||
石河子市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
阿拉尔市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
图木舒克市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
五家渠市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
北屯市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
铁门关市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
双河市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
可克达拉市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
昆玉市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
胡杨河市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
新星市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
白杨市: { province: '新疆维吾尔自治区', city: '新疆维吾尔自治区', type: 'direct' },
|
||||
|
||||
// ========== 不设区的地级市(city 和 area 可为同一值) ==========
|
||||
东莞市: { province: '广东省', city: '东莞市', type: 'no_district' },
|
||||
中山市: { province: '广东省', city: '中山市', type: 'no_district' },
|
||||
嘉峪关市: { province: '甘肃省', city: '嘉峪关市', type: 'no_district' },
|
||||
儋州市: { province: '海南省', city: '儋州市', type: 'no_district' },
|
||||
三沙市: { province: '海南省', city: '三沙市', type: 'no_district' },
|
||||
|
||||
// ========== 常见地级市代管县级市 ==========
|
||||
昆山市: { province: '江苏省', city: '苏州市', type: 'delegated' },
|
||||
常熟市: { province: '江苏省', city: '苏州市', type: 'delegated' },
|
||||
张家港市: { province: '江苏省', city: '苏州市', type: 'delegated' },
|
||||
太仓市: { province: '江苏省', city: '苏州市', type: 'delegated' },
|
||||
江阴市: { province: '江苏省', city: '无锡市', type: 'delegated' },
|
||||
宜兴市: { province: '江苏省', city: '无锡市', type: 'delegated' },
|
||||
丹阳市: { province: '江苏省', city: '镇江市', type: 'delegated' },
|
||||
扬中市: { province: '江苏省', city: '镇江市', type: 'delegated' },
|
||||
句容市: { province: '江苏省', city: '镇江市', type: 'delegated' },
|
||||
溧阳市: { province: '江苏省', city: '常州市', type: 'delegated' },
|
||||
海安市: { province: '江苏省', city: '南通市', type: 'delegated' },
|
||||
启东市: { province: '江苏省', city: '南通市', type: 'delegated' },
|
||||
如皋市: { province: '江苏省', city: '南通市', type: 'delegated' },
|
||||
仪征市: { province: '江苏省', city: '扬州市', type: 'delegated' },
|
||||
高邮市: { province: '江苏省', city: '扬州市', type: 'delegated' },
|
||||
兴化市: { province: '江苏省', city: '泰州市', type: 'delegated' },
|
||||
靖江市: { province: '江苏省', city: '泰州市', type: 'delegated' },
|
||||
泰兴市: { province: '江苏省', city: '泰州市', type: 'delegated' },
|
||||
邳州市: { province: '江苏省', city: '徐州市', type: 'delegated' },
|
||||
新沂市: { province: '江苏省', city: '徐州市', type: 'delegated' },
|
||||
东台市: { province: '江苏省', city: '盐城市', type: 'delegated' },
|
||||
建德市: { province: '浙江省', city: '杭州市', type: 'delegated' },
|
||||
慈溪市: { province: '浙江省', city: '宁波市', type: 'delegated' },
|
||||
余姚市: { province: '浙江省', city: '宁波市', type: 'delegated' },
|
||||
瑞安市: { province: '浙江省', city: '温州市', type: 'delegated' },
|
||||
乐清市: { province: '浙江省', city: '温州市', type: 'delegated' },
|
||||
海宁市: { province: '浙江省', city: '嘉兴市', type: 'delegated' },
|
||||
平湖市: { province: '浙江省', city: '嘉兴市', type: 'delegated' },
|
||||
桐乡市: { province: '浙江省', city: '嘉兴市', type: 'delegated' },
|
||||
诸暨市: { province: '浙江省', city: '绍兴市', type: 'delegated' },
|
||||
嵊州市: { province: '浙江省', city: '绍兴市', type: 'delegated' },
|
||||
兰溪市: { province: '浙江省', city: '金华市', type: 'delegated' },
|
||||
义乌市: { province: '浙江省', city: '金华市', type: 'delegated' },
|
||||
东阳市: { province: '浙江省', city: '金华市', type: 'delegated' },
|
||||
永康市: { province: '浙江省', city: '金华市', type: 'delegated' },
|
||||
江山市: { province: '浙江省', city: '衢州市', type: 'delegated' },
|
||||
温岭市: { province: '浙江省', city: '台州市', type: 'delegated' },
|
||||
临海市: { province: '浙江省', city: '台州市', type: 'delegated' },
|
||||
龙泉市: { province: '浙江省', city: '丽水市', type: 'delegated' },
|
||||
巢湖市: { province: '安徽省', city: '合肥市', type: 'delegated' },
|
||||
无为市: { province: '安徽省', city: '芜湖市', type: 'delegated' },
|
||||
桐城市: { province: '安徽省', city: '安庆市', type: 'delegated' },
|
||||
天长市: { province: '安徽省', city: '滁州市', type: 'delegated' },
|
||||
明光市: { province: '安徽省', city: '滁州市', type: 'delegated' },
|
||||
界首市: { province: '安徽省', city: '阜阳市', type: 'delegated' },
|
||||
宁国市: { province: '安徽省', city: '宣城市', type: 'delegated' },
|
||||
广德市: { province: '安徽省', city: '宣城市', type: 'delegated' },
|
||||
福清市: { province: '福建省', city: '福州市', type: 'delegated' },
|
||||
晋江市: { province: '福建省', city: '泉州市', type: 'delegated' },
|
||||
南安市: { province: '福建省', city: '泉州市', type: 'delegated' },
|
||||
石狮市: { province: '福建省', city: '泉州市', type: 'delegated' },
|
||||
龙海市: { province: '福建省', city: '漳州市', type: 'delegated' },
|
||||
邵武市: { province: '福建省', city: '南平市', type: 'delegated' },
|
||||
武夷山市: { province: '福建省', city: '南平市', type: 'delegated' },
|
||||
漳平市: { province: '福建省', city: '龙岩市', type: 'delegated' },
|
||||
福安市: { province: '福建省', city: '宁德市', type: 'delegated' },
|
||||
福鼎市: { province: '福建省', city: '宁德市', type: 'delegated' },
|
||||
乐平市: { province: '江西省', city: '景德镇市', type: 'delegated' },
|
||||
瑞昌市: { province: '江西省', city: '九江市', type: 'delegated' },
|
||||
共青城市: { province: '江西省', city: '九江市', type: 'delegated' },
|
||||
庐山市: { province: '江西省', city: '九江市', type: 'delegated' },
|
||||
贵溪市: { province: '江西省', city: '鹰潭市', type: 'delegated' },
|
||||
瑞金市: { province: '江西省', city: '赣州市', type: 'delegated' },
|
||||
井冈山市: { province: '江西省', city: '吉安市', type: 'delegated' },
|
||||
丰城市: { province: '江西省', city: '宜春市', type: 'delegated' },
|
||||
樟树市: { province: '江西省', city: '宜春市', type: 'delegated' },
|
||||
高安市: { province: '江西省', city: '宜春市', type: 'delegated' },
|
||||
德兴市: { province: '江西省', city: '上饶市', type: 'delegated' },
|
||||
章丘区: { province: '山东省', city: '济南市', type: 'delegated' },
|
||||
胶州市: { province: '山东省', city: '青岛市', type: 'delegated' },
|
||||
平度市: { province: '山东省', city: '青岛市', type: 'delegated' },
|
||||
莱西市: { province: '山东省', city: '青岛市', type: 'delegated' },
|
||||
滕州市: { province: '山东省', city: '枣庄市', type: 'delegated' },
|
||||
龙口市: { province: '山东省', city: '烟台市', type: 'delegated' },
|
||||
莱阳市: { province: '山东省', city: '烟台市', type: 'delegated' },
|
||||
莱州市: { province: '山东省', city: '烟台市', type: 'delegated' },
|
||||
招远市: { province: '山东省', city: '烟台市', type: 'delegated' },
|
||||
栖霞市: { province: '山东省', city: '烟台市', type: 'delegated' },
|
||||
海阳市: { province: '山东省', city: '烟台市', type: 'delegated' },
|
||||
青州市: { province: '山东省', city: '潍坊市', type: 'delegated' },
|
||||
诸城市: { province: '山东省', city: '潍坊市', type: 'delegated' },
|
||||
寿光市: { province: '山东省', city: '潍坊市', type: 'delegated' },
|
||||
安丘市: { province: '山东省', city: '潍坊市', type: 'delegated' },
|
||||
高密市: { province: '山东省', city: '潍坊市', type: 'delegated' },
|
||||
昌邑市: { province: '山东省', city: '潍坊市', type: 'delegated' },
|
||||
曲阜市: { province: '山东省', city: '济宁市', type: 'delegated' },
|
||||
邹城市: { province: '山东省', city: '济宁市', type: 'delegated' },
|
||||
新泰市: { province: '山东省', city: '泰安市', type: 'delegated' },
|
||||
肥城市: { province: '山东省', city: '泰安市', type: 'delegated' },
|
||||
荣成市: { province: '山东省', city: '威海市', type: 'delegated' },
|
||||
乳山市: { province: '山东省', city: '威海市', type: 'delegated' },
|
||||
乐陵市: { province: '山东省', city: '德州市', type: 'delegated' },
|
||||
禹城市: { province: '山东省', city: '德州市', type: 'delegated' },
|
||||
临清市: { province: '山东省', city: '聊城市', type: 'delegated' },
|
||||
巩义市: { province: '河南省', city: '郑州市', type: 'delegated' },
|
||||
新密市: { province: '河南省', city: '郑州市', type: 'delegated' },
|
||||
荥阳市: { province: '河南省', city: '郑州市', type: 'delegated' },
|
||||
新郑市: { province: '河南省', city: '郑州市', type: 'delegated' },
|
||||
登封市: { province: '河南省', city: '郑州市', type: 'delegated' },
|
||||
偃师区: { province: '河南省', city: '洛阳市', type: 'delegated' },
|
||||
舞钢市: { province: '河南省', city: '平顶山市', type: 'delegated' },
|
||||
汝州市: { province: '河南省', city: '平顶山市', type: 'delegated' },
|
||||
林州市: { province: '河南省', city: '安阳市', type: 'delegated' },
|
||||
卫辉市: { province: '河南省', city: '新乡市', type: 'delegated' },
|
||||
辉县市: { province: '河南省', city: '新乡市', type: 'delegated' },
|
||||
长垣市: { province: '河南省', city: '新乡市', type: 'delegated' },
|
||||
沁阳市: { province: '河南省', city: '焦作市', type: 'delegated' },
|
||||
孟州市: { province: '河南省', city: '焦作市', type: 'delegated' },
|
||||
禹州市: { province: '河南省', city: '许昌市', type: 'delegated' },
|
||||
长葛市: { province: '河南省', city: '许昌市', type: 'delegated' },
|
||||
义马市: { province: '河南省', city: '三门峡市', type: 'delegated' },
|
||||
灵宝市: { province: '河南省', city: '三门峡市', type: 'delegated' },
|
||||
邓州市: { province: '河南省', city: '南阳市', type: 'delegated' },
|
||||
永城市: { province: '河南省', city: '商丘市', type: 'delegated' },
|
||||
项城市: { province: '河南省', city: '周口市', type: 'delegated' },
|
||||
大冶市: { province: '湖北省', city: '黄石市', type: 'delegated' },
|
||||
丹江口市: { province: '湖北省', city: '十堰市', type: 'delegated' },
|
||||
宜都市: { province: '湖北省', city: '宜昌市', type: 'delegated' },
|
||||
当阳市: { province: '湖北省', city: '宜昌市', type: 'delegated' },
|
||||
枝江市: { province: '湖北省', city: '宜昌市', type: 'delegated' },
|
||||
老河口市: { province: '湖北省', city: '襄阳市', type: 'delegated' },
|
||||
枣阳市: { province: '湖北省', city: '襄阳市', type: 'delegated' },
|
||||
宜城市: { province: '湖北省', city: '襄阳市', type: 'delegated' },
|
||||
钟祥市: { province: '湖北省', city: '荆门市', type: 'delegated' },
|
||||
京山市: { province: '湖北省', city: '荆门市', type: 'delegated' },
|
||||
应城市: { province: '湖北省', city: '孝感市', type: 'delegated' },
|
||||
安陆市: { province: '湖北省', city: '孝感市', type: 'delegated' },
|
||||
汉川市: { province: '湖北省', city: '孝感市', type: 'delegated' },
|
||||
石首市: { province: '湖北省', city: '荆州市', type: 'delegated' },
|
||||
洪湖市: { province: '湖北省', city: '荆州市', type: 'delegated' },
|
||||
松滋市: { province: '湖北省', city: '荆州市', type: 'delegated' },
|
||||
监利市: { province: '湖北省', city: '荆州市', type: 'delegated' },
|
||||
麻城市: { province: '湖北省', city: '黄冈市', type: 'delegated' },
|
||||
武穴市: { province: '湖北省', city: '黄冈市', type: 'delegated' },
|
||||
赤壁市: { province: '湖北省', city: '咸宁市', type: 'delegated' },
|
||||
广水市: { province: '湖北省', city: '随州市', type: 'delegated' },
|
||||
恩施市: { province: '湖北省', city: '恩施土家族苗族自治州', type: 'delegated' },
|
||||
利川市: { province: '湖北省', city: '恩施土家族苗族自治州', type: 'delegated' },
|
||||
浏阳市: { province: '湖南省', city: '长沙市', type: 'delegated' },
|
||||
宁乡市: { province: '湖南省', city: '长沙市', type: 'delegated' },
|
||||
醴陵市: { province: '湖南省', city: '株洲市', type: 'delegated' },
|
||||
湘乡市: { province: '湖南省', city: '湘潭市', type: 'delegated' },
|
||||
韶山市: { province: '湖南省', city: '湘潭市', type: 'delegated' },
|
||||
耒阳市: { province: '湖南省', city: '衡阳市', type: 'delegated' },
|
||||
常宁市: { province: '湖南省', city: '衡阳市', type: 'delegated' },
|
||||
武冈市: { province: '湖南省', city: '邵阳市', type: 'delegated' },
|
||||
邵东市: { province: '湖南省', city: '邵阳市', type: 'delegated' },
|
||||
汨罗市: { province: '湖南省', city: '岳阳市', type: 'delegated' },
|
||||
临湘市: { province: '湖南省', city: '岳阳市', type: 'delegated' },
|
||||
津市市: { province: '湖南省', city: '常德市', type: 'delegated' },
|
||||
沅江市: { province: '湖南省', city: '益阳市', type: 'delegated' },
|
||||
资兴市: { province: '湖南省', city: '郴州市', type: 'delegated' },
|
||||
洪江市: { province: '湖南省', city: '怀化市', type: 'delegated' },
|
||||
冷水江市: { province: '湖南省', city: '娄底市', type: 'delegated' },
|
||||
涟源市: { province: '湖南省', city: '娄底市', type: 'delegated' },
|
||||
吉首市: { province: '湖南省', city: '湘西土家族苗族自治州', type: 'delegated' },
|
||||
增城区: { province: '广东省', city: '广州市', type: 'delegated' },
|
||||
从化区: { province: '广东省', city: '广州市', type: 'delegated' },
|
||||
乐昌市: { province: '广东省', city: '韶关市', type: 'delegated' },
|
||||
南雄市: { province: '广东省', city: '韶关市', type: 'delegated' },
|
||||
廉江市: { province: '广东省', city: '湛江市', type: 'delegated' },
|
||||
雷州市: { province: '广东省', city: '湛江市', type: 'delegated' },
|
||||
吴川市: { province: '广东省', city: '湛江市', type: 'delegated' },
|
||||
高州市: { province: '广东省', city: '茂名市', type: 'delegated' },
|
||||
化州市: { province: '广东省', city: '茂名市', type: 'delegated' },
|
||||
信宜市: { province: '广东省', city: '茂名市', type: 'delegated' },
|
||||
高要区: { province: '广东省', city: '肇庆市', type: 'delegated' },
|
||||
四会市: { province: '广东省', city: '肇庆市', type: 'delegated' },
|
||||
惠东县: { province: '广东省', city: '惠州市', type: 'delegated' },
|
||||
博罗县: { province: '广东省', city: '惠州市', type: 'delegated' },
|
||||
龙门县: { province: '广东省', city: '惠州市', type: 'delegated' },
|
||||
兴宁市: { province: '广东省', city: '梅州市', type: 'delegated' },
|
||||
陆丰市: { province: '广东省', city: '汕尾市', type: 'delegated' },
|
||||
阳春市: { province: '广东省', city: '阳江市', type: 'delegated' },
|
||||
英德市: { province: '广东省', city: '清远市', type: 'delegated' },
|
||||
连州市: { province: '广东省', city: '清远市', type: 'delegated' },
|
||||
普宁市: { province: '广东省', city: '揭阳市', type: 'delegated' },
|
||||
罗定市: { province: '广东省', city: '云浮市', type: 'delegated' },
|
||||
岑溪市: { province: '广西壮族自治区', city: '梧州市', type: 'delegated' },
|
||||
东兴市: { province: '广西壮族自治区', city: '防城港市', type: 'delegated' },
|
||||
桂平市: { province: '广西壮族自治区', city: '贵港市', type: 'delegated' },
|
||||
北流市: { province: '广西壮族自治区', city: '玉林市', type: 'delegated' },
|
||||
靖西市: { province: '广西壮族自治区', city: '百色市', type: 'delegated' },
|
||||
平果市: { province: '广西壮族自治区', city: '百色市', type: 'delegated' },
|
||||
合山市: { province: '广西壮族自治区', city: '来宾市', type: 'delegated' },
|
||||
凭祥市: { province: '广西壮族自治区', city: '崇左市', type: 'delegated' },
|
||||
都江堰市: { province: '四川省', city: '成都市', type: 'delegated' },
|
||||
彭州市: { province: '四川省', city: '成都市', type: 'delegated' },
|
||||
邛崃市: { province: '四川省', city: '成都市', type: 'delegated' },
|
||||
崇州市: { province: '四川省', city: '成都市', type: 'delegated' },
|
||||
简阳市: { province: '四川省', city: '成都市', type: 'delegated' },
|
||||
广汉市: { province: '四川省', city: '德阳市', type: 'delegated' },
|
||||
什邡市: { province: '四川省', city: '德阳市', type: 'delegated' },
|
||||
绵竹市: { province: '四川省', city: '德阳市', type: 'delegated' },
|
||||
江油市: { province: '四川省', city: '绵阳市', type: 'delegated' },
|
||||
峨眉山市: { province: '四川省', city: '乐山市', type: 'delegated' },
|
||||
阆中市: { province: '四川省', city: '南充市', type: 'delegated' },
|
||||
华蓥市: { province: '四川省', city: '广安市', type: 'delegated' },
|
||||
万源市: { province: '四川省', city: '达州市', type: 'delegated' },
|
||||
西昌市: { province: '四川省', city: '凉山彝族自治州', type: 'delegated' },
|
||||
会理市: { province: '四川省', city: '凉山彝族自治州', type: 'delegated' },
|
||||
康定市: { province: '四川省', city: '甘孜藏族自治州', type: 'delegated' },
|
||||
马尔康市: { province: '四川省', city: '阿坝藏族羌族自治州', type: 'delegated' },
|
||||
清镇市: { province: '贵州省', city: '贵阳市', type: 'delegated' },
|
||||
盘州市: { province: '贵州省', city: '六盘水市', type: 'delegated' },
|
||||
赤水市: { province: '贵州省', city: '遵义市', type: 'delegated' },
|
||||
仁怀市: { province: '贵州省', city: '遵义市', type: 'delegated' },
|
||||
兴义市: { province: '贵州省', city: '黔西南布依族苗族自治州', type: 'delegated' },
|
||||
兴仁市: { province: '贵州省', city: '黔西南布依族苗族自治州', type: 'delegated' },
|
||||
凯里市: { province: '贵州省', city: '黔东南苗族侗族自治州', type: 'delegated' },
|
||||
都匀市: { province: '贵州省', city: '黔南布依族苗族自治州', type: 'delegated' },
|
||||
福泉市: { province: '贵州省', city: '黔南布依族苗族自治州', type: 'delegated' },
|
||||
安宁市: { province: '云南省', city: '昆明市', type: 'delegated' },
|
||||
宣威市: { province: '云南省', city: '曲靖市', type: 'delegated' },
|
||||
腾冲市: { province: '云南省', city: '保山市', type: 'delegated' },
|
||||
水富市: { province: '云南省', city: '昭通市', type: 'delegated' },
|
||||
楚雄市: { province: '云南省', city: '楚雄彝族自治州', type: 'delegated' },
|
||||
禄丰市: { province: '云南省', city: '楚雄彝族自治州', type: 'delegated' },
|
||||
个旧市: { province: '云南省', city: '红河哈尼族彝族自治州', type: 'delegated' },
|
||||
开远市: { province: '云南省', city: '红河哈尼族彝族自治州', type: 'delegated' },
|
||||
蒙自市: { province: '云南省', city: '红河哈尼族彝族自治州', type: 'delegated' },
|
||||
弥勒市: { province: '云南省', city: '红河哈尼族彝族自治州', type: 'delegated' },
|
||||
文山市: { province: '云南省', city: '文山壮族苗族自治州', type: 'delegated' },
|
||||
景洪市: { province: '云南省', city: '西双版纳傣族自治州', type: 'delegated' },
|
||||
大理市: { province: '云南省', city: '大理白族自治州', type: 'delegated' },
|
||||
瑞丽市: { province: '云南省', city: '德宏傣族景颇族自治州', type: 'delegated' },
|
||||
芒市: { province: '云南省', city: '德宏傣族景颇族自治州', type: 'delegated' },
|
||||
泸水市: { province: '云南省', city: '怒江傈僳族自治州', type: 'delegated' },
|
||||
香格里拉市: { province: '云南省', city: '迪庆藏族自治州', type: 'delegated' },
|
||||
兴平市: { province: '陕西省', city: '咸阳市', type: 'delegated' },
|
||||
彬州市: { province: '陕西省', city: '咸阳市', type: 'delegated' },
|
||||
韩城市: { province: '陕西省', city: '渭南市', type: 'delegated' },
|
||||
华阴市: { province: '陕西省', city: '渭南市', type: 'delegated' },
|
||||
子长市: { province: '陕西省', city: '延安市', type: 'delegated' },
|
||||
神木市: { province: '陕西省', city: '榆林市', type: 'delegated' },
|
||||
玉门市: { province: '甘肃省', city: '酒泉市', type: 'delegated' },
|
||||
敦煌市: { province: '甘肃省', city: '酒泉市', type: 'delegated' },
|
||||
华亭市: { province: '甘肃省', city: '平凉市', type: 'delegated' },
|
||||
合作市: { province: '甘肃省', city: '甘南藏族自治州', type: 'delegated' },
|
||||
格尔木市: { province: '青海省', city: '海西蒙古族藏族自治州', type: 'delegated' },
|
||||
茫崖市: { province: '青海省', city: '海西蒙古族藏族自治州', type: 'delegated' },
|
||||
德令哈市: { province: '青海省', city: '海西蒙古族藏族自治州', type: 'delegated' },
|
||||
玉树市: { province: '青海省', city: '玉树藏族自治州', type: 'delegated' },
|
||||
灵武市: { province: '宁夏回族自治区', city: '银川市', type: 'delegated' },
|
||||
青铜峡市: { province: '宁夏回族自治区', city: '吴忠市', type: 'delegated' },
|
||||
奎屯市: { province: '新疆维吾尔自治区', city: '伊犁哈萨克自治州', type: 'delegated' },
|
||||
霍尔果斯市: { province: '新疆维吾尔自治区', city: '伊犁哈萨克自治州', type: 'delegated' },
|
||||
库尔勒市: { province: '新疆维吾尔自治区', city: '巴音郭楞蒙古自治州', type: 'delegated' },
|
||||
阿克苏市: { province: '新疆维吾尔自治区', city: '阿克苏地区', type: 'delegated' },
|
||||
库车市: { province: '新疆维吾尔自治区', city: '阿克苏地区', type: 'delegated' },
|
||||
阿图什市: { province: '新疆维吾尔自治区', city: '克孜勒苏柯尔克孜自治州', type: 'delegated' },
|
||||
喀什市: { province: '新疆维吾尔自治区', city: '喀什地区', type: 'delegated' },
|
||||
和田市: { province: '新疆维吾尔自治区', city: '和田地区', type: 'delegated' },
|
||||
博乐市: { province: '新疆维吾尔自治区', city: '博尔塔拉蒙古自治州', type: 'delegated' },
|
||||
阿拉山口市: { province: '新疆维吾尔自治区', city: '博尔塔拉蒙古自治州', type: 'delegated' },
|
||||
伊宁市: { province: '新疆维吾尔自治区', city: '伊犁哈萨克自治州', type: 'delegated' },
|
||||
塔城市: { province: '新疆维吾尔自治区', city: '塔城地区', type: 'delegated' },
|
||||
乌苏市: { province: '新疆维吾尔自治区', city: '塔城地区', type: 'delegated' },
|
||||
沙湾市: { province: '新疆维吾尔自治区', city: '塔城地区', type: 'delegated' },
|
||||
阿勒泰市: { province: '新疆维吾尔自治区', city: '阿勒泰地区', type: 'delegated' },
|
||||
昌吉市: { province: '新疆维吾尔自治区', city: '昌吉回族自治州', type: 'delegated' },
|
||||
阜康市: { province: '新疆维吾尔自治区', city: '昌吉回族自治州', type: 'delegated' },
|
||||
哈密市: { province: '新疆维吾尔自治区', city: '哈密市', type: 'delegated' },
|
||||
吐鲁番市: { province: '新疆维吾尔自治区', city: '吐鲁番市', type: 'delegated' },
|
||||
});
|
||||
|
||||
/**
|
||||
* 直辖市名称集合,用于判断是否为直辖市地址。
|
||||
*/
|
||||
const MUNICIPALITY_SET = new Set([
|
||||
'北京市', '天津市', '上海市', '重庆市',
|
||||
]);
|
||||
|
||||
/**
|
||||
* 省份名称集合,用于 city/area 名反向匹配省份。
|
||||
*/
|
||||
const PROVINCE_LIST = [
|
||||
'北京市', '天津市', '上海市', '重庆市',
|
||||
'河北省', '山西省', '辽宁省', '吉林省', '黑龙江省',
|
||||
'江苏省', '浙江省', '安徽省', '福建省', '江西省', '山东省',
|
||||
'河南省', '湖北省', '湖南省', '广东省', '海南省',
|
||||
'四川省', '贵州省', '云南省', '陕西省', '甘肃省', '青海省',
|
||||
'台湾省',
|
||||
'内蒙古自治区', '广西壮族自治区', '西藏自治区', '宁夏回族自治区', '新疆维吾尔自治区',
|
||||
'香港特别行政区', '澳门特别行政区',
|
||||
];
|
||||
|
||||
/**
|
||||
* 根据已解析的地址字段,利用中国行政区划知识进行反向推断,补全缺失的 province/city/area。
|
||||
*
|
||||
* 处理逻辑:
|
||||
* 1. 若 area 在 CHINA_ADMIN_DIVISION_MAP 中,直接补全 province 和 city
|
||||
* 2. 若 province 为空但 city 或 area 不为空,尝试通过名称匹配推断省份
|
||||
* 3. 若 city 为空但 area 不为空,尝试通过 area 名推断城市
|
||||
* 4. 若 city 和 area 都为空,尝试从 town / detailAddress 中提取信息
|
||||
* 5. 对不设区地级市,若 area 为空则用 city 填充
|
||||
*
|
||||
* @param {Object} parsed AI 解析后的原始结果 { province, city, area, town, detailAddress, name, mobile }
|
||||
* @return {Object} 修正后的结果,结构与输入一致
|
||||
*/
|
||||
function reverseInferAddress(parsed) {
|
||||
let { province, city, area, town } = parsed;
|
||||
const { detailAddress } = parsed;
|
||||
|
||||
// 标准化:去除末尾的"市"、"省"等做模糊匹配用
|
||||
const normalizeName = name => {
|
||||
if (!name) return '';
|
||||
let n = name.trim();
|
||||
// 去掉末尾的"市"、"县"、"区"、"自治县"、"自治州" 等后缀
|
||||
n = n.replace(/(市|县|区|自治县|自治州|地区|盟|林区)$/, '');
|
||||
return n;
|
||||
};
|
||||
|
||||
// --- 步骤1:area 命中行政区划映射表 ---
|
||||
if (area) {
|
||||
const entry = CHINA_ADMIN_DIVISION_MAP[area];
|
||||
if (entry) {
|
||||
province = province || entry.province;
|
||||
city = city || entry.city;
|
||||
// 不设区地级市:area 和 city 一样时补充说明
|
||||
if (entry.type === 'no_district' && (!area || area === city || area === entry.city)) {
|
||||
// area 已是 city 名,保持不变(允许 area = city 对于不设区地级市)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- 步骤2:province 为空,从 city 或 area 反查 ---
|
||||
if (!province) {
|
||||
// 尝试从 city 反查省份(去掉"市"后缀)
|
||||
if (city) {
|
||||
const cityNorm = normalizeName(city);
|
||||
// 先在映射表中查(按 city 名匹配)
|
||||
for (const [ , entry ] of Object.entries(CHINA_ADMIN_DIVISION_MAP)) {
|
||||
if (entry.city && normalizeName(entry.city) === cityNorm && entry.province) {
|
||||
province = entry.province;
|
||||
break;
|
||||
}
|
||||
}
|
||||
// 如果没找到,尝试判断是否本身是省份名
|
||||
if (!province && PROVINCE_LIST.includes(city)) {
|
||||
province = city;
|
||||
}
|
||||
}
|
||||
// 如果 city 没有,尝试从 area 反查
|
||||
if (!province && area) {
|
||||
const entry = CHINA_ADMIN_DIVISION_MAP[area];
|
||||
if (entry && entry.province) {
|
||||
province = entry.province;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- 步骤3:city 为空但 area 不为空,反查城市 ---
|
||||
if (!city && area) {
|
||||
const entry = CHINA_ADMIN_DIVISION_MAP[area];
|
||||
if (entry && entry.city) {
|
||||
city = entry.city;
|
||||
} else {
|
||||
// 若 area 带"市"后缀,则 city 与 area 同名
|
||||
if (area.endsWith('市') && !MUNICIPALITY_SET.has(area)) {
|
||||
city = area;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- 步骤4:city 和 area 都为空,尝试从 town / detailAddress 提取 ---
|
||||
if (!city && !area) {
|
||||
const townStr = (town || '').trim();
|
||||
const detailStr = (detailAddress || '').trim();
|
||||
|
||||
// 从 town 中匹配已知城市/区县
|
||||
if (townStr) {
|
||||
for (const [ key, entry ] of Object.entries(CHINA_ADMIN_DIVISION_MAP)) {
|
||||
if (townStr.includes(key) || townStr.includes(normalizeName(key))) {
|
||||
province = province || entry.province;
|
||||
city = city || entry.city;
|
||||
area = area || key;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 从 detailAddress 中尝试匹配
|
||||
if (!city && !area && detailStr) {
|
||||
for (const [ key, entry ] of Object.entries(CHINA_ADMIN_DIVISION_MAP)) {
|
||||
if (detailStr.includes(key) || detailStr.includes(normalizeName(key))) {
|
||||
province = province || entry.province;
|
||||
city = city || entry.city;
|
||||
area = area || key;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// --- 步骤5:不设区地级市兜底 ---
|
||||
// 若 city 已知且为不设区地级市,area 为空则用 city 填充
|
||||
if (city && !area) {
|
||||
const cityNorm = normalizeName(city);
|
||||
for (const [ , entry ] of Object.entries(CHINA_ADMIN_DIVISION_MAP)) {
|
||||
if (entry.type === 'no_district' && normalizeName(entry.city) === cityNorm) {
|
||||
area = entry.city; // 对于不设区地级市,area 填 city 名
|
||||
province = province || entry.province;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return { ...parsed, province: province || '', city: city || '', area: area || '' };
|
||||
}
|
||||
|
||||
class PendingOrderService extends OrderBaseService {
|
||||
/**
|
||||
* 初始化待处理订单系统方法的免登录、免权限、免日志和免鉴权配置。
|
||||
@ -1006,22 +1472,11 @@ class PendingOrderService extends OrderBaseService {
|
||||
throw new Error('分配快递号接口仅支持订单对象数组入参');
|
||||
}
|
||||
|
||||
const isBusinessIdOne = businessKey => {
|
||||
const businessKeys = Array.isArray(businessKey) ? businessKey : [ businessKey ];
|
||||
return businessKeys.some(item => Number(item) === 1);
|
||||
};
|
||||
|
||||
const orderIds = [ ...new Set(
|
||||
orders
|
||||
.map(order => Number(order && (order.order_id || order.id)))
|
||||
.filter(orderId => Number.isFinite(orderId) && orderId > 0)
|
||||
) ];
|
||||
const rollbackOrderIds = [ ...new Set(
|
||||
orders
|
||||
.filter(order => isBusinessIdOne(order && order.business_key))
|
||||
.map(order => Number(order && (order.order_id || order.id)))
|
||||
.filter(orderId => Number.isFinite(orderId) && orderId > 0)
|
||||
) ];
|
||||
|
||||
const { service } = this;
|
||||
try {
|
||||
@ -1034,16 +1489,30 @@ class PendingOrderService extends OrderBaseService {
|
||||
? await orderDeliveryFactory.getCurrentModel()
|
||||
: null;
|
||||
|
||||
if (rollbackOrderIds.length > 0) {
|
||||
await this.service.systems.express.markWaybillAsyncOrdersAsError(
|
||||
orderDeliveryModel,
|
||||
rollbackOrderIds,
|
||||
error && error.message ? `${error.message}` : `${error}`
|
||||
);
|
||||
} else {
|
||||
this.ctx.logger.info('[PendingOrderService.allocateExpressCode] 未命中 business_id=1 订单,跳过 post_status 失败回写', {
|
||||
totalOrderCount: orderIds.length,
|
||||
if (orderDeliveryModel && orderIds.length > 0) {
|
||||
// 查询当前订单的 express_code,只回滚没有运单号的
|
||||
const currentOrders = await orderDeliveryModel.findAll({
|
||||
// eslint-disable-next-line array-bracket-spacing
|
||||
where: { id: { [this.app.Sequelize.Op.in]: orderIds } },
|
||||
attributes: [ 'id', 'express_code', 'post_status' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const noWaybillOrderIds = (Array.isArray(currentOrders) ? currentOrders : [])
|
||||
.filter(o => !String(o.express_code || '').trim())
|
||||
.map(o => Number(o.id))
|
||||
.filter(id => id > 0);
|
||||
|
||||
if (noWaybillOrderIds.length > 0) {
|
||||
await orderDeliveryModel.update(
|
||||
{ post_status: 'none', updated_at: new Date() },
|
||||
// eslint-disable-next-line array-bracket-spacing
|
||||
{ where: { id: { [this.app.Sequelize.Op.in]: noWaybillOrderIds } } }
|
||||
);
|
||||
this.ctx.logger.info('[PendingOrderService.allocateExpressCode] 回滚 post_status 为 none', {
|
||||
orderIds: noWaybillOrderIds,
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (markError) {
|
||||
this.ctx.logger.warn('[PendingOrderService.allocateExpressCode] 通过统一 helper 回写订单失败状态失败,不影响主流程', markError);
|
||||
@ -1316,6 +1785,15 @@ class PendingOrderService extends OrderBaseService {
|
||||
}
|
||||
}
|
||||
|
||||
// 释放储位分配和库存锁定
|
||||
try {
|
||||
await this.service.systems.orderStorageAllocation.cancelAllocateStorage({
|
||||
order_ids: orderIds,
|
||||
});
|
||||
} catch (allocErr) {
|
||||
this.ctx.logger.warn('[PendingOrderService.cancelOrder] 释放储位分配失败,不影响订单取消', allocErr);
|
||||
}
|
||||
|
||||
const updatedOrders = await model.findAll({
|
||||
where,
|
||||
raw: true,
|
||||
@ -1603,6 +2081,7 @@ class PendingOrderService extends OrderBaseService {
|
||||
sys_logistics_name: sysLogisticsName,
|
||||
logistics_code: logisticsCode,
|
||||
logistics_name: logisticsName,
|
||||
post_status: 'fin',
|
||||
updated_at: new Date(),
|
||||
}, { where });
|
||||
|
||||
@ -1949,6 +2428,12 @@ class PendingOrderService extends OrderBaseService {
|
||||
|
||||
/**
|
||||
* 智能地址解析:使用 DeepSeek 将用户输入的地址字符串解析为结构化地址。
|
||||
*
|
||||
* 采用"AI 解析 + 反向识别兜底"双层策略:
|
||||
* 1. 先由 DeepSeek AI 进行语义级地址解析
|
||||
* 2. 若 AI 返回的省/市/区字段缺失,通过内置的中国行政区划映射表反向补全
|
||||
* 3. 仅在两层策略均无法确定 province 时才判定失败
|
||||
*
|
||||
* @param {Object} data 请求数据。
|
||||
* @param {string} data.address 原始地址字符串(必填)。
|
||||
* @return {Promise<Object>} 解析结果,成功返回 province/city/area/town/detailAddress/name/mobile 等,失败返回错误。
|
||||
@ -1970,12 +2455,19 @@ class PendingOrderService extends OrderBaseService {
|
||||
|
||||
规则:
|
||||
1. 提取字段:province(省)、city(市)、area(区/县)、town(乡镇/街道)、detailAddress(详细地址)、name(收件人)、mobile(手机号)
|
||||
2. **利用你的中国地理知识**:如果地址包含村/镇/街道/社区名称,请检索你的知识库推测它所属的省市区。例如:
|
||||
- "和丰一社" + 常见于广东地区村组命名 → 推测为广东省 东莞市/广州市等
|
||||
- 根据地址中的方言特征、命名习惯推测所在区域
|
||||
3. 如果实在无法确定,province填"",city和area同理填"",收件人和name同理填"",mobile同理填""。
|
||||
4. detailAddress去除省市区部分,只保留街道/村/门牌号
|
||||
5. 只返回纯JSON,不含解释或markdown
|
||||
2. **中国行政区划特殊规则(非常重要)**:
|
||||
- 四大直辖市(北京、天津、上海、重庆):province填直辖市名,city填直辖市名,area填市辖区名(如"朝阳区")
|
||||
- 省直辖县级市(如湖北仙桃/潜江/天门、河南济源、海南五指山/琼海/文昌/万宁/东方、新疆石河子等):province填省名,city填省名或留空,area填县级市名
|
||||
- 不设区的地级市(如东莞、中山、嘉峪关、儋州、三沙):province填省名,city填地级市名,area填地级市名或留空
|
||||
- 普通地级市代管的县级市(如苏州代管昆山、无锡代管江阴、潍坊代管寿光等):province填省名,city填地级市名,area填县级市名
|
||||
3. **利用你的中国地理知识**:如果地址缺少省份或城市信息,请检索你的知识库反向推断。例如:
|
||||
- "仙桃市xxx路" → province=湖北省, city=湖北省, area=仙桃市(省直辖县级市)
|
||||
- "昆山市xxx镇" → province=江苏省, city=苏州市, area=昆山市(苏州代管县级市)
|
||||
- "广东省东莞市xxx镇" → province=广东省, city=东莞市, area=东莞市(不设区的地级市)
|
||||
- "浙江省xxx村" → 根据村名命名习惯和方言特征推测所属城市
|
||||
4. 如果实在无法确定,province填"",city和area同理填"",收件人和name同理填"",mobile同理填""。
|
||||
5. detailAddress去除省市区部分,只保留街道/村/门牌号
|
||||
6. 只返回纯JSON,不含解释或markdown
|
||||
|
||||
地址字符串: "${address}"
|
||||
|
||||
@ -2013,11 +2505,29 @@ class PendingOrderService extends OrderBaseService {
|
||||
|
||||
try {
|
||||
const parsed = JSON.parse(jsonStr);
|
||||
const province = String(parsed.province || '').trim();
|
||||
const city = String(parsed.city || '').trim();
|
||||
const area = String(parsed.area || '').trim();
|
||||
let province = String(parsed.province || '').trim();
|
||||
let city = String(parsed.city || '').trim();
|
||||
let area = String(parsed.area || '').trim();
|
||||
const town = String(parsed.town || '').trim();
|
||||
const detailAddress = String(parsed.detailAddress || '').trim();
|
||||
const name = String(parsed.name || '').trim();
|
||||
const mobile = String(parsed.mobile || '').trim();
|
||||
|
||||
// --- 反向识别兜底:使用内置行政区划映射表补全缺失字段 ---
|
||||
const inferred = reverseInferAddress({
|
||||
province,
|
||||
city,
|
||||
area,
|
||||
town,
|
||||
detailAddress,
|
||||
name,
|
||||
mobile,
|
||||
});
|
||||
province = inferred.province;
|
||||
city = inferred.city;
|
||||
area = inferred.area;
|
||||
|
||||
// 反向识别后仍无 province 才判定失败
|
||||
if (!province || province === '暂未识别' || province === '其他') {
|
||||
return this.fail('地址解析失败:省市区无法识别,请补充更多地址信息后重试');
|
||||
}
|
||||
@ -2027,9 +2537,9 @@ class PendingOrderService extends OrderBaseService {
|
||||
city,
|
||||
area,
|
||||
town,
|
||||
detailAddress: String(parsed.detailAddress || '').trim(),
|
||||
name: String(parsed.name || '').trim(),
|
||||
mobile: String(parsed.mobile || '').trim(),
|
||||
detailAddress,
|
||||
name,
|
||||
mobile,
|
||||
});
|
||||
} catch (parseError) {
|
||||
this.ctx.logger.warn('[parseAddress] JSON解析失败,原始返回: %s', content);
|
||||
@ -4437,10 +4947,12 @@ class PendingOrderService extends OrderBaseService {
|
||||
*
|
||||
* 为指定待处理订单创建一条运单记录(wms_order_express 表),
|
||||
* 仅允许 step 在 [1,2,3] 且 outbound_status 不为 'padding' 的订单操作。
|
||||
* 完成后同步更新订单表的 print_status 与 post_status 为 'fin',表示外部已打印。
|
||||
*
|
||||
* @param {Object} data 请求体。
|
||||
* @param {number|string} data.order_id 订单ID(必填)。
|
||||
* @param {string} data.waybill_code 运单号(必填)。
|
||||
* @param {string} [data.logistics_interface_name] 物流接口名称(选填,手工填入的值)。
|
||||
* @return {Promise<Object>} 统一 success 包装,含创建的运单记录。
|
||||
*/
|
||||
async manualWaybill(data = {}) {
|
||||
@ -4460,6 +4972,8 @@ class PendingOrderService extends OrderBaseService {
|
||||
throw new Error('waybill_code(运单号)不能为空');
|
||||
}
|
||||
|
||||
const logisticsInterfaceName = String(requestData.logistics_interface_name || '').trim() || null;
|
||||
|
||||
// 2. 查询订单并校验状态(待处理:step in [1,2,3] 且 outbound_status != 'padding')
|
||||
const model = await this.getOrderModel('order', warehouseId);
|
||||
const where = this.buildOrderWhere([ orderId ], warehouseId);
|
||||
@ -4488,12 +5002,41 @@ class PendingOrderService extends OrderBaseService {
|
||||
throw new Error('OrderExpress 模型未加载');
|
||||
}
|
||||
|
||||
// 3.1 计算 business_key 递增:查找当前订单已有最大 business_key,+1 递增
|
||||
const maxBusinessKey = await orderExpressModel.max('business_key', {
|
||||
where: {
|
||||
order_id: orderId,
|
||||
warehouse_id: Number(order.warehouse_id) || warehouseId,
|
||||
},
|
||||
});
|
||||
const nextBusinessKey = Number.isFinite(Number(maxBusinessKey)) && Number(maxBusinessKey) > 0
|
||||
? Number(maxBusinessKey) + 1
|
||||
: 1;
|
||||
|
||||
const expressRecord = await orderExpressModel.create({
|
||||
order_id: orderId,
|
||||
waybill_code: waybillCode,
|
||||
logistics_interface_name: logisticsInterfaceName,
|
||||
warehouse_id: Number(order.warehouse_id) || warehouseId,
|
||||
business_key: nextBusinessKey,
|
||||
status: 1,
|
||||
create_at: new Date(),
|
||||
});
|
||||
|
||||
// 3.2 更新订单表的 print_status 与 post_status 为 'fin',表示外部已打印
|
||||
await model.update(
|
||||
{
|
||||
print_status: 'fin',
|
||||
post_status: 'fin',
|
||||
updated_at: new Date(),
|
||||
},
|
||||
{
|
||||
where: {
|
||||
id: orderId,
|
||||
},
|
||||
}
|
||||
);
|
||||
|
||||
// 4. 记录操作日志
|
||||
try {
|
||||
await this.ctx.service.systems.operationLog.createOperationLog({
|
||||
@ -4505,6 +5048,8 @@ class PendingOrderService extends OrderBaseService {
|
||||
warehouseId: logWarehouseId,
|
||||
orderId,
|
||||
waybillCode,
|
||||
logisticsInterfaceName,
|
||||
businessKey: nextBusinessKey,
|
||||
expressRecordId: expressRecord.id,
|
||||
message: `手工录入运单号:订单 ${orderId},运单号 ${waybillCode}`,
|
||||
},
|
||||
@ -4518,6 +5063,8 @@ class PendingOrderService extends OrderBaseService {
|
||||
id: expressRecord.id,
|
||||
order_id: orderId,
|
||||
waybill_code: waybillCode,
|
||||
business_key: nextBusinessKey,
|
||||
logistics_interface_name: logisticsInterfaceName,
|
||||
create_at: expressRecord.create_at,
|
||||
});
|
||||
}
|
||||
|
||||
@ -10,9 +10,9 @@ class RecheckOrderService extends OrderBaseService {
|
||||
constructor(ctx) {
|
||||
super(ctx);
|
||||
const _noNeedLogin = '';
|
||||
const _noNeedRight = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept';
|
||||
const _noNeedLog = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept';
|
||||
const _noNeedAuth = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept';
|
||||
const _noNeedRight = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck';
|
||||
const _noNeedLog = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck';
|
||||
const _noNeedAuth = 'scanOrder,scanTask,scanWaybill,confirmRecheck,recheckOrderList,confirmIntercept,batchQuickRecheck';
|
||||
this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth);
|
||||
}
|
||||
|
||||
@ -23,8 +23,10 @@ class RecheckOrderService extends OrderBaseService {
|
||||
* 顶层携带波次/拣货人/策略/任务ID等汇总信息,list 为扁平订单数组
|
||||
* - 运单号/波次号命中团购波次(pick_mode=1/5):自动转为团购模式,
|
||||
* 返回嵌套波次结构 list_type='group',每项含波次号、波次内订单明细(含 stock 商品明细)及相关汇总信息
|
||||
* - 车号匹配(团单):返回拣货任务下所有团购波次及订单,list_type='group',保持嵌套结构,
|
||||
* - 车号匹配(团购模式 pick_mode=1/5):返回拣货任务下所有团购波次及订单,list_type='group',保持嵌套结构,
|
||||
* 顶层携带 picker_id、picker_name、task_id
|
||||
* - 车号匹配(散单模式 pick_mode=2/3/4):查询任务关联的所有波次,逐波次构建扫描视图后合并,
|
||||
* 返回 list_type='single',按 order_id 去重,未复核订单排前,顶层携带汇总字段
|
||||
* - 运单号命中但订单无波次信息时,退回单订单详情模式(list 每项含 detail/items/expresses/logs)
|
||||
* @param {Object} data 请求体。
|
||||
* @param {string} [data.keyword] 通用扫描关键词。
|
||||
@ -49,7 +51,7 @@ class RecheckOrderService extends OrderBaseService {
|
||||
const orderModel = await this.getOrderModelByTableType('current', warehouseId);
|
||||
const order = await orderModel.findOne({
|
||||
where: this.buildOrderWhere([ orderId ], warehouseId),
|
||||
attributes: [ 'id', 'wave_id', 'wave_no', 'pick_status', 'delivery_order_code' ],
|
||||
attributes: [ 'id', 'wave_id', 'wave_no', 'pick_status', 'intercept_status', 'delivery_order_code' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
@ -174,26 +176,123 @@ class RecheckOrderService extends OrderBaseService {
|
||||
throw new Error('波次信息不完整,无法加载复核视图');
|
||||
}
|
||||
|
||||
// 团单处理:车号匹配 → 查找拣货任务 → 拉取任务下所有团购波次
|
||||
// 车号匹配 → 查找拣货任务 → 根据 pick_mode 分流团单/散单
|
||||
if (matchType === 'cart' && cartMatchContext) {
|
||||
const taskId = Number(cartMatchContext?.task?.task_id || 0);
|
||||
|
||||
if (taskId > 0) {
|
||||
const [ groupWaveList, pickerInfo ] = await Promise.all([
|
||||
this.buildGroupWaveList(taskId, warehouseId),
|
||||
this.getPickerInfoByTaskId(taskId, warehouseId),
|
||||
]);
|
||||
const pickMode = Number(cartMatchContext?.task?.pick_mode || 0);
|
||||
const { ctx } = this;
|
||||
|
||||
// 团购模式(pick_mode 1/5):拉取任务下所有团购波次
|
||||
if (pickMode === 1 || pickMode === 5) {
|
||||
const [ groupWaveList, pickerInfo ] = await Promise.all([
|
||||
this.buildGroupWaveList(taskId, warehouseId),
|
||||
this.getPickerInfoByTaskId(taskId, warehouseId),
|
||||
]);
|
||||
return {
|
||||
match_type: 'cart',
|
||||
list_type: 'group',
|
||||
picker_id: pickerInfo.picker_id,
|
||||
picker_name: pickerInfo.picker_name,
|
||||
task_id: taskId,
|
||||
list: groupWaveList,
|
||||
};
|
||||
}
|
||||
|
||||
// 散单模式(pick_mode 2/3/4):查询任务关联的波次,逐波次构建扫描视图并合并
|
||||
const taskWaveRows = await ctx.model.query(
|
||||
`
|
||||
SELECT wave_id, wave_no
|
||||
FROM wms_wave_pick_task_wave
|
||||
WHERE task_id = :taskId
|
||||
AND warehouse_id = :warehouseId
|
||||
ORDER BY wave_id ASC
|
||||
`,
|
||||
{
|
||||
replacements: { taskId, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
}
|
||||
);
|
||||
|
||||
const taskWaves = Array.isArray(taskWaveRows) ? taskWaveRows : [];
|
||||
const scanViews = [];
|
||||
|
||||
for (const tw of taskWaves) {
|
||||
const waveId = Number(tw.wave_id || 0);
|
||||
const waveNo = String(tw.wave_no || '').trim();
|
||||
|
||||
if (waveId > 0 && waveNo) {
|
||||
const scanView = await this.buildSingleWaveScanView(waveId, waveNo, warehouseId);
|
||||
|
||||
if (scanView) {
|
||||
scanViews.push(scanView);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (scanViews.length === 0) {
|
||||
return {
|
||||
match_type: 'cart',
|
||||
list_type: 'single',
|
||||
task_id: taskId,
|
||||
pick_mode: pickMode,
|
||||
list: [],
|
||||
};
|
||||
}
|
||||
|
||||
// 合并所有波次的订单列表(按 order_id 去重)
|
||||
const allOrders = scanViews.flatMap(v => (Array.isArray(v.list) ? v.list : []));
|
||||
const seenOrderIds = new Set();
|
||||
const mergedList = [];
|
||||
|
||||
for (const order of allOrders) {
|
||||
const oid = Number(order.order_id || 0);
|
||||
|
||||
if (oid > 0 && !seenOrderIds.has(oid)) {
|
||||
seenOrderIds.add(oid);
|
||||
mergedList.push(order);
|
||||
}
|
||||
}
|
||||
|
||||
// 排序:未复核的排前面,其次按 wave_index 从小到大
|
||||
mergedList.sort((a, b) => {
|
||||
const aReviewed = a.is_reviewed ? 1 : 0;
|
||||
const bReviewed = b.is_reviewed ? 1 : 0;
|
||||
|
||||
if (aReviewed !== bReviewed) {
|
||||
return aReviewed - bReviewed;
|
||||
}
|
||||
|
||||
return (Number(a.wave_index || 0)) - (Number(b.wave_index || 0));
|
||||
});
|
||||
|
||||
const totalOrders = mergedList.length;
|
||||
const reviewedCount = mergedList.filter(o => o.recheck_status === 'fin').length;
|
||||
const unreviewedCount = totalOrders - reviewedCount;
|
||||
const waveType = scanViews.find(v => Number(v.wave_type || 0) > 0)?.wave_type || 0;
|
||||
const pickerInfo = await this.getPickerInfoByTaskId(taskId, warehouseId);
|
||||
|
||||
return {
|
||||
match_type: 'cart',
|
||||
list_type: 'group',
|
||||
list_type: 'single',
|
||||
picker_id: pickerInfo.picker_id,
|
||||
picker_name: pickerInfo.picker_name,
|
||||
task_id: taskId,
|
||||
list: groupWaveList,
|
||||
wave_id: 0,
|
||||
wave_no: '',
|
||||
wave_type: Number(waveType || 0),
|
||||
pick_mode: pickMode,
|
||||
strategy_id: null,
|
||||
strategy_name: '',
|
||||
total_orders: totalOrders,
|
||||
reviewed_count: reviewedCount,
|
||||
unreviewed_count: unreviewedCount,
|
||||
list: mergedList,
|
||||
};
|
||||
}
|
||||
|
||||
throw new Error('拣货任务信息不完整,无法加载团购复核视图');
|
||||
throw new Error('拣货任务信息不完整,无法加载复核视图');
|
||||
}
|
||||
|
||||
throw new Error('未找到对应订单');
|
||||
@ -582,13 +681,8 @@ class RecheckOrderService extends OrderBaseService {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 校验波次内所有订单是否都已拣货,未拣货订单不允许复核
|
||||
const orders = Array.isArray(waveView.orders) ? waveView.orders : [];
|
||||
for (const order of orders) {
|
||||
this.assertOrderCanRecheck(order);
|
||||
}
|
||||
|
||||
// 分离拦截订单与非拦截订单
|
||||
const orders = Array.isArray(waveView.orders) ? waveView.orders : [];
|
||||
const interceptedOrders = [];
|
||||
const normalOrders = [];
|
||||
for (const order of orders) {
|
||||
@ -600,6 +694,11 @@ class RecheckOrderService extends OrderBaseService {
|
||||
}
|
||||
}
|
||||
|
||||
// 校验所有非拦截订单是否都已拣货/未被拦截,不允许复核
|
||||
for (const order of normalOrders) {
|
||||
this.assertOrderCanRecheck(order);
|
||||
}
|
||||
|
||||
// 团购波次中所有订单商品一致,取第一个正常订单的商品明细作为样板
|
||||
const sampleOrder = normalOrders.length > 0 ? normalOrders[0] : null;
|
||||
const sampleStock = sampleOrder ? (Array.isArray(sampleOrder.stock) ? sampleOrder.stock : []) : [];
|
||||
@ -2662,13 +2761,17 @@ class RecheckOrderService extends OrderBaseService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 校验订单是否允许复核,未拣货订单不允许复核。
|
||||
* 校验订单是否允许复核,未拣货订单或已拦截订单不允许复核。
|
||||
* @param {Object} order 订单信息。
|
||||
*/
|
||||
assertOrderCanRecheck(order = {}) {
|
||||
if (String(order.pick_status || '') === 'none') {
|
||||
throw new Error('订单未拣货,不允许复核。');
|
||||
}
|
||||
const interceptStatus = String(order.intercept_status || '').trim();
|
||||
if (interceptStatus === 'intercepted' || interceptStatus === 'intercepted_at_warehouse') {
|
||||
throw new Error('订单已被拦截,无法提交复核');
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
@ -3048,6 +3151,29 @@ class RecheckOrderService extends OrderBaseService {
|
||||
throw new Error('拦截状态更新失败,请稍后重试');
|
||||
}
|
||||
|
||||
// 拦截成功后释放储位分配(归还库存)
|
||||
try {
|
||||
await this.service.systems.orderStorageAllocation.cancelAllocateStorage({
|
||||
order_ids: [ orderId ],
|
||||
});
|
||||
} catch (allocErr) {
|
||||
ctx.logger.warn(
|
||||
`[recheckOrder.confirmIntercept] 释放储位分配失败,不影响拦截, orderId=${orderId}, error=${allocErr.message}`
|
||||
);
|
||||
}
|
||||
|
||||
// 拦截成功后释放订单锁
|
||||
try {
|
||||
await orderModel.update(
|
||||
{ lock_status: 'none', updated_at: now },
|
||||
{ where: orderWhere }
|
||||
);
|
||||
} catch (lockErr) {
|
||||
ctx.logger.warn(
|
||||
`[recheckOrder.confirmIntercept] 释放锁失败,不影响拦截, orderId=${orderId}, error=${lockErr.message}`
|
||||
);
|
||||
}
|
||||
|
||||
const orderNo = String(order.delivery_order_code || order.pre_delivery_order_code || '').trim();
|
||||
|
||||
// 写入操作日志(失败不影响主流程)
|
||||
@ -3082,6 +3208,754 @@ class RecheckOrderService extends OrderBaseService {
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 批量快捷复核:对一批订单 IDs 依次执行前置条件检查与复核流程。
|
||||
* 支持部分失败:不满足前置条件的订单直接跳过并记录失败原因,其余订单继续走完拣货完成 + 复核标记流程。
|
||||
*
|
||||
* 前置条件(任一不满足即跳过):
|
||||
* 1. 未分配储位:storage_status 不等于 'fin'
|
||||
* 2. 未分配快递:post_status 不等于 'fin'
|
||||
* 3. 未同步:status 不等于 'created'
|
||||
* 4. 已拦截:intercept_status 为 'intercepted' 或 'intercepted_at_warehouse'
|
||||
*
|
||||
* 核心流程(每个满足条件的订单在独立事务中执行):
|
||||
* 1. 若 pick_status 不等于 'fin',先完成拣货:
|
||||
* - 更新 wms_wave_pick_task_order 拣货状态(仅当订单关联拣货任务时)
|
||||
* - 更新 wms_order_delivery.pick_status = 'fin'
|
||||
* - 更新 wms_picking.status = 'fin'(仅当存在拣货记录时)
|
||||
* - 汇总 wms_picking 中各 storage_id 的 quantity,扣减 wms_storage.locked_quantity 与 quantity
|
||||
* - 写入 wms_storage_transaction 出库流水
|
||||
* 2. 标记复核:
|
||||
* - 更新 wms_order_delivery.recheck_status = 'fin'、recheck_time = now
|
||||
* - 插入 wms_recheck_task 复核记录
|
||||
* - 更新 wms_wave_pick_task_order 复核状态并尝试解绑车任务
|
||||
* - 写入操作日志
|
||||
*
|
||||
* @param {Object} data 请求体。
|
||||
* @param {number[]|string} data.ids 订单 ID 列表,支持数组或以逗号分隔的字符串。
|
||||
* @return {Promise<Object>} 批量复核结果,包含 success、failed、success_count、failed_count。
|
||||
*/
|
||||
async batchQuickRecheck(data = {}) {
|
||||
const { ctx } = this;
|
||||
const warehouseId = this.getWarehouseId();
|
||||
const orderIds = this.normalizeOrderIds(data);
|
||||
|
||||
if (orderIds.length === 0) {
|
||||
this.ctx.throw(400, '订单ID列表不能为空');
|
||||
}
|
||||
|
||||
// ── 1. 批量查询所有订单的当前状态 ──
|
||||
const orderModel = await this.getOrderModel('order', warehouseId);
|
||||
const orderRows = await orderModel.findAll({
|
||||
where: this.buildOrderWhere(orderIds, warehouseId),
|
||||
attributes: [
|
||||
'id', 'delivery_order_code', 'pre_delivery_order_code',
|
||||
'storage_status', 'post_status', 'status', 'intercept_status',
|
||||
'pick_status', 'recheck_status', 'wave_id', 'wave_no',
|
||||
],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const orderMap = new Map();
|
||||
for (const row of orderRows) {
|
||||
orderMap.set(Number(row.id), row);
|
||||
}
|
||||
|
||||
// ── 2. 前置条件检查:将订单分为有效订单与跳过订单 ──
|
||||
const validOrders = [];
|
||||
const failedOrders = [];
|
||||
|
||||
for (const orderId of orderIds) {
|
||||
const order = orderMap.get(orderId);
|
||||
|
||||
if (!order) {
|
||||
failedOrders.push({ order_id: orderId, reason: '未找到对应订单' });
|
||||
continue;
|
||||
}
|
||||
|
||||
const interceptStatus = String(order.intercept_status || '').trim();
|
||||
if (interceptStatus === 'intercepted' || interceptStatus === 'intercepted_at_warehouse') {
|
||||
failedOrders.push({
|
||||
order_id: orderId,
|
||||
delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(),
|
||||
reason: '已拦截',
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
const storageStatus = String(order.storage_status || '').trim();
|
||||
if (storageStatus !== 'fin') {
|
||||
failedOrders.push({
|
||||
order_id: orderId,
|
||||
delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(),
|
||||
reason: '未分配储位',
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
const postStatus = String(order.post_status || '').trim();
|
||||
if (postStatus !== 'fin') {
|
||||
failedOrders.push({
|
||||
order_id: orderId,
|
||||
delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(),
|
||||
reason: '没有分配快递',
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
const orderStatus = String(order.status || '').trim();
|
||||
if (orderStatus !== 'created') {
|
||||
failedOrders.push({
|
||||
order_id: orderId,
|
||||
delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(),
|
||||
reason: '没有同步',
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
validOrders.push(order);
|
||||
}
|
||||
|
||||
// ── 3. 逐订单在独立事务中执行拣货完成 + 复核标记 ──
|
||||
const successOrders = [];
|
||||
|
||||
for (const order of validOrders) {
|
||||
const orderId = Number(order.id);
|
||||
|
||||
try {
|
||||
await ctx.model.transaction(async transaction => {
|
||||
// 3a. 若未完成拣货,先执行拣货完成流程
|
||||
const pickStatus = String(order.pick_status || '').trim();
|
||||
if (pickStatus !== 'fin') {
|
||||
await this._completePickForOrder(orderId, warehouseId, transaction);
|
||||
// 更新内存中的 pick_status,避免后续 assertOrderCanRecheck 因旧值误判
|
||||
order.pick_status = 'fin';
|
||||
}
|
||||
|
||||
// 3b. 标记复核
|
||||
await this._markRecheckForOrder(order, warehouseId, transaction);
|
||||
});
|
||||
|
||||
successOrders.push({
|
||||
order_id: orderId,
|
||||
delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(),
|
||||
});
|
||||
} catch (error) {
|
||||
ctx.logger.warn(
|
||||
`[batchQuickRecheck] 订单复核失败, orderId=${orderId}, error=${error.message}`
|
||||
);
|
||||
failedOrders.push({
|
||||
order_id: orderId,
|
||||
delivery_order_code: String(order.delivery_order_code || order.pre_delivery_order_code || '').trim(),
|
||||
reason: `复核失败: ${error.message}`,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
success: successOrders,
|
||||
failed: failedOrders,
|
||||
success_count: successOrders.length,
|
||||
failed_count: failedOrders.length,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 完成单个订单的拣货流程(内部方法,在事务中执行)。
|
||||
* 包含:更新拣货任务订单状态、订单拣货状态、拣货记录状态、扣减库存锁定数量与可用数量、写库存流水。
|
||||
*
|
||||
* @param {number} orderId 订单ID。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Object} transaction Sequelize 事务对象。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async _completePickForOrder(orderId, warehouseId, transaction) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
// 步骤1:若订单关联拣货任务,更新 wms_wave_pick_task_order 的拣货状态
|
||||
const taskOrderRows = await ctx.model.query(
|
||||
`SELECT id, task_id
|
||||
FROM wms_wave_pick_task_order
|
||||
WHERE order_id = :orderId
|
||||
AND warehouse_id = :warehouseId
|
||||
LIMIT 1`,
|
||||
{
|
||||
replacements: { orderId, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
const hasTaskOrder = Array.isArray(taskOrderRows) && taskOrderRows.length > 0;
|
||||
|
||||
if (hasTaskOrder) {
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_wave_pick_task_order
|
||||
SET pick_status = 1,
|
||||
picked_time = NOW(),
|
||||
update_time = NOW()
|
||||
WHERE order_id = :orderId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { orderId, warehouseId },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
// 步骤2:更新 wms_order_delivery.pick_status = 'fin'
|
||||
const orderModel = await this.getOrderModel('order', warehouseId);
|
||||
await orderModel.update(
|
||||
{ pick_status: 'fin' },
|
||||
{
|
||||
where: this.buildOrderWhere([ orderId ], warehouseId),
|
||||
transaction,
|
||||
validate: false,
|
||||
hooks: false,
|
||||
}
|
||||
);
|
||||
|
||||
// 步骤3:检查是否存在 wms_picking 记录
|
||||
const pickingRows = await ctx.model.query(
|
||||
`SELECT id, storage_id, quantity, space_id
|
||||
FROM wms_picking
|
||||
WHERE order_id = :orderId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { orderId, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
const normalizedPickingRows = Array.isArray(pickingRows) ? pickingRows : [];
|
||||
|
||||
if (normalizedPickingRows.length > 0) {
|
||||
// 更新 wms_picking.status = 'fin'
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_picking
|
||||
SET status = 'fin', updated_at = NOW()
|
||||
WHERE order_id = :orderId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { orderId, warehouseId },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
// 步骤4:汇总各 storage_id 的 quantity,扣减 wms_storage 锁定数量与可用数量
|
||||
const storageQtyMap = new Map();
|
||||
for (const row of normalizedPickingRows) {
|
||||
const sid = Number(row.storage_id);
|
||||
if (!sid || sid <= 0) continue;
|
||||
const currentQty = storageQtyMap.get(sid) || 0;
|
||||
storageQtyMap.set(sid, currentQty + (Number(row.quantity) || 0));
|
||||
}
|
||||
|
||||
const storageIds = Array.from(storageQtyMap.keys());
|
||||
if (storageIds.length > 0) {
|
||||
// 加行锁查询当前库存
|
||||
const storageRows = await ctx.model.Storage.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: storageIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [
|
||||
'id', 'locked_quantity', 'quantity',
|
||||
'store_id', 'stock_id', 'batch_no', 'inventory_type', 'space_id',
|
||||
],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 校验锁定数量是否足够
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.id);
|
||||
const deduction = storageQtyMap.get(sid) || 0;
|
||||
const locked = Number(sRow.locked_quantity) || 0;
|
||||
if (locked < deduction) {
|
||||
throw new Error(
|
||||
`库存记录 ${sid} 锁定数量不足:当前锁定 ${locked},需扣减 ${deduction}`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// 构建 CASE WHEN 批量扣减
|
||||
const summaryEntries = Array.from(storageQtyMap.entries());
|
||||
const caseClauses = summaryEntries
|
||||
.map(([sid, qty]) => `WHEN ${sid} THEN ${qty}`)
|
||||
.join(' ');
|
||||
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_storage
|
||||
SET locked_quantity = locked_quantity - CASE id ${caseClauses} END,
|
||||
quantity = quantity - CASE id ${caseClauses} END,
|
||||
updated_at = NOW()
|
||||
WHERE id IN (:storageIds)
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { storageIds, warehouseId },
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
// 写入 wms_storage_transaction 出库流水
|
||||
const operator = this.getOrderLogOperator();
|
||||
const operatorId = String(operator.id || '').trim();
|
||||
const operatorName = String(operator.name || 'system').trim();
|
||||
const transactionRows = [];
|
||||
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.id);
|
||||
const deduction = storageQtyMap.get(sid) || 0;
|
||||
if (deduction <= 0) continue;
|
||||
const beforeQty = Number(sRow.quantity) || 0;
|
||||
const beforeLocked = Number(sRow.locked_quantity) || 0;
|
||||
transactionRows.push({
|
||||
transaction_type: 'OUTBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: Number(sRow.store_id) || 0,
|
||||
stock_id: Number(sRow.stock_id) || 0,
|
||||
storage_id: sid,
|
||||
space_id: Number(sRow.space_id) || null,
|
||||
quantity: deduction,
|
||||
before_quantity: beforeQty,
|
||||
after_quantity: Math.max(0, beforeQty - deduction),
|
||||
before_locked_quantity: beforeLocked,
|
||||
after_locked_quantity: Math.max(0, beforeLocked - deduction),
|
||||
batch_no: sRow.batch_no || null,
|
||||
inventory_type: sRow.inventory_type || 'ZP',
|
||||
order_type: 'PICK_OUTBOUND',
|
||||
order_no: String(orderId),
|
||||
order_id: orderId,
|
||||
source_order_codes: String(orderId),
|
||||
operator_id: operatorId,
|
||||
operator_name: operatorName,
|
||||
remark: '拣货完成出库(批量快捷复核)',
|
||||
created_at: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
if (transactionRows.length > 0) {
|
||||
await ctx.model.StorageTransaction.bulkCreate(transactionRows, { transaction });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 步骤5:更新 wms_wave_pick_task 状态
|
||||
if (hasTaskOrder) {
|
||||
const taskId = Number(taskOrderRows[0]?.task_id || 0);
|
||||
if (taskId > 0) {
|
||||
// 检查该任务下是否所有订单都已完成拣货
|
||||
const taskOrderCount = await ctx.model.query(
|
||||
`SELECT COUNT(*) AS cnt
|
||||
FROM wms_wave_pick_task_order
|
||||
WHERE task_id = :taskId
|
||||
AND warehouse_id = :warehouseId
|
||||
AND pick_status != 1`,
|
||||
{
|
||||
replacements: { taskId, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
const allPicked = (Number(taskOrderCount[0]?.cnt || 0)) === 0;
|
||||
|
||||
if (allPicked) {
|
||||
// 全部完成 → 任务状态设为已完成
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_wave_pick_task
|
||||
SET status = 2,
|
||||
finish_time = NOW(),
|
||||
start_time = CASE WHEN start_time IS NULL THEN NOW() ELSE start_time END,
|
||||
update_time = NOW()
|
||||
WHERE id = :taskId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { taskId, warehouseId },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
} else {
|
||||
// 未全部完成 → 任务状态推进为拣货中(若仍为未开始)
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_wave_pick_task
|
||||
SET status = CASE WHEN status = 0 THEN 1 ELSE status END,
|
||||
start_time = CASE WHEN start_time IS NULL THEN NOW() ELSE start_time END,
|
||||
update_time = NOW()
|
||||
WHERE id = :taskId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { taskId, warehouseId },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 标记单个订单为已复核(内部方法,在事务中执行)。
|
||||
* 包含:更新订单复核状态、插入复核任务记录、更新拣货任务复核状态并尝试解绑车任务、写操作日志。
|
||||
*
|
||||
* @param {Object} order 订单信息行。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Object} transaction Sequelize 事务对象。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async _markRecheckForOrder(order, warehouseId, transaction) {
|
||||
const { ctx } = this;
|
||||
const orderId = Number(order.id);
|
||||
|
||||
// 校验订单是否允许复核(拣货已完成且未被拦截)
|
||||
this.assertOrderCanRecheck(order);
|
||||
|
||||
const now = new Date();
|
||||
|
||||
// 更新订单复核状态
|
||||
const orderModel = await this.getOrderModel('order', warehouseId);
|
||||
await orderModel.update(
|
||||
{
|
||||
recheck_status: 'fin',
|
||||
recheck_time: now,
|
||||
updated_at: now,
|
||||
},
|
||||
{
|
||||
where: this.buildOrderWhere([ orderId ], warehouseId),
|
||||
transaction,
|
||||
validate: false,
|
||||
hooks: false,
|
||||
}
|
||||
);
|
||||
|
||||
// 插入 wms_recheck_task 复核记录
|
||||
const operator = this.getOrderLogOperator();
|
||||
const reviewNo = this.buildRecheckReviewNo(orderId, now);
|
||||
const orderNo = String(order.delivery_order_code || order.pre_delivery_order_code || '').trim();
|
||||
const operatorNo = String(operator.id || '').trim();
|
||||
const operatorName = String(operator.name || '').trim();
|
||||
|
||||
await ctx.model.query(
|
||||
`INSERT INTO wms_recheck_task (
|
||||
review_no,
|
||||
warehouse_id,
|
||||
order_id,
|
||||
order_no,
|
||||
waybill_no,
|
||||
task_status,
|
||||
scan_status,
|
||||
review_emp_no,
|
||||
review_emp_name,
|
||||
scan_emp_no,
|
||||
scan_emp_name,
|
||||
scan_time,
|
||||
finish_time,
|
||||
remark
|
||||
) VALUES (
|
||||
:reviewNo,
|
||||
:warehouseId,
|
||||
:orderId,
|
||||
:orderNo,
|
||||
:waybillNo,
|
||||
:taskStatus,
|
||||
:scanStatus,
|
||||
:reviewEmpNo,
|
||||
:reviewEmpName,
|
||||
:scanEmpNo,
|
||||
:scanEmpName,
|
||||
:scanTime,
|
||||
:finishTime,
|
||||
:remark
|
||||
)`,
|
||||
{
|
||||
replacements: {
|
||||
reviewNo,
|
||||
warehouseId,
|
||||
orderId,
|
||||
orderNo,
|
||||
waybillNo: '',
|
||||
taskStatus: 2,
|
||||
scanStatus: 1,
|
||||
reviewEmpNo: operatorNo,
|
||||
reviewEmpName: operatorName,
|
||||
scanEmpNo: operatorNo,
|
||||
scanEmpName: operatorName,
|
||||
scanTime: now,
|
||||
finishTime: now,
|
||||
remark: '系统复核完成(批量快捷复核)',
|
||||
},
|
||||
type: ctx.model.QueryTypes.INSERT,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
// 更新波次拣货任务订单复核状态,并判断是否需要解绑车任务
|
||||
await this._updateTaskOrderReviewInTransaction(orderId, warehouseId, operator, now, transaction);
|
||||
|
||||
// 写入操作日志
|
||||
await this._writeRecheckActionLogInTransaction({
|
||||
orderId,
|
||||
warehouseId,
|
||||
operator,
|
||||
now,
|
||||
transaction,
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* 在事务中更新波次拣货任务订单的复核状态,并判断是否需要解绑车任务。
|
||||
*
|
||||
* @param {number} orderId 订单ID。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {{ id: string|null, name: string }} operator 操作人信息。
|
||||
* @param {Date} now 当前时间。
|
||||
* @param {Object} transaction Sequelize 事务对象。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async _updateTaskOrderReviewInTransaction(orderId, warehouseId, operator, now, transaction) {
|
||||
const { ctx } = this;
|
||||
const taskOrderColumnSet = await this.getTableColumnSet('wms_wave_pick_task_order');
|
||||
const hasReviewStatus = taskOrderColumnSet.has('review_status');
|
||||
|
||||
if (!hasReviewStatus) {
|
||||
return;
|
||||
}
|
||||
|
||||
const hasReviewUserId = taskOrderColumnSet.has('review_user_id');
|
||||
const hasReviewResult = taskOrderColumnSet.has('review_result');
|
||||
const hasReviewTime = taskOrderColumnSet.has('review_time');
|
||||
const operatorUserId = Number(operator.id) || 0;
|
||||
|
||||
const reviewSetClauses = [ 'review_status = 1' ];
|
||||
|
||||
if (hasReviewUserId) reviewSetClauses.push('review_user_id = :operatorUserId');
|
||||
if (hasReviewResult) reviewSetClauses.push('review_result = 1');
|
||||
if (hasReviewTime) reviewSetClauses.push('review_time = :now');
|
||||
reviewSetClauses.push('update_time = NOW()');
|
||||
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_wave_pick_task_order
|
||||
SET ${reviewSetClauses.join(',\n ')}
|
||||
WHERE order_id = :orderId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: {
|
||||
orderId,
|
||||
warehouseId,
|
||||
operatorUserId,
|
||||
now,
|
||||
},
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
// 查询当前订单所属的波次拣货任务ID
|
||||
const taskRows = await ctx.model.query(
|
||||
`SELECT DISTINCT task_id
|
||||
FROM wms_wave_pick_task_order
|
||||
WHERE order_id = :orderId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { orderId, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
const taskId = Number(
|
||||
(Array.isArray(taskRows) && taskRows.length > 0 ? taskRows[0]?.task_id : 0)
|
||||
);
|
||||
|
||||
if (taskId <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 检查该任务下是否所有订单都已复核完成
|
||||
const unreviewedRows = await ctx.model.query(
|
||||
`SELECT COUNT(*) AS cnt
|
||||
FROM wms_wave_pick_task_order
|
||||
WHERE task_id = :taskId
|
||||
AND warehouse_id = :warehouseId
|
||||
AND review_status != 1`,
|
||||
{
|
||||
replacements: { taskId, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
const unreviewedCount = Number(
|
||||
(Array.isArray(unreviewedRows) && unreviewedRows.length > 0 ? unreviewedRows[0]?.cnt : 0)
|
||||
);
|
||||
|
||||
if (unreviewedCount > 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
// 任务下所有订单均已复核完成,解绑车任务
|
||||
try {
|
||||
await this._unbindCartForTaskInTransaction(taskId, warehouseId, operatorUserId, transaction);
|
||||
ctx.logger.info(
|
||||
`[batchQuickRecheck] 车任务解绑成功, taskId=${taskId}, orderId=${orderId}, operatorUserId=${operatorUserId}`
|
||||
);
|
||||
} catch (unbindError) {
|
||||
ctx.logger.warn(
|
||||
`[batchQuickRecheck] 解绑车任务失败(复核已成功), taskId=${taskId}, orderId=${orderId}, error=${unbindError.message}`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 在事务中解绑车任务:清空波次拣货任务的车绑定、停用拣货车绑定记录、释放拣货车。
|
||||
*
|
||||
* @param {number} taskId 波次拣货任务ID。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {number} operatorUserId 操作员用户ID。
|
||||
* @param {Object} transaction Sequelize 事务对象。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async _unbindCartForTaskInTransaction(taskId, warehouseId, operatorUserId, transaction) {
|
||||
const { ctx } = this;
|
||||
|
||||
// 清空波次拣货任务的车绑定信息
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_wave_pick_task
|
||||
SET current_cart_id = NULL,
|
||||
current_cart_code_snapshot = NULL,
|
||||
update_time = NOW()
|
||||
WHERE id = :taskId
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { taskId, warehouseId },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
// 停用拣货车绑定记录
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_pick_task_cart_binding
|
||||
SET is_active = 0,
|
||||
unbind_user_id = :operatorUserId,
|
||||
unbind_time = NOW(),
|
||||
update_time = NOW()
|
||||
WHERE task_id = :taskId
|
||||
AND warehouse_id = :warehouseId
|
||||
AND is_active = 1`,
|
||||
{
|
||||
replacements: { taskId, warehouseId, operatorUserId },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
|
||||
// 释放拣货车
|
||||
await ctx.model.query(
|
||||
`UPDATE wms_pick_cart
|
||||
SET status = 'idle',
|
||||
current_task_id = NULL,
|
||||
update_time = NOW()
|
||||
WHERE id IN (
|
||||
SELECT cart_id
|
||||
FROM wms_pick_task_cart_binding
|
||||
WHERE task_id = :taskId
|
||||
AND warehouse_id = :warehouseId
|
||||
)
|
||||
AND warehouse_id = :warehouseId`,
|
||||
{
|
||||
replacements: { taskId, warehouseId },
|
||||
type: ctx.model.QueryTypes.UPDATE,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* 在事务中写入复核操作日志(内部方法)。
|
||||
*
|
||||
* @param {Object} params 日志参数。
|
||||
* @param {number} params.orderId 订单ID。
|
||||
* @param {number} params.warehouseId 仓库ID。
|
||||
* @param {{ id: string|null, name: string }} params.operator 操作人信息。
|
||||
* @param {Date} params.now 操作时间。
|
||||
* @param {Object} params.transaction Sequelize 事务对象。
|
||||
* @return {Promise<void>} 无返回值。
|
||||
*/
|
||||
async _writeRecheckActionLogInTransaction(params = {}) {
|
||||
const { orderId, warehouseId, operator, now, transaction } = params;
|
||||
const operatorId = operator && operator.id ? Number(operator.id) : 0;
|
||||
const operatorName = operator && operator.name ? String(operator.name).trim() : 'system';
|
||||
const requestId = `recheck_${warehouseId}_${orderId}_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
|
||||
|
||||
await this.ctx.model.query(
|
||||
`INSERT INTO wms_wave_pick_action_log (
|
||||
task_id,
|
||||
warehouse_id,
|
||||
wave_id,
|
||||
order_id,
|
||||
sku_id,
|
||||
location_id,
|
||||
box_no,
|
||||
cart_id,
|
||||
qty_delta,
|
||||
action_type,
|
||||
request_id,
|
||||
operator_id,
|
||||
device_id,
|
||||
seq_no,
|
||||
snapshot
|
||||
) VALUES (
|
||||
:taskId,
|
||||
:warehouseId,
|
||||
:waveId,
|
||||
:orderId,
|
||||
:skuId,
|
||||
:locationId,
|
||||
:boxNo,
|
||||
:cartId,
|
||||
:qtyDelta,
|
||||
:actionType,
|
||||
:requestId,
|
||||
:operatorId,
|
||||
:deviceId,
|
||||
:seqNo,
|
||||
:snapshot
|
||||
)`,
|
||||
{
|
||||
replacements: {
|
||||
taskId: 0,
|
||||
warehouseId: warehouseId || 0,
|
||||
waveId: null,
|
||||
orderId: orderId || 0,
|
||||
skuId: null,
|
||||
locationId: null,
|
||||
boxNo: null,
|
||||
cartId: null,
|
||||
qtyDelta: 0,
|
||||
actionType: 'recheck',
|
||||
requestId,
|
||||
operatorId,
|
||||
deviceId: null,
|
||||
seqNo: 1,
|
||||
snapshot: JSON.stringify({
|
||||
order_id: orderId,
|
||||
operator_name: operatorName,
|
||||
recheck_time: now instanceof Date ? now.toISOString() : String(now || ''),
|
||||
}),
|
||||
},
|
||||
type: this.ctx.model.QueryTypes.INSERT,
|
||||
transaction,
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
module.exports = RecheckOrderService;
|
||||
|
||||
@ -6160,19 +6160,27 @@ class WaveService extends OrderBaseService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 计算订单快递 key(同快递判定仅使用 sys_logistics_code)。
|
||||
* 计算订单快递 key。
|
||||
*
|
||||
* 优先级:sys_logistics_code > logistics_code > logistics_name,与 SQL 中 expressExpr 的 COALESCE 口径保持一致。
|
||||
*
|
||||
* @param {Object} order 订单记录。
|
||||
* @return {string} 快递 key(sys_logistics_code 去首尾空格后结果,空值返回空字符串)。
|
||||
* @return {string} 快递 key(去首尾空格后结果,空值返回空字符串)。
|
||||
*/
|
||||
getWaveStrategyQuickScanExpressKey(order = {}) {
|
||||
return String(order && order.sys_logistics_code || '').trim();
|
||||
const orderObj = order && typeof order === 'object' ? order : {};
|
||||
const candidates = [
|
||||
String(orderObj.sys_logistics_code || '').trim(),
|
||||
String(orderObj.logistics_code || '').trim(),
|
||||
String(orderObj.logistics_name || '').trim(),
|
||||
];
|
||||
return candidates.find(Boolean) || '';
|
||||
}
|
||||
|
||||
/**
|
||||
* 当 require_same_express=1 时,按快递分组候选订单,仅保留最大快递组的订单。
|
||||
*
|
||||
* 分组 key 使用 getWaveStrategyQuickScanExpressKey(sys_logistics_code),
|
||||
* 分组 key 使用 getWaveStrategyQuickScanExpressKey(sys_logistics_code > logistics_code > logistics_name),
|
||||
* 空 key 的订单不参与筛选(直接丢弃)。
|
||||
*
|
||||
* @param {Array<Object>} candidateRows 候选订单数组。
|
||||
@ -10215,9 +10223,14 @@ class WaveService extends OrderBaseService {
|
||||
result.wave_prefix_source = wavePrefixResolution.source;
|
||||
|
||||
if (strategyType === 2) {
|
||||
const effectiveGroupedRows = Number(strategyRow.require_same_express || 0) === 1
|
||||
? this.groupWaveStrategyFetchCandidateOrdersByStructure(
|
||||
this.filterCandidateOrdersByRequireSameExpress(candidateRows)
|
||||
)
|
||||
: groupedRows;
|
||||
const groupLimitRaw = Number(strategyRow.group_batch_max_orders || plan.box_limit || 0);
|
||||
const groupLimit = Number.isInteger(groupLimitRaw) && groupLimitRaw > 0 ? groupLimitRaw : 1;
|
||||
const selectedGroups = groupedRows
|
||||
const selectedGroups = effectiveGroupedRows
|
||||
.slice(0, groupLimit);
|
||||
if (selectedGroups.length === 0) {
|
||||
throw new Error('团购策略未找到可创建波次的同结构分组');
|
||||
@ -10383,7 +10396,12 @@ class WaveService extends OrderBaseService {
|
||||
const createdOrderIds = [];
|
||||
|
||||
if (strategyType === 2) {
|
||||
for (const group of groupedRows) {
|
||||
const effectiveGroupedRows = Number(strategyRow.require_same_express || 0) === 1
|
||||
? this.groupWaveStrategyFetchCandidateOrdersByStructure(
|
||||
this.filterCandidateOrdersByRequireSameExpress(candidateRows)
|
||||
)
|
||||
: groupedRows;
|
||||
for (const group of effectiveGroupedRows) {
|
||||
const created = await this.createWaveBatchByOrderIdsInTransaction({
|
||||
warehouseId,
|
||||
orderIds: group.order_ids,
|
||||
|
||||
@ -29,6 +29,9 @@ class OutboundService extends MainService {
|
||||
* - recheck_status = 'fin'(已复核)
|
||||
* - pack_status = 'fin'(已打包)
|
||||
* - wms_order_express.weighing_weight > 0(已称重)
|
||||
* - sync_status = 'fin'(已同步)
|
||||
* - print_status = 'fin'(已打印)
|
||||
* - pick_status = 'fin'(已拣货)
|
||||
*
|
||||
* @param {Object} data 请求参数。
|
||||
* @param {number} [data.warehouseId] 指定仓库ID,不传则使用当前用户上下文仓库。
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
'use strict';
|
||||
|
||||
const MainService = require('../../main');
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ];
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING', 'OUTBOUND' ];
|
||||
|
||||
class printTemplateService extends MainService {
|
||||
constructor(ctx) {
|
||||
|
||||
@ -374,6 +374,7 @@ class WarehouseService extends MainService {
|
||||
inbound_min_days,
|
||||
outbound_min_days,
|
||||
remaining_threshold_days,
|
||||
barcode,
|
||||
} = data || {};
|
||||
try {
|
||||
const result = await service.systems.stockStore.saveWarehouseStock({
|
||||
@ -416,6 +417,7 @@ class WarehouseService extends MainService {
|
||||
inbound_min_days,
|
||||
outbound_min_days,
|
||||
remaining_threshold_days,
|
||||
barcode,
|
||||
});
|
||||
return this.success('ok', { data: result, code: 200 });
|
||||
} catch (error) {
|
||||
@ -588,9 +590,26 @@ class WarehouseService extends MainService {
|
||||
gross_weight: pickValue([ '毛重', 'gross_weight', 'grossWeight' ]),
|
||||
tag_price: pickValue([ '标价', 'tag_price', 'tagPrice' ]),
|
||||
retail_price: pickValue([ '零售价', 'retail_price', 'retailPrice' ]),
|
||||
barcode: this._normalizeBarcodeField(
|
||||
pickValue([ '条码', 'bar_code', 'barCode', 'barcodeList', 'barcode_list', 'barcode' ])
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* 归一化条码字段,只接受逗号分隔的字符串格式,返回去重后的条码数组。
|
||||
* 与 stock.warehouse.export 导出格式对齐(导出使用逗号分隔)。
|
||||
*
|
||||
* @param {string|undefined|null} raw 原始条码值(逗号分隔字符串)
|
||||
* @return {Array<string>} 归一化后的去重条码数组
|
||||
*/
|
||||
_normalizeBarcodeField(raw) {
|
||||
if (typeof raw === 'string' && raw.trim()) {
|
||||
return [...new Set(raw.split(',').map(s => s.trim()).filter(Boolean))];
|
||||
}
|
||||
return [];
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询商品条码列表。
|
||||
* @param {Object} data 请求体(支持分页与关键字)
|
||||
|
||||
@ -24,8 +24,8 @@ class StorageTransactionService extends MainService {
|
||||
async list(data = {}) {
|
||||
const { service } = this;
|
||||
const { pagination, sort, group_by_batch } = data;
|
||||
const { where } = this.prepareWhereContext(data);
|
||||
const result = await service.systems.stockTransaction.list(where, pagination, sort, group_by_batch);
|
||||
this.prepareWhereContext(data);
|
||||
const result = await service.systems.stockTransaction.list(pagination, sort, group_by_batch);
|
||||
return this.success('ok', result);
|
||||
}
|
||||
}
|
||||
|
||||
@ -414,7 +414,6 @@ class entryOrderService extends Service {
|
||||
PENDING: [ 'CONFIRMED', 'CANCELLED' ],
|
||||
CONFIRMED: [ 'PARTIAL_RECEIVED', 'COMPLETED', 'CANCELLED' ],
|
||||
PARTIAL_RECEIVED: [ 'COMPLETED', 'CANCELLED' ],
|
||||
CREATED: [ 'PENDING', 'CANCELLED' ],
|
||||
CREATING: [ 'PENDING', 'CANCELLED' ],
|
||||
};
|
||||
|
||||
@ -833,7 +832,7 @@ class entryOrderService extends Service {
|
||||
}
|
||||
|
||||
// 状态检查
|
||||
const allowedStatuses = [ 'CREATED', 'PARTIAL_RECEIVED', 'CONFIRMED' ];
|
||||
const allowedStatuses = [ 'PENDING', 'PARTIAL_RECEIVED', 'CONFIRMED' ];
|
||||
if (!allowedStatuses.includes(entryOrder.order_status)) {
|
||||
await transaction.rollback();
|
||||
return {
|
||||
@ -951,7 +950,7 @@ class entryOrderService extends Service {
|
||||
if (isFin) {
|
||||
newOrderStatus = 'COMPLETED';
|
||||
} else if (totalConfirmIncrement > 0) {
|
||||
if (entryOrder.order_status === 'CREATED') {
|
||||
if (entryOrder.order_status === 'PENDING') {
|
||||
newOrderStatus = 'CONFIRMED';
|
||||
} else {
|
||||
newOrderStatus = 'PARTIAL_RECEIVED';
|
||||
|
||||
@ -1173,6 +1173,54 @@ class ExpressPlatformService extends MainService {
|
||||
traceId,
|
||||
operationLogCount: successUpdates.length,
|
||||
});
|
||||
|
||||
// 自动同步回传:快递号分配成功后异步触发订单同步
|
||||
try {
|
||||
const settlementEntries = Array.from(settlementRelationMap.entries());
|
||||
for (const [key, relation] of settlementEntries) {
|
||||
const successCount = Number(relation && relation.success_count) || 0;
|
||||
if (successCount <= 0) continue;
|
||||
const [storeId, warehouseId] = key.split(':').map(Number);
|
||||
if (!storeId || !warehouseId) continue;
|
||||
|
||||
const contractConfig = await this.service.systems.storeWarehouse.getContractConfig(
|
||||
warehouseId,
|
||||
storeId
|
||||
);
|
||||
if (
|
||||
contractConfig
|
||||
&& contractConfig.policy_config
|
||||
&& contractConfig.policy_config.auto_sync_back === 1
|
||||
) {
|
||||
// 收集本次分配成功的订单ID
|
||||
const syncedOrderIds = successUpdates
|
||||
.filter(u => {
|
||||
const orderId = Number(u.order_id) || 0;
|
||||
const wid = Number(u.warehouse_id) || 0;
|
||||
const bk = Number(u.business_key) || 0;
|
||||
const meta = orderMetaMap.get(`${wid}_${orderId}_${bk}`);
|
||||
return meta && meta.store_id === storeId && wid === warehouseId;
|
||||
})
|
||||
.map(u => Number(u.order_id) || 0)
|
||||
.filter(Boolean);
|
||||
|
||||
if (syncedOrderIds.length > 0) {
|
||||
// 异步调用,不阻塞主流程
|
||||
this.ctx.service.systemMethods.order.pendingOrder.syncOrderIds({
|
||||
orderIds: syncedOrderIds,
|
||||
}).catch(err => {
|
||||
this.ctx.logger.error(
|
||||
`[auto_sync_back] polyapi 自动同步失败: ${err.message}`
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.ctx.logger.error(
|
||||
`[auto_sync_back] polyapi 自动同步异常: ${err.message}`
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
this.ctx.logger.info('[expressPlatform.polyapi] 处理完成', {
|
||||
@ -1451,6 +1499,59 @@ class ExpressPlatformService extends MainService {
|
||||
|
||||
await this.persistWaybillSuccessUpdates(successUpdates, normalizedOrders);
|
||||
|
||||
// 自动同步回传:快递号分配成功后异步触发订单同步
|
||||
try {
|
||||
const orderMetaMap = this.buildWaybillOrderMetaMap(normalizedOrders);
|
||||
const settlementRelationMap = this.buildWaybillSettlementRelationMap(
|
||||
successUpdates,
|
||||
orderMetaMap
|
||||
);
|
||||
const settlementEntries = Array.from(settlementRelationMap.entries());
|
||||
for (const [key, relation] of settlementEntries) {
|
||||
const successCount = Number(relation && relation.success_count) || 0;
|
||||
if (successCount <= 0) continue;
|
||||
const [storeId, warehouseId] = key.split(':').map(Number);
|
||||
if (!storeId || !warehouseId) continue;
|
||||
|
||||
const contractConfig = await this.service.systems.storeWarehouse.getContractConfig(
|
||||
warehouseId,
|
||||
storeId
|
||||
);
|
||||
if (
|
||||
contractConfig
|
||||
&& contractConfig.policy_config
|
||||
&& contractConfig.policy_config.auto_sync_back === 1
|
||||
) {
|
||||
// 收集本次分配成功的订单ID
|
||||
const syncedOrderIds = successUpdates
|
||||
.filter(u => {
|
||||
const orderId = Number(u.order_id) || 0;
|
||||
const wid = Number(u.warehouse_id) || 0;
|
||||
const bk = Number(u.business_key) || 0;
|
||||
const meta = orderMetaMap.get(`${wid}_${orderId}_${bk}`);
|
||||
return meta && meta.store_id === storeId && wid === warehouseId;
|
||||
})
|
||||
.map(u => Number(u.order_id) || 0)
|
||||
.filter(Boolean);
|
||||
|
||||
if (syncedOrderIds.length > 0) {
|
||||
// 异步调用,不阻塞主流程
|
||||
this.ctx.service.systemMethods.order.pendingOrder.syncOrderIds({
|
||||
orderIds: syncedOrderIds,
|
||||
}).catch(err => {
|
||||
this.ctx.logger.error(
|
||||
`[auto_sync_back] cainiao 自动同步失败: ${err.message}`
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.ctx.logger.error(
|
||||
`[auto_sync_back] cainiao 自动同步异常: ${err.message}`
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
flag: true,
|
||||
code: 0,
|
||||
@ -2089,6 +2190,54 @@ class ExpressPlatformService extends MainService {
|
||||
await operationLogService.createOperationLogs(logPayloads);
|
||||
}
|
||||
|
||||
// 自动同步回传:快递号分配成功后异步触发订单同步
|
||||
try {
|
||||
const settlementEntries = Array.from(settlementRelationMap.entries());
|
||||
for (const [key, relation] of settlementEntries) {
|
||||
const successCount = Number(relation && relation.success_count) || 0;
|
||||
if (successCount <= 0) continue;
|
||||
const [storeId, warehouseId] = key.split(':').map(Number);
|
||||
if (!storeId || !warehouseId) continue;
|
||||
|
||||
const contractConfig = await this.service.systems.storeWarehouse.getContractConfig(
|
||||
warehouseId,
|
||||
storeId
|
||||
);
|
||||
if (
|
||||
contractConfig
|
||||
&& contractConfig.policy_config
|
||||
&& contractConfig.policy_config.auto_sync_back === 1
|
||||
) {
|
||||
// 收集本次分配成功的订单ID
|
||||
const syncedOrderIds = successUpdates
|
||||
.filter(u => {
|
||||
const orderId = Number(u.order_id) || 0;
|
||||
const wid = Number(u.warehouse_id) || 0;
|
||||
const bk = Number(u.business_key) || 0;
|
||||
const meta = orderMetaMap.get(`${wid}_${orderId}_${bk}`);
|
||||
return meta && meta.store_id === storeId && wid === warehouseId;
|
||||
})
|
||||
.map(u => Number(u.order_id) || 0)
|
||||
.filter(Boolean);
|
||||
|
||||
if (syncedOrderIds.length > 0) {
|
||||
// 异步调用,不阻塞主流程
|
||||
this.ctx.service.systemMethods.order.pendingOrder.syncOrderIds({
|
||||
orderIds: syncedOrderIds,
|
||||
}).catch(err => {
|
||||
this.ctx.logger.error(
|
||||
`[auto_sync_back] pdd 自动同步失败: ${err.message}`
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.ctx.logger.error(
|
||||
`[auto_sync_back] pdd 自动同步异常: ${err.message}`
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
flag: true,
|
||||
code: 0,
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
const MainService = require('../main');
|
||||
const { Op } = require('sequelize');
|
||||
|
||||
const OUTBOUND_STATUS = 'padding';
|
||||
const OUTBOUND_STATUS = 'fin';
|
||||
const OUTBOUND_STEP = 4;
|
||||
const ORDER_STATUS_FINISHED = 'finished';
|
||||
const MAX_BATCH_SIZE = 500;
|
||||
@ -61,6 +61,15 @@ class OrderAutoOutboundService extends MainService {
|
||||
rules: autoOutboundRules,
|
||||
});
|
||||
}
|
||||
|
||||
// 兜底:仓库自身没有 StoreWarehouse 合同关系时,直接用 store.id 作为 warehouseId
|
||||
if (contracts.length === 0) {
|
||||
result.push({
|
||||
storeId: store.id,
|
||||
warehouseId: store.id,
|
||||
rules: autoOutboundRules,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
@ -94,8 +103,14 @@ class OrderAutoOutboundService extends MainService {
|
||||
|
||||
/**
|
||||
* 构造自动化出库的订单查询条件。
|
||||
* 根据配置规则组合各状态字段的 WHERE 条件。
|
||||
*
|
||||
* @param {Object} rules 自动化出库规则。
|
||||
* @param {Object} rules 自动化出库规则,包含以下可选字段:
|
||||
* - {boolean} [rules.require_recheck] 是否要求已复核(recheck_status='fin')
|
||||
* - {boolean} [rules.require_pack] 是否要求已打包(pack_status='fin')
|
||||
* - {boolean} [rules.require_sync] 是否要求已同步(sync_status='fin')
|
||||
* - {boolean} [rules.require_print] 是否要求已打印(print_status='fin')
|
||||
* - {boolean} [rules.require_pick] 是否要求已拣货(pick_status='fin')
|
||||
* @return {Object} Sequelize where 条件对象。
|
||||
*/
|
||||
buildAutoOutboundWhere(rules) {
|
||||
@ -118,6 +133,14 @@ class OrderAutoOutboundService extends MainService {
|
||||
where.sync_status = 'fin';
|
||||
}
|
||||
|
||||
if (rules.require_print) {
|
||||
where.print_status = 'fin';
|
||||
}
|
||||
|
||||
if (rules.require_pick) {
|
||||
where.pick_status = 'fin';
|
||||
}
|
||||
|
||||
return where;
|
||||
}
|
||||
|
||||
@ -226,6 +249,7 @@ class OrderAutoOutboundService extends MainService {
|
||||
outbound_status: OUTBOUND_STATUS,
|
||||
step: OUTBOUND_STEP,
|
||||
status: ORDER_STATUS_FINISHED,
|
||||
delivery_time: now,
|
||||
updated_at: now,
|
||||
},
|
||||
{
|
||||
@ -260,11 +284,6 @@ class OrderAutoOutboundService extends MainService {
|
||||
async executeAutoOutbound() {
|
||||
const { ctx } = this;
|
||||
|
||||
if (ctx.app._autoOutboundRunning) {
|
||||
ctx.logger.info('[auto-outbound] 上一轮自动化出库尚未结束,跳过本次执行');
|
||||
return { totalProcessed: 0, warehouseResults: [] };
|
||||
}
|
||||
|
||||
ctx.app._autoOutboundRunning = true;
|
||||
|
||||
try {
|
||||
|
||||
@ -309,16 +309,9 @@ class OrderDeliveryMigrationService extends MainService {
|
||||
* @return {Object} 可写入配送表的数据。
|
||||
*/
|
||||
buildDispatchRow(row) {
|
||||
const payload = {
|
||||
...(row || {}),
|
||||
};
|
||||
|
||||
const payload = { ...(row || {}) };
|
||||
delete payload.dispatch_lane;
|
||||
|
||||
return {
|
||||
...payload,
|
||||
dispatch_lane: DISPATCH_LANE,
|
||||
};
|
||||
return { ...payload, dispatch_lane: DISPATCH_LANE };
|
||||
}
|
||||
|
||||
/**
|
||||
@ -481,10 +474,11 @@ class OrderDeliveryMigrationService extends MainService {
|
||||
const sourceOrderRowMap = new Map(validSourceRows
|
||||
.map(row => [ Number(row.id), row ])
|
||||
.filter(([ rowId, row ]) => Number.isFinite(rowId) && rowId > 0 && this.buildDispatchKey(row)));
|
||||
const deliveryOrderCodes = Array.from(new Set(validSourceRows
|
||||
let deliveryOrderCodes = Array.from(new Set(validSourceRows
|
||||
.map(row => String(row.delivery_order_code || '').trim())
|
||||
.filter(Boolean)));
|
||||
const sourceOrderIds = Array.from(sourceOrderRowMap.keys());
|
||||
const orderCodeMap = new Map(); // source order_id → renamed delivery_order_code
|
||||
|
||||
let existingRows = [];
|
||||
if (deliveryOrderCodes.length > 0) {
|
||||
@ -505,15 +499,44 @@ class OrderDeliveryMigrationService extends MainService {
|
||||
.map(row => this.buildDispatchKey(row))
|
||||
.filter(Boolean));
|
||||
|
||||
const rowsToCreate = validSourceRows
|
||||
.filter(row => !existingKeySet.has(this.buildDispatchKey(row)))
|
||||
.map(row => this.buildDispatchRow(row));
|
||||
const rowsToCreate = [];
|
||||
for (const row of validSourceRows) {
|
||||
let tryCode = String(row.delivery_order_code || '').trim();
|
||||
const storeId = String(row.store_id || '').trim();
|
||||
const warehouseId = String(row.warehouse_id || '').trim();
|
||||
const originalKey = `${tryCode}::${storeId}::${warehouseId}`;
|
||||
let seq = 2;
|
||||
|
||||
while (existingKeySet.has(`${tryCode}::${storeId}::${warehouseId}`)) {
|
||||
tryCode = `${String(row.delivery_order_code || '').trim()}-${seq}`;
|
||||
seq++;
|
||||
}
|
||||
|
||||
const newKey = `${tryCode}::${storeId}::${warehouseId}`;
|
||||
if (newKey !== originalKey) {
|
||||
this.ctx.logger.info(
|
||||
`[sync-outbound-orders-to-delivery] delivery_order_code 冲突,重命名: ${originalKey} → ${newKey}`
|
||||
);
|
||||
orderCodeMap.set(Number(row.id), tryCode);
|
||||
}
|
||||
existingKeySet.add(newKey);
|
||||
|
||||
const modifiedRow = tryCode !== String(row.delivery_order_code || '').trim()
|
||||
? { ...row, delivery_order_code: tryCode }
|
||||
: row;
|
||||
|
||||
rowsToCreate.push(this.buildDispatchRow(modifiedRow));
|
||||
}
|
||||
|
||||
for (const renamedCode of orderCodeMap.values()) {
|
||||
deliveryOrderCodes.push(renamedCode);
|
||||
}
|
||||
deliveryOrderCodes = Array.from(new Set(deliveryOrderCodes.filter(Boolean)));
|
||||
|
||||
if (rowsToCreate.length > 0) {
|
||||
assertMigrationDeadline('创建配送表订单');
|
||||
await targetOrderModel.bulkCreate(rowsToCreate, {
|
||||
...this.buildMigrationQueryOptions(transaction, queryTimeoutMs),
|
||||
ignoreDuplicates: true,
|
||||
});
|
||||
}
|
||||
|
||||
@ -551,7 +574,11 @@ class OrderDeliveryMigrationService extends MainService {
|
||||
|
||||
const rowsToCreateItems = validSourceItems.map(item => {
|
||||
const sourceOrder = sourceOrderRowMap.get(Number(item.order_id));
|
||||
const targetOrderId = targetOrderIdMap.get(this.buildDispatchKey(sourceOrder));
|
||||
const renamedCode = orderCodeMap.get(Number(item.order_id));
|
||||
const key = renamedCode
|
||||
? `${renamedCode}::${String(sourceOrder.store_id || '').trim()}::${String(sourceOrder.warehouse_id || '').trim()}`
|
||||
: this.buildDispatchKey(sourceOrder);
|
||||
const targetOrderId = targetOrderIdMap.get(key);
|
||||
|
||||
if (!Number.isFinite(targetOrderId) || targetOrderId <= 0) {
|
||||
throw new Error(`无法找到订单 ${item.order_id} 对应的配送表订单ID`);
|
||||
@ -564,7 +591,6 @@ class OrderDeliveryMigrationService extends MainService {
|
||||
assertMigrationDeadline('创建商品明细');
|
||||
await targetItemModel.bulkCreate(rowsToCreateItems, {
|
||||
...this.buildMigrationQueryOptions(transaction, queryTimeoutMs),
|
||||
ignoreDuplicates: true,
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@ -27,19 +27,25 @@ const ORDER_EXPORT_COLUMNS = Object.freeze([
|
||||
{ header: '订单号', key: 'delivery_order_code', width: 24 },
|
||||
{ header: '外部单号', key: 'external_order_code', width: 24 },
|
||||
{ header: '订单状态', key: 'status', width: 16 },
|
||||
{ header: '步骤', key: 'step', width: 10 },
|
||||
{ header: '波次号', key: 'wave_no', width: 18 },
|
||||
{ header: '仓库ID', key: 'warehouse_id', width: 12 },
|
||||
{ header: '货主ID', key: 'store_id', width: 12 },
|
||||
{ header: '货主', key: 'store_id', width: 20 },
|
||||
{ header: '平台', key: 'sys_platform_name', width: 16 },
|
||||
{ header: '店铺昵称', key: 'shop_nick', width: 20 },
|
||||
{ header: '卖家昵称', key: 'seller_nick', width: 20 },
|
||||
{ header: '买家昵称', key: 'buyer_nick', width: 20 },
|
||||
{ header: '收件人', key: 'receiver_name', width: 16 },
|
||||
{ header: '收件人电话', key: 'receiver_mobile', width: 18 },
|
||||
{ header: '省', key: 'receiver_province', width: 10 },
|
||||
{ header: '市', key: 'receiver_city', width: 10 },
|
||||
{ header: '区', key: 'receiver_district', width: 10 },
|
||||
{ header: '镇', key: 'receiver_town', width: 10 },
|
||||
{ header: '详细地址', key: 'receiver_detail', width: 30 },
|
||||
{ header: '商品明细', key: 'items_detail', width: 50 },
|
||||
{ header: '物流公司', key: 'logistics_name', width: 18 },
|
||||
{ header: '运单号', key: 'express_numbers', width: 28 },
|
||||
{ header: '运单号', key: 'waybill_code', width: 24 },
|
||||
{ header: '分配时间', key: 'waybill_allocated_at', width: 20 },
|
||||
{ header: '商品种数', key: 'items_count', width: 12 },
|
||||
{ header: '商品件数', key: 'items_total', width: 12 },
|
||||
{ header: '总重量', key: 'items_weight', width: 12 },
|
||||
{ header: '商品重量', key: 'items_weight', width: 12 },
|
||||
{ header: '称重重量(kg)', key: 'weighing_weight', width: 14 },
|
||||
{ header: '订单金额', key: 'total_amount', width: 14 },
|
||||
{ header: '实收金额', key: 'got_amount', width: 14 },
|
||||
{ header: '创建时间', key: 'create_at', width: 20 },
|
||||
@ -53,6 +59,88 @@ const ORDER_EXPORT_COLUMNS = Object.freeze([
|
||||
{ header: '归档时间', key: 'archive_time', width: 20 },
|
||||
]);
|
||||
|
||||
/** 商品明细展开列配置(item 模式) */
|
||||
const ORDER_EXPORT_ITEM_COLUMNS = Object.freeze([
|
||||
{ header: '订单ID', key: 'id', width: 12 },
|
||||
{ header: '订单号', key: 'delivery_order_code', width: 24 },
|
||||
{ header: '外部单号', key: 'external_order_code', width: 24 },
|
||||
{ header: '订单状态', key: 'status', width: 16 },
|
||||
{ header: '波次号', key: 'wave_no', width: 18 },
|
||||
{ header: '货主', key: 'store_id', width: 20 },
|
||||
{ header: '平台', key: 'sys_platform_name', width: 16 },
|
||||
{ header: '店铺昵称', key: 'shop_nick', width: 20 },
|
||||
{ header: '收件人', key: 'receiver_name', width: 16 },
|
||||
{ header: '收件人电话', key: 'receiver_mobile', width: 18 },
|
||||
{ header: '省', key: 'receiver_province', width: 10 },
|
||||
{ header: '市', key: 'receiver_city', width: 10 },
|
||||
{ header: '区', key: 'receiver_district', width: 10 },
|
||||
{ header: '镇', key: 'receiver_town', width: 10 },
|
||||
{ header: '详细地址', key: 'receiver_detail', width: 30 },
|
||||
{ header: '仓库商品名称', key: 'item_name', width: 30 },
|
||||
{ header: '商品条码', key: 'item_barcode', width: 24 },
|
||||
{ header: '数量', key: 'item_quantity', width: 10 },
|
||||
{ header: '物流公司', key: 'logistics_name', width: 18 },
|
||||
{ header: '运单号', key: 'waybill_code', width: 30 },
|
||||
{ header: '分配时间', key: 'waybill_allocated_at', width: 20 },
|
||||
{ header: '商品种数', key: 'items_count', width: 12 },
|
||||
{ header: '商品件数', key: 'items_total', width: 12 },
|
||||
{ header: '商品重量', key: 'items_weight', width: 12 },
|
||||
{ header: '称重重量(kg)', key: 'weighing_weight', width: 14 },
|
||||
{ header: '订单金额', key: 'total_amount', width: 14 },
|
||||
{ header: '实收金额', key: 'got_amount', width: 14 },
|
||||
{ header: '创建时间', key: 'create_at', width: 20 },
|
||||
{ header: '支付时间', key: 'pay_time', width: 20 },
|
||||
{ header: '发货时间', key: 'delivery_time', width: 20 },
|
||||
{ header: '出库状态', key: 'outbound_status', width: 14 },
|
||||
{ header: '复核状态', key: 'inspection_status', width: 14 },
|
||||
{ header: '复核完成状态', key: 'recheck_status', width: 16 },
|
||||
{ header: '配货状态', key: 'post_status', width: 14 },
|
||||
{ header: '打包状态', key: 'pack_status', width: 14 },
|
||||
{ header: '归档时间', key: 'archive_time', width: 20 },
|
||||
]);
|
||||
|
||||
/** 订单状态中文翻译映射 */
|
||||
const ORDER_STATUS_LABELS = Object.freeze({
|
||||
status: {
|
||||
pedding: '待处理',
|
||||
created: '已创建',
|
||||
cancel: '已取消',
|
||||
error: '异常',
|
||||
finished: '已完成',
|
||||
},
|
||||
outbound_status: {
|
||||
none: '无',
|
||||
padding: '待出库',
|
||||
fin: '已完成',
|
||||
timeout: '超时',
|
||||
error: '异常',
|
||||
},
|
||||
inspection_status: {
|
||||
none: '无',
|
||||
padding: '待检验',
|
||||
running: '检验中',
|
||||
fin: '已完成',
|
||||
error: '异常',
|
||||
},
|
||||
recheck_status: {
|
||||
none: '无',
|
||||
fin: '已完成',
|
||||
},
|
||||
post_status: {
|
||||
none: '无',
|
||||
padding: '待配货',
|
||||
fin: '已完成',
|
||||
timeout: '超时',
|
||||
error: '异常',
|
||||
},
|
||||
pack_status: {
|
||||
none: '无',
|
||||
padding: '待打包',
|
||||
fin: '已完成',
|
||||
error: '异常',
|
||||
},
|
||||
});
|
||||
|
||||
/**
|
||||
* 订单导出系统服务。
|
||||
* 负责复用订单列表查询语义,按页拉取数据并流式写入本地 xlsx 后上传。
|
||||
@ -143,10 +231,12 @@ class OrderExportService extends OrderBaseService {
|
||||
|
||||
/**
|
||||
* 获取订单导出列配置。
|
||||
* @param {string} [mode='waybill'] 导出模式:'waybill'(按运单展开)或 'item'(按商品明细展开)。
|
||||
* @return {Array<Object>} 导出列配置。
|
||||
*/
|
||||
getOrderExportColumns() {
|
||||
return ORDER_EXPORT_COLUMNS.map(column => ({ ...column }));
|
||||
getOrderExportColumns(mode = 'waybill') {
|
||||
const columns = mode === 'item' ? ORDER_EXPORT_ITEM_COLUMNS : ORDER_EXPORT_COLUMNS;
|
||||
return columns.map(column => ({ ...column }));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -220,49 +310,158 @@ class OrderExportService extends OrderBaseService {
|
||||
}
|
||||
|
||||
/**
|
||||
* 映射单行订单导出数据。
|
||||
* 映射订单导出数据行。
|
||||
* - waybill 模式:按运单号展开,每个运单一组。
|
||||
* - item 模式:按商品明细展开,每个商品一行;运单信息汇总填充。
|
||||
* @param {Object} orderRow 订单行。
|
||||
* @return {Object} 导出行。
|
||||
* @param {Object} [context] 导出上下文,包含批量查询的辅助数据。
|
||||
* @param {Map<number, Array<Object>>} [context.itemsMap] 订单ID → 商品明细列表的映射。
|
||||
* @param {Map<number, string>} [context.storeRemarkMap] 货主ID → 货主备注的映射。
|
||||
* @param {Map<number, string>} [context.stockNameMap] stockId → 仓库商品名称的映射。
|
||||
* @param {Map<number, string>} [context.barcodeMap] stockId → 商品条码(逗号拼接)的映射。
|
||||
* @param {Map<number, Array<Object>>} [context.expressMap] 订单ID → 运单行列表的映射。
|
||||
* @param {string} [mode='waybill'] 导出模式:'waybill' 或 'item'。
|
||||
* @return {Array<Object>} 导出行数组。
|
||||
*/
|
||||
mapOrderExportRow(orderRow = {}) {
|
||||
mapOrderExportRow(orderRow = {}, context = {}, mode = 'waybill') {
|
||||
const safeOrderRow = this.isPlainObject(orderRow) ? orderRow : {};
|
||||
const expressNumbers = Array.isArray(safeOrderRow.express_numbers)
|
||||
? safeOrderRow.express_numbers
|
||||
: Array.isArray(safeOrderRow.waybill_codes)
|
||||
? safeOrderRow.waybill_codes
|
||||
: [];
|
||||
const { itemsMap, storeRemarkMap, stockNameMap, barcodeMap, expressMap } = context;
|
||||
const safeItemsMap = itemsMap instanceof Map ? itemsMap : new Map();
|
||||
const safeStoreRemarkMap = storeRemarkMap instanceof Map ? storeRemarkMap : new Map();
|
||||
const safeExpressMap = expressMap instanceof Map ? expressMap : new Map();
|
||||
const externalOrderCode = safeOrderRow.pre_delivery_order_code || safeOrderRow.source_order_codes || '';
|
||||
|
||||
return {
|
||||
/**
|
||||
* 翻译状态字段为中文,未知值保留原始值。
|
||||
* @param {string} field 状态字段名。
|
||||
* @param {*} value 原始状态值。
|
||||
* @return {string} 翻译后的中文状态文本。
|
||||
*/
|
||||
const translateStatus = (field, value) => {
|
||||
const raw = String(value ?? '').trim();
|
||||
if (!raw) return '';
|
||||
const labelMap = ORDER_STATUS_LABELS[field];
|
||||
return labelMap && labelMap[raw] ? labelMap[raw] : raw;
|
||||
};
|
||||
|
||||
/**
|
||||
* 安全格式化日期字段,空值/无效值返回空字符串。
|
||||
* @param {*} value 日期原始值。
|
||||
* @return {string} 格式化后的日期字符串或空字符串。
|
||||
*/
|
||||
const formatDateSafe = value => {
|
||||
if (value === null || value === undefined || value === '' || value === 0) {
|
||||
return '';
|
||||
}
|
||||
const d = new Date(value);
|
||||
if (isNaN(d.getTime()) || d.getTime() <= 0) {
|
||||
return '';
|
||||
}
|
||||
return this.app.formatDate(value);
|
||||
};
|
||||
|
||||
const orderId = Number(safeOrderRow.id || 0);
|
||||
const storeId = Number(safeOrderRow.store_id || 0);
|
||||
const storeRemark = safeStoreRemarkMap.get(storeId) || '';
|
||||
const items = safeItemsMap.get(orderId) || [];
|
||||
const safeStockNameMap = stockNameMap instanceof Map ? stockNameMap : new Map();
|
||||
const safeBarcodeMap = barcodeMap instanceof Map ? barcodeMap : new Map();
|
||||
const itemsDetail = Array.isArray(items) && items.length > 0
|
||||
? items.map(item => {
|
||||
const stockId = Number(item.stock_id || 0);
|
||||
const warehouseItemName = stockId > 0 ? safeStockNameMap.get(stockId) : '';
|
||||
const displayName = warehouseItemName || item.item_name || '';
|
||||
return `${displayName} x${item.plan_qty || 1}`;
|
||||
}).join('; ')
|
||||
: '';
|
||||
|
||||
/** 订单公共字段(不含 items_detail,由各模式自行拼接) */
|
||||
const commonFields = {
|
||||
id: this.normalizeExportCellValue(safeOrderRow.id),
|
||||
delivery_order_code: this.normalizeExportCellValue(safeOrderRow.delivery_order_code),
|
||||
external_order_code: this.normalizeExportCellValue(externalOrderCode),
|
||||
status: this.normalizeExportCellValue(safeOrderRow.status),
|
||||
step: this.normalizeExportCellValue(safeOrderRow.step),
|
||||
status: translateStatus('status', safeOrderRow.status),
|
||||
wave_no: this.normalizeExportCellValue(safeOrderRow.wave_no),
|
||||
warehouse_id: this.normalizeExportCellValue(safeOrderRow.warehouse_id),
|
||||
store_id: this.normalizeExportCellValue(safeOrderRow.store_id),
|
||||
store_id: this.normalizeExportCellValue(storeRemark || safeOrderRow.store_name || safeOrderRow.store_id),
|
||||
sys_platform_name: this.normalizeExportCellValue(safeOrderRow.sys_platform_name),
|
||||
shop_nick: this.normalizeExportCellValue(safeOrderRow.shop_nick),
|
||||
seller_nick: this.normalizeExportCellValue(safeOrderRow.seller_nick),
|
||||
buyer_nick: this.normalizeExportCellValue(safeOrderRow.buyer_nick),
|
||||
receiver_name: this.normalizeExportCellValue(safeOrderRow.name || ''),
|
||||
receiver_mobile: this.normalizeExportCellValue(safeOrderRow.mobile || safeOrderRow.tel || ''),
|
||||
receiver_province: this.normalizeExportCellValue(safeOrderRow.province || ''),
|
||||
receiver_city: this.normalizeExportCellValue(safeOrderRow.city || ''),
|
||||
receiver_district: this.normalizeExportCellValue(safeOrderRow.area || ''),
|
||||
receiver_town: this.normalizeExportCellValue(safeOrderRow.town || ''),
|
||||
receiver_detail: this.normalizeExportCellValue(safeOrderRow.detail_address || ''),
|
||||
logistics_name: this.normalizeExportCellValue(safeOrderRow.logistics_name),
|
||||
express_numbers: this.normalizeExportCellValue(expressNumbers),
|
||||
items_count: this.normalizeExportCellValue(safeOrderRow.items_count),
|
||||
items_total: this.normalizeExportCellValue(safeOrderRow.items_total),
|
||||
items_weight: this.normalizeExportCellValue(safeOrderRow.items_weight),
|
||||
total_amount: this.normalizeExportCellValue(safeOrderRow.total_amount),
|
||||
got_amount: this.normalizeExportCellValue(safeOrderRow.got_amount),
|
||||
create_at: this.normalizeExportCellValue(safeOrderRow.create_at),
|
||||
pay_time: this.normalizeExportCellValue(safeOrderRow.pay_time),
|
||||
delivery_time: this.normalizeExportCellValue(safeOrderRow.delivery_time),
|
||||
outbound_status: this.normalizeExportCellValue(safeOrderRow.outbound_status),
|
||||
inspection_status: this.normalizeExportCellValue(safeOrderRow.inspection_status),
|
||||
recheck_status: this.normalizeExportCellValue(safeOrderRow.recheck_status),
|
||||
post_status: this.normalizeExportCellValue(safeOrderRow.post_status),
|
||||
pack_status: this.normalizeExportCellValue(safeOrderRow.pack_status),
|
||||
archive_time: this.normalizeExportCellValue(safeOrderRow.archive_time),
|
||||
create_at: formatDateSafe(safeOrderRow.create_at),
|
||||
pay_time: formatDateSafe(safeOrderRow.pay_time),
|
||||
delivery_time: formatDateSafe(safeOrderRow.delivery_time),
|
||||
outbound_status: translateStatus('outbound_status', safeOrderRow.outbound_status),
|
||||
inspection_status: translateStatus('inspection_status', safeOrderRow.inspection_status),
|
||||
recheck_status: translateStatus('recheck_status', safeOrderRow.recheck_status),
|
||||
post_status: translateStatus('post_status', safeOrderRow.post_status),
|
||||
pack_status: translateStatus('pack_status', safeOrderRow.pack_status),
|
||||
archive_time: formatDateSafe(safeOrderRow.archive_time),
|
||||
};
|
||||
|
||||
const expressList = safeExpressMap.get(orderId) || [];
|
||||
|
||||
// ★ 模式B:按商品明细展开
|
||||
if (mode === 'item') {
|
||||
const waybillSummary = expressList.map(e => e.waybill_code).filter(Boolean).join(', ');
|
||||
const waybillFirstTime = expressList.length > 0 ? formatDateSafe(expressList[0].create_at) : '';
|
||||
const weightSummary = expressList.reduce((sum, e) => sum + (Number(e.weighing_weight) || 0), 0);
|
||||
|
||||
if (items.length === 0) {
|
||||
return [{
|
||||
...commonFields,
|
||||
item_name: '',
|
||||
item_barcode: '',
|
||||
item_quantity: '',
|
||||
waybill_code: waybillSummary,
|
||||
waybill_allocated_at: waybillFirstTime,
|
||||
weighing_weight: weightSummary || '',
|
||||
}];
|
||||
}
|
||||
|
||||
return items.map(item => {
|
||||
const sid = Number(item.stock_id || 0);
|
||||
return {
|
||||
...commonFields,
|
||||
item_name: (sid > 0 ? safeStockNameMap.get(sid) : '') || item.item_name || '',
|
||||
item_barcode: sid > 0 ? (safeBarcodeMap.get(sid) || '') : '',
|
||||
item_quantity: item.plan_qty || 1,
|
||||
waybill_code: waybillSummary,
|
||||
waybill_allocated_at: waybillFirstTime,
|
||||
weighing_weight: weightSummary || '',
|
||||
};
|
||||
});
|
||||
}
|
||||
|
||||
// ★ 模式A(默认 waybill):按运单展开,保留 items_detail
|
||||
if (expressList.length === 0) {
|
||||
// 无运单的订单也输出一行(运单字段为空)
|
||||
return [{
|
||||
...commonFields,
|
||||
items_detail: this.normalizeExportCellValue(itemsDetail),
|
||||
waybill_code: '',
|
||||
waybill_allocated_at: '',
|
||||
weighing_weight: '',
|
||||
}];
|
||||
}
|
||||
|
||||
return expressList.map(exp => ({
|
||||
...commonFields,
|
||||
items_detail: this.normalizeExportCellValue(itemsDetail),
|
||||
waybill_code: exp.waybill_code || '',
|
||||
waybill_allocated_at: formatDateSafe(exp.create_at),
|
||||
weighing_weight: exp.weighing_weight != null ? Number(exp.weighing_weight) : '',
|
||||
}));
|
||||
}
|
||||
|
||||
/**
|
||||
@ -390,7 +589,9 @@ class OrderExportService extends OrderBaseService {
|
||||
useSharedStrings: false,
|
||||
});
|
||||
const worksheet = workbook.addWorksheet(ORDER_EXPORT_WORKSHEET_NAME);
|
||||
worksheet.columns = this.getOrderExportColumns();
|
||||
const exportMode = String(safeOptions.export_mode || '').trim() || 'waybill';
|
||||
const mode = exportMode === 'item' ? 'item' : 'waybill';
|
||||
worksheet.columns = this.getOrderExportColumns(mode);
|
||||
|
||||
let currentCount = 0;
|
||||
let page = 1;
|
||||
@ -417,12 +618,163 @@ class OrderExportService extends OrderBaseService {
|
||||
break;
|
||||
}
|
||||
|
||||
const normalizedRows = await this.attachOrderExpressNumbers(
|
||||
rows.map(row => this.normalizeOrderListItem(this.toPlainRow(row)))
|
||||
const normalizedRows = rows.map(row =>
|
||||
this.normalizeOrderListItem(this.toPlainRow(row))
|
||||
);
|
||||
|
||||
const orderIds = normalizedRows.map(r => Number(r.id || 0)).filter(id => id > 0);
|
||||
|
||||
// 批量查询商品明细(wms_order_items)
|
||||
const itemsMap = new Map();
|
||||
if (orderIds.length > 0) {
|
||||
try {
|
||||
const itemsModel = await this.getOrderItemsModelByTableType(target.tableType, warehouseId);
|
||||
const itemsRows = await itemsModel.findAll({
|
||||
where: { order_id: { [this.app.Sequelize.Op.in]: orderIds } },
|
||||
attributes: [ 'order_id', 'item_name', 'plan_qty', 'stock_id' ],
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
});
|
||||
for (const item of (Array.isArray(itemsRows) ? itemsRows : [])) {
|
||||
const oid = Number(item.order_id || 0);
|
||||
if (oid > 0) {
|
||||
if (!itemsMap.has(oid)) {
|
||||
itemsMap.set(oid, []);
|
||||
}
|
||||
itemsMap.get(oid).push(item);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.app.logger.warn(`[order_export] 批量查询订单商品明细失败: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 批量查询仓库商品名称(wms_stock_warehouse.item_name)
|
||||
const stockNameMap = new Map();
|
||||
if (itemsMap.size > 0 && this.ctx && this.ctx.model && this.ctx.model.StockWarehouse) {
|
||||
try {
|
||||
const stockIds = [
|
||||
...new Set(
|
||||
[ ...itemsMap.values() ]
|
||||
.flat()
|
||||
.map(item => Number(item.stock_id || 0))
|
||||
.filter(id => id > 0)
|
||||
),
|
||||
];
|
||||
if (stockIds.length > 0) {
|
||||
const swRows = await this.ctx.model.StockWarehouse.findAll({
|
||||
where: {
|
||||
id: { [this.app.Sequelize.Op.in]: stockIds },
|
||||
},
|
||||
attributes: [ 'id', 'item_name' ],
|
||||
raw: true,
|
||||
});
|
||||
for (const sw of (Array.isArray(swRows) ? swRows : [])) {
|
||||
const sid = Number(sw.id || 0);
|
||||
if (sid > 0 && !stockNameMap.has(sid)) {
|
||||
stockNameMap.set(sid, String(sw.item_name || '').trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.app.logger.warn(`[order_export] 批量查询仓库商品名称失败: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 批量查询货主备注(wms_store_warehouse.store_remask)
|
||||
const storeRemarkMap = new Map();
|
||||
if (orderIds.length > 0 && this.ctx && this.ctx.model && this.ctx.model.StoreWarehouse) {
|
||||
try {
|
||||
const storeIds = [
|
||||
...new Set(
|
||||
normalizedRows
|
||||
.map(r => Number(r.store_id || 0))
|
||||
.filter(id => id > 0)
|
||||
),
|
||||
];
|
||||
if (storeIds.length > 0) {
|
||||
const swRows = await this.ctx.model.StoreWarehouse.findAll({
|
||||
where: {
|
||||
store_id: { [this.app.Sequelize.Op.in]: storeIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'store_id', 'store_remask' ],
|
||||
raw: true,
|
||||
});
|
||||
for (const sw of (Array.isArray(swRows) ? swRows : [])) {
|
||||
const sid = Number(sw.store_id || 0);
|
||||
if (sid > 0 && !storeRemarkMap.has(sid)) {
|
||||
storeRemarkMap.set(sid, String(sw.store_remask || '').trim());
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.app.logger.warn(`[order_export] 批量查询货主备注失败: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 批量查询运单数据(wms_order_express),按订单ID分组
|
||||
const expressMap = new Map();
|
||||
if (orderIds.length > 0 && this.ctx && this.ctx.model && this.ctx.model.OrderExpress) {
|
||||
try {
|
||||
const expressRows = await this.ctx.model.OrderExpress.findAll({
|
||||
where: {
|
||||
order_id: { [this.app.Sequelize.Op.in]: orderIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'order_id', 'waybill_code', 'create_at', 'weighing_weight' ],
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
});
|
||||
for (const exp of (Array.isArray(expressRows) ? expressRows : [])) {
|
||||
const oid = Number(exp.order_id || 0);
|
||||
if (oid > 0) {
|
||||
if (!expressMap.has(oid)) {
|
||||
expressMap.set(oid, []);
|
||||
}
|
||||
expressMap.get(oid).push(exp);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.app.logger.warn(`[order_export] 批量查询运单数据失败: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
// 批量查询商品条码(wms_stock_barcodes)
|
||||
const barcodeMap = new Map();
|
||||
if (stockNameMap.size > 0 && this.ctx && this.ctx.model && this.ctx.model.StockBarcode) {
|
||||
try {
|
||||
const stockIdsForBarcode = [ ...stockNameMap.keys() ];
|
||||
if (stockIdsForBarcode.length > 0) {
|
||||
const bcRows = await this.ctx.model.StockBarcode.findAll({
|
||||
where: { stock_id: { [this.app.Sequelize.Op.in]: stockIdsForBarcode } },
|
||||
attributes: [ 'stock_id', 'barcode' ],
|
||||
raw: true,
|
||||
});
|
||||
for (const bc of (Array.isArray(bcRows) ? bcRows : [])) {
|
||||
const sid = Number(bc.stock_id || 0);
|
||||
if (sid > 0) {
|
||||
if (!barcodeMap.has(sid)) barcodeMap.set(sid, []);
|
||||
barcodeMap.get(sid).push(String(bc.barcode || '').trim());
|
||||
}
|
||||
}
|
||||
// 转为逗号拼接
|
||||
for (const [ sid, codes ] of barcodeMap) {
|
||||
barcodeMap.set(sid, [ ...new Set(codes.filter(Boolean)) ].join(', '));
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
this.app.logger.warn(`[order_export] 批量查询商品条码失败: ${err.message}`);
|
||||
}
|
||||
}
|
||||
|
||||
const exportContext = { itemsMap, storeRemarkMap, stockNameMap, barcodeMap, expressMap };
|
||||
|
||||
for (const row of normalizedRows) {
|
||||
worksheet.addRow(this.mapOrderExportRow(row)).commit();
|
||||
const exportRows = this.mapOrderExportRow(row, exportContext, mode);
|
||||
for (const exportRow of exportRows) {
|
||||
worksheet.addRow(exportRow).commit();
|
||||
}
|
||||
}
|
||||
|
||||
currentCount += normalizedRows.length;
|
||||
|
||||
@ -207,6 +207,7 @@ class OrderPrintSystemService extends OrderBaseService {
|
||||
order_id: {
|
||||
[Op.in]: orderIds,
|
||||
},
|
||||
warehouse_id: warehouseId,
|
||||
status: {
|
||||
[Op.ne]: 'cancel',
|
||||
},
|
||||
@ -405,9 +406,36 @@ class OrderPrintSystemService extends OrderBaseService {
|
||||
delete item.stock_id;
|
||||
}
|
||||
|
||||
// 按库位(pick_location)聚合,同一库位的商品合并为一行
|
||||
const aggregatedMap = new Map();
|
||||
for (const item of printItems) {
|
||||
const key = item.pick_location || '';
|
||||
const existing = aggregatedMap.get(key);
|
||||
if (existing) {
|
||||
// 累加数量
|
||||
existing.quantity += item.quantity;
|
||||
// 合并 item_name(用 、 拼接去重)
|
||||
if (item.item_name && !existing.item_name.split('、').includes(item.item_name)) {
|
||||
existing.item_name = `${existing.item_name}、${item.item_name}`;
|
||||
}
|
||||
// 合并 barcode(用 ; 拼接去重)
|
||||
if (item.barcode && !existing.barcode.split(';').includes(item.barcode)) {
|
||||
existing.barcode = `${existing.barcode};${item.barcode}`;
|
||||
}
|
||||
// 合并 barcodes 数组(Set 去重)
|
||||
if (item.barcodes && item.barcodes.length > 0) {
|
||||
const merged = new Set([...(existing.barcodes || []), ...item.barcodes]);
|
||||
existing.barcodes = Array.from(merged);
|
||||
}
|
||||
} else {
|
||||
aggregatedMap.set(key, { ...item });
|
||||
}
|
||||
}
|
||||
const mergedPrintItems = Array.from(aggregatedMap.values());
|
||||
|
||||
resultMap.set(orderId, {
|
||||
...orderRow,
|
||||
items: JSON.stringify(printItems),
|
||||
items: JSON.stringify(mergedPrintItems),
|
||||
});
|
||||
}
|
||||
|
||||
@ -1406,46 +1434,50 @@ class OrderPrintSystemService extends OrderBaseService {
|
||||
return [];
|
||||
}
|
||||
|
||||
// 公共查询字段:current 表与 dispatch 表使用相同字段选择
|
||||
const sharedAttributes = [
|
||||
'id',
|
||||
'delivery_order_code',
|
||||
'source_order_codes',
|
||||
'warehouse_id',
|
||||
'store_id',
|
||||
'wave_id',
|
||||
'wave_no',
|
||||
'name',
|
||||
'tel',
|
||||
'mobile',
|
||||
'province',
|
||||
'city',
|
||||
'area',
|
||||
'town',
|
||||
'detail_address',
|
||||
'zip_code',
|
||||
'items',
|
||||
'source_platform_code',
|
||||
'sys_platform_code',
|
||||
'sys_platform_name',
|
||||
'logistics_code',
|
||||
'logistics_name',
|
||||
'sys_logistics_code',
|
||||
'sys_logistics_name',
|
||||
'post_status',
|
||||
'status',
|
||||
'outbound_status',
|
||||
'print_status',
|
||||
'lock_status',
|
||||
'print_lock_status',
|
||||
'items_count',
|
||||
'items_total',
|
||||
'items_weight',
|
||||
'freight',
|
||||
'create_at',
|
||||
'pay_time',
|
||||
];
|
||||
|
||||
// 第一步:查询 current 主表(wms_order_delivery_{warehouseId})
|
||||
const orderModel = await this.getOrderModel('order', warehouseId);
|
||||
const rows = await orderModel.findAll({
|
||||
attributes: [
|
||||
'id',
|
||||
'delivery_order_code',
|
||||
'source_order_codes',
|
||||
'warehouse_id',
|
||||
'store_id',
|
||||
'wave_id',
|
||||
'wave_no',
|
||||
'name',
|
||||
'tel',
|
||||
'mobile',
|
||||
'province',
|
||||
'city',
|
||||
'area',
|
||||
'town',
|
||||
'detail_address',
|
||||
'zip_code',
|
||||
'items',
|
||||
'source_platform_code',
|
||||
'sys_platform_code',
|
||||
'sys_platform_name',
|
||||
'logistics_code',
|
||||
'logistics_name',
|
||||
'sys_logistics_code',
|
||||
'sys_logistics_name',
|
||||
'post_status',
|
||||
'status',
|
||||
'outbound_status',
|
||||
'print_status',
|
||||
'lock_status',
|
||||
'print_lock_status',
|
||||
'items_count',
|
||||
'items_total',
|
||||
'items_weight',
|
||||
'freight',
|
||||
'create_at',
|
||||
'pay_time',
|
||||
],
|
||||
attributes: sharedAttributes,
|
||||
where: {
|
||||
id: {
|
||||
[Op.in]: orderIds,
|
||||
@ -1455,7 +1487,47 @@ class OrderPrintSystemService extends OrderBaseService {
|
||||
raw: true,
|
||||
});
|
||||
|
||||
return Array.isArray(rows) ? rows : [];
|
||||
const currentRows = Array.isArray(rows) ? rows : [];
|
||||
|
||||
// 第二步:若 current 表未命中全部订单,计算缺失 ID 并兜底查询 dispatch 表
|
||||
if (currentRows.length < orderIds.length) {
|
||||
const foundIds = new Set(currentRows.map(row => row.id));
|
||||
const missingIds = orderIds.filter(id => !foundIds.has(id));
|
||||
|
||||
try {
|
||||
// 获取 dispatch 分表模型,表可能不存在(返回 null)
|
||||
const dispatchModel = await this.getOrderModelByTableType('dispatch', warehouseId);
|
||||
if (dispatchModel) {
|
||||
const dispatchRows = await dispatchModel.findAll({
|
||||
attributes: sharedAttributes,
|
||||
where: {
|
||||
id: {
|
||||
[Op.in]: missingIds,
|
||||
},
|
||||
},
|
||||
order: [[ 'wave_id', 'ASC' ], [ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
if (Array.isArray(dispatchRows) && dispatchRows.length > 0) {
|
||||
// 合并 current 表与 dispatch 表结果,按 wave_id、id 升序排列
|
||||
const mergedRows = [...currentRows, ...dispatchRows].sort((a, b) => {
|
||||
const waveDiff = (a.wave_id || 0) - (b.wave_id || 0);
|
||||
if (waveDiff !== 0) return waveDiff;
|
||||
return (a.id || 0) - (b.id || 0);
|
||||
});
|
||||
return mergedRows;
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
// dispatch 表查询失败时仅记录日志,不影响 current 表已查到的结果
|
||||
this.ctx.logger.warn(
|
||||
`[queryOrdersByIds] dispatch 兜底查询失败,将仅返回 current 表结果:${err.message}`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return currentRows;
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -589,6 +589,7 @@ class OrderStorageAllocationService extends MainService {
|
||||
|
||||
const pendingOrderIds = [];
|
||||
const skippedOrders = [];
|
||||
const errorRetryOrderIds = [];
|
||||
|
||||
for (const orderId of orderIds) {
|
||||
const orderRow = orderMap.get(orderId);
|
||||
@ -627,8 +628,14 @@ class OrderStorageAllocationService extends MainService {
|
||||
}
|
||||
|
||||
pendingOrderIds.push(orderId);
|
||||
|
||||
if (String(orderRow.storage_status || 'none') === STORAGE_STATUS_ERROR) {
|
||||
errorRetryOrderIds.push(orderId);
|
||||
}
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 订单进入待分配列表', {
|
||||
orderId,
|
||||
storageStatus: orderRow.storage_status,
|
||||
pendingOrderCount: pendingOrderIds.length,
|
||||
pendingOrderSampleIds: pendingOrderIds.slice(0, ALLOCATION_LOG_SAMPLE_LIMIT),
|
||||
});
|
||||
@ -638,8 +645,10 @@ class OrderStorageAllocationService extends MainService {
|
||||
requestedOrderCount: orderIds.length,
|
||||
pendingOrderCount: pendingOrderIds.length,
|
||||
skippedOrderCount: skippedOrders.length,
|
||||
errorRetryOrderCount: errorRetryOrderIds.length,
|
||||
pendingOrderSampleIds: pendingOrderIds.slice(0, ALLOCATION_LOG_SAMPLE_LIMIT),
|
||||
skippedOrderSample: skippedOrders.slice(0, ALLOCATION_LOG_SAMPLE_LIMIT),
|
||||
errorRetryOrderSampleIds: errorRetryOrderIds.slice(0, ALLOCATION_LOG_SAMPLE_LIMIT),
|
||||
});
|
||||
|
||||
if (pendingOrderIds.length === 0) {
|
||||
@ -829,6 +838,67 @@ class OrderStorageAllocationService extends MainService {
|
||||
const totalCount = pendingOrderIds.length;
|
||||
let processedCount = 0;
|
||||
|
||||
// 对于 storage_status='error' 的重分配订单,先清理旧的 picking 记录并释放已锁定的库存
|
||||
if (errorRetryOrderIds.length > 0) {
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 检测到 error 重试订单,开始清理旧数据', {
|
||||
warehouseId,
|
||||
errorRetryOrderIds,
|
||||
errorRetryOrderCount: errorRetryOrderIds.length,
|
||||
});
|
||||
|
||||
const oldPickingRecords = await pickingModel.findAll({
|
||||
where: {
|
||||
order_id: { [Op.in]: errorRetryOrderIds },
|
||||
status: 'pending',
|
||||
},
|
||||
transaction,
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
});
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 查询到旧的 picking 记录', {
|
||||
warehouseId,
|
||||
oldPickingCount: Array.isArray(oldPickingRecords) ? oldPickingRecords.length : 0,
|
||||
});
|
||||
|
||||
if (Array.isArray(oldPickingRecords) && oldPickingRecords.length > 0) {
|
||||
for (const record of oldPickingRecords) {
|
||||
const storageId = toNumber(record.storage_id, 0);
|
||||
const quantity = toNumber(record.quantity, 0);
|
||||
|
||||
if (storageId > 0 && quantity > 0) {
|
||||
await ctx.service.systems.storage.index.unlockQuantity(storageId, quantity, { transaction });
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 已释放旧库存锁定', {
|
||||
warehouseId,
|
||||
orderId: toNumber(record.order_id, 0),
|
||||
storageId,
|
||||
quantity,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
await pickingModel.destroy({
|
||||
where: {
|
||||
order_id: { [Op.in]: errorRetryOrderIds },
|
||||
status: 'pending',
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] 已删除旧的 picking 记录', {
|
||||
warehouseId,
|
||||
errorRetryOrderIds,
|
||||
deletedCount: oldPickingRecords.length,
|
||||
});
|
||||
}
|
||||
|
||||
writeAllocationTextLog('[OrderStorageAllocationService.allocatePicking] error 订单旧数据清理完成', {
|
||||
warehouseId,
|
||||
errorRetryOrderIds,
|
||||
});
|
||||
}
|
||||
|
||||
await notifyProgress({
|
||||
status: 'running',
|
||||
total_count: totalCount,
|
||||
@ -1027,6 +1097,7 @@ class OrderStorageAllocationService extends MainService {
|
||||
pickingRows.push({
|
||||
order_id: orderId,
|
||||
order_item_id: toNumber(orderItem.id, 0),
|
||||
warehouse_id: warehouseId,
|
||||
storage_id: storageRow.id,
|
||||
quantity: allocationQuantity,
|
||||
space_id: toNumber(storageRow.space_id, 0) || null,
|
||||
@ -1937,6 +2008,7 @@ class OrderStorageAllocationService extends MainService {
|
||||
order_id: {
|
||||
[Op.in]: eligibleOrderIds,
|
||||
},
|
||||
warehouse_id: warehouseId,
|
||||
status: {
|
||||
[Op.ne]: 'cancel',
|
||||
},
|
||||
|
||||
@ -634,6 +634,7 @@ class PickSystemService extends Service {
|
||||
order_id: {
|
||||
[Op.in]: orderIds,
|
||||
},
|
||||
warehouse_id: normalizedWarehouseId,
|
||||
},
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
raw: true,
|
||||
@ -1080,6 +1081,7 @@ class PickSystemService extends Service {
|
||||
order_id: {
|
||||
[this.app.Sequelize.Op.in]: orderIds,
|
||||
},
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'order_id', 'order_item_id', 'quantity', 'storage_id', 'space_id', 'space_name' ],
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
@ -1807,6 +1809,130 @@ class PickSystemService extends Service {
|
||||
hooks: false,
|
||||
});
|
||||
|
||||
// 更新 wms_picking.status 为完成状态
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_picking
|
||||
SET status = 'fin', updated_at = NOW()
|
||||
WHERE order_id IN (:orderIds)
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: {
|
||||
orderIds: targetOrderIds,
|
||||
warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 从 wms_picking 汇总各 storage_id 的 quantity,扣减 wms_storage 的锁定数量与可用数量
|
||||
const pickingSummaryRows = await ctx.model.query(`
|
||||
SELECT
|
||||
p.storage_id,
|
||||
SUM(p.quantity) AS total_qty
|
||||
FROM wms_picking p
|
||||
WHERE p.order_id IN (:orderIds)
|
||||
AND p.warehouse_id = :warehouseId
|
||||
AND p.storage_id IS NOT NULL
|
||||
AND p.storage_id > 0
|
||||
GROUP BY p.storage_id
|
||||
`, {
|
||||
replacements: {
|
||||
orderIds: targetOrderIds,
|
||||
warehouseId,
|
||||
},
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
});
|
||||
|
||||
const normalizedSummaryRows = Array.isArray(pickingSummaryRows) ? pickingSummaryRows : [];
|
||||
if (normalizedSummaryRows.length > 0) {
|
||||
const storageIds = normalizedSummaryRows.map(r => Number(r.storage_id));
|
||||
const storageQtyMap = new Map();
|
||||
for (const row of normalizedSummaryRows) {
|
||||
storageQtyMap.set(Number(row.storage_id), Number(row.total_qty) || 0);
|
||||
}
|
||||
|
||||
// 加行锁校验 locked_quantity >= 扣减数量
|
||||
const storageRows = await ctx.model.Storage.findAll({
|
||||
where: {
|
||||
id: { [this.app.Sequelize.Op.in]: storageIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'locked_quantity', 'quantity', 'store_id', 'stock_id', 'batch_no', 'inventory_type', 'space_id' ],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.id);
|
||||
const deduction = storageQtyMap.get(sid) || 0;
|
||||
const locked = Number(sRow.locked_quantity) || 0;
|
||||
if (locked < deduction) {
|
||||
throw this.createBusinessError(
|
||||
`库存记录 ${sid} 锁定数量不足:当前锁定 ${locked},需扣减 ${deduction}`,
|
||||
400
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// 构建 CASE WHEN 语句
|
||||
const caseClauses = normalizedSummaryRows
|
||||
.map(r => `WHEN ${Number(r.storage_id)} THEN ${Number(r.total_qty)}`)
|
||||
.join(' ');
|
||||
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_storage
|
||||
SET locked_quantity = locked_quantity - CASE id ${caseClauses} END,
|
||||
quantity = quantity - CASE id ${caseClauses} END,
|
||||
updated_at = NOW()
|
||||
WHERE id IN (:storageIds)
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: {
|
||||
storageIds,
|
||||
warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 写入 wms_storage_transaction 出库流水
|
||||
const transactionRows = [];
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.id);
|
||||
const deduction = storageQtyMap.get(sid) || 0;
|
||||
if (deduction <= 0) continue;
|
||||
const beforeQty = Number(sRow.quantity) || 0;
|
||||
const beforeLocked = Number(sRow.locked_quantity) || 0;
|
||||
transactionRows.push({
|
||||
transaction_type: 'OUTBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: Number(sRow.store_id) || 0,
|
||||
stock_id: Number(sRow.stock_id) || 0,
|
||||
storage_id: sid,
|
||||
space_id: Number(sRow.space_id) || null,
|
||||
quantity: deduction,
|
||||
before_quantity: beforeQty,
|
||||
after_quantity: Math.max(0, beforeQty - deduction),
|
||||
before_locked_quantity: beforeLocked,
|
||||
after_locked_quantity: Math.max(0, beforeLocked - deduction),
|
||||
batch_no: sRow.batch_no || null,
|
||||
inventory_type: sRow.inventory_type || 'ZP',
|
||||
order_type: 'PICK_OUTBOUND',
|
||||
order_no: targetOrderIds.join(',').slice(0, 255),
|
||||
order_id: taskId,
|
||||
source_order_codes: targetOrderIds.join(', '),
|
||||
operator_id: String(operatorId),
|
||||
operator_name: operatorName,
|
||||
remark: '拣货完成出库',
|
||||
created_at: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
if (transactionRows.length > 0) {
|
||||
await ctx.model.StorageTransaction.bulkCreate(transactionRows, { transaction });
|
||||
}
|
||||
}
|
||||
|
||||
const progress = await this.getTaskPickProgress(taskId, warehouseId, transaction);
|
||||
if (mode === 1 || progress.isCompleted) {
|
||||
await ctx.model.query(`
|
||||
|
||||
694
app/service/systems/pick_compensation.js
Normal file
694
app/service/systems/pick_compensation.js
Normal file
@ -0,0 +1,694 @@
|
||||
'use strict';
|
||||
|
||||
const MainService = require('../main');
|
||||
|
||||
const MAX_BATCH_SIZE = 500;
|
||||
const COMPENSATION_STATUS = 'fin_compensated';
|
||||
const COMPENSATION_ORDER_TYPE = 'PICK_COMPENSATION';
|
||||
const CANCELLED_RELEASED_STATUS = 'cancelled_released';
|
||||
|
||||
/**
|
||||
* 拣货完成补偿服务。
|
||||
*
|
||||
* 当 wavePickTaskComplete 因历史 BUG 遗漏扣减库存操作时,
|
||||
* 本服务扫描 wms_picking 中 status='pending' 且订单已迁移到 dispatch 表的记录,
|
||||
* 以与 wavePickTaskComplete 一致的事务逻辑补扣库存并写入出库流水。
|
||||
*/
|
||||
class PickCompensationService extends MainService {
|
||||
/**
|
||||
* 执行全局拣货补偿扫描与补偿。
|
||||
* 遍历所有存在 pending 拣货记录的仓库,对符合条件的记录执行补偿。
|
||||
*
|
||||
* @return {Promise<{totalCompensated: number}>} 全局补偿结果。
|
||||
*/
|
||||
async executeCompensation() {
|
||||
const { ctx } = this;
|
||||
|
||||
// Step 1: 查找所有存在 pending 拣货记录的仓库
|
||||
const warehouseRows = await ctx.model.query(`
|
||||
SELECT DISTINCT warehouse_id
|
||||
FROM wms_picking
|
||||
WHERE status = 'pending'
|
||||
AND warehouse_id > 0
|
||||
`, {
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
});
|
||||
|
||||
const warehouses = (Array.isArray(warehouseRows) ? warehouseRows : [])
|
||||
.map(row => Number(row.warehouse_id))
|
||||
.filter(id => Number.isInteger(id) && id > 0);
|
||||
|
||||
if (warehouses.length === 0) {
|
||||
return { totalCompensated: 0 };
|
||||
}
|
||||
|
||||
let totalCompensated = 0;
|
||||
|
||||
for (const warehouseId of warehouses) {
|
||||
try {
|
||||
const compensated = await this.compensateWarehouse(warehouseId);
|
||||
totalCompensated += compensated;
|
||||
} catch (error) {
|
||||
ctx.logger.error(
|
||||
`[pick-compensation] 仓库 ${warehouseId} 补偿失败: ${error.message}`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return { totalCompensated };
|
||||
}
|
||||
|
||||
/**
|
||||
* 对指定仓库执行单次拣货补偿。
|
||||
* 先释放已取消订单的库存锁定,再处理拣货完成的 dispatch 订单补偿。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @return {Promise<number>} 本次补偿的拣货记录数。
|
||||
*/
|
||||
async compensateWarehouse(warehouseId) {
|
||||
const { ctx } = this;
|
||||
const factory = ctx.model && ctx.model.OrderDeliveryFactory;
|
||||
|
||||
if (!factory || typeof factory.getCurrentModel !== 'function' || typeof factory.getDispatchModel !== 'function') {
|
||||
ctx.logger.warn(`[pick-compensation] 仓库 ${warehouseId} 订单分表工厂不可用,跳过`);
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 获取所有 pending 订单ID
|
||||
const pendingOrderIds = await this.getPendingOrderIds(warehouseId);
|
||||
if (pendingOrderIds.length === 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const currentModel = await factory.getCurrentModel(warehouseId);
|
||||
|
||||
let compensatedCount = 0;
|
||||
|
||||
// Step A: 释放已取消订单的库存锁定
|
||||
const cancelledPickingRows = await this.findPendingPickingForCancelledOrders(
|
||||
warehouseId, factory, pendingOrderIds
|
||||
);
|
||||
if (cancelledPickingRows.length > 0) {
|
||||
ctx.logger.info(
|
||||
`[pick-compensation] 仓库 ${warehouseId} 发现 ${cancelledPickingRows.length} 条已取消订单待释放拣货记录`
|
||||
);
|
||||
const released = await this.releaseCancelledInTransaction(warehouseId, cancelledPickingRows);
|
||||
compensatedCount += released;
|
||||
}
|
||||
|
||||
// Step B: 查找符合条件的 dispatch 拣货记录
|
||||
const pickingRows = await this.findPendingPickingForDispatchOrders(
|
||||
warehouseId, factory, currentModel, pendingOrderIds
|
||||
);
|
||||
if (pickingRows.length === 0) {
|
||||
return compensatedCount;
|
||||
}
|
||||
|
||||
ctx.logger.info(
|
||||
`[pick-compensation] 仓库 ${warehouseId} 发现 ${pickingRows.length} 条待补偿拣货记录`
|
||||
);
|
||||
|
||||
// Step C: 在事务中执行拣货完成补偿
|
||||
const dispatchCompensated = await this.compensateInTransaction(warehouseId, pickingRows);
|
||||
compensatedCount += dispatchCompensated;
|
||||
|
||||
if (dispatchCompensated > 0) {
|
||||
const orderIds = [ ...new Set(pickingRows.map(r => Number(r.order_id))) ];
|
||||
const pickingIds = pickingRows.map(r => Number(r.id));
|
||||
const storageIds = [ ...new Set(pickingRows
|
||||
.map(r => Number(r.storage_id))
|
||||
.filter(id => id > 0)) ];
|
||||
|
||||
ctx.logger.info(
|
||||
`[pick-compensation] 仓库 ${warehouseId} 补偿完成:` +
|
||||
`拣货记录 ${pickingIds.join(',')},` +
|
||||
`订单 ${orderIds.join(',')},` +
|
||||
`库存记录 ${storageIds.join(',')}`
|
||||
);
|
||||
}
|
||||
|
||||
return compensatedCount;
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取指定仓库下所有待处理拣货记录的订单ID列表。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @return {Promise<Array<number>>} 待处理的订单ID列表。
|
||||
*/
|
||||
async getPendingOrderIds(warehouseId) {
|
||||
const { ctx } = this;
|
||||
|
||||
const pendingOrderRows = await ctx.model.query(`
|
||||
SELECT DISTINCT p.order_id
|
||||
FROM wms_picking p
|
||||
WHERE p.status = 'pending'
|
||||
AND p.warehouse_id = :warehouseId
|
||||
AND p.warehouse_id > 0
|
||||
`, {
|
||||
replacements: { warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
});
|
||||
|
||||
return (Array.isArray(pendingOrderRows) ? pendingOrderRows : [])
|
||||
.map(row => Number(row.order_id))
|
||||
.filter(id => Number.isInteger(id) && id > 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找仓库下待补偿的拣货记录(dispatch 拣货完成场景)。
|
||||
* 条件:status='pending',对应订单在 dispatch 表中 pick_status='fin',
|
||||
* 且订单不在 current 表中(已迁移到配送表)。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Object} factory OrderDeliveryFactory 实例。
|
||||
* @param {Object} currentModel 订单 current 表的 Sequelize 模型。
|
||||
* @param {Array<number>} pendingOrderIds 待处理的订单ID列表。
|
||||
* @return {Promise<Array<Object>>} 待补偿的拣货记录列表。
|
||||
*/
|
||||
async findPendingPickingForDispatchOrders(warehouseId, factory, currentModel, pendingOrderIds) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
if (!Array.isArray(pendingOrderIds) || pendingOrderIds.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// 查询 current 表:哪些订单还在主表中
|
||||
const currentOrders = await currentModel.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: pendingOrderIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const currentOrderIdSet = new Set(
|
||||
(Array.isArray(currentOrders) ? currentOrders : [])
|
||||
.map(row => Number(row.id))
|
||||
);
|
||||
|
||||
// 查询 dispatch 表:哪些订单 pick_status='fin'
|
||||
const dispatchModel = await factory.getDispatchModel(warehouseId);
|
||||
const dispatchOrders = await dispatchModel.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: pendingOrderIds },
|
||||
warehouse_id: warehouseId,
|
||||
pick_status: 'fin',
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const dispatchOrderIdSet = new Set(
|
||||
(Array.isArray(dispatchOrders) ? dispatchOrders : [])
|
||||
.map(row => Number(row.id))
|
||||
);
|
||||
|
||||
// 符合条件的订单:在 dispatch 中 pick_status='fin',且不在 current 中
|
||||
const eligibleOrderIds = pendingOrderIds.filter(
|
||||
id => dispatchOrderIdSet.has(id) && !currentOrderIdSet.has(id)
|
||||
);
|
||||
|
||||
if (eligibleOrderIds.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// 查询对应的拣货记录(带 storage_id,限制每批处理上限)
|
||||
const pickingRows = await ctx.model.query(`
|
||||
SELECT
|
||||
p.id,
|
||||
p.order_id,
|
||||
p.warehouse_id,
|
||||
p.storage_id,
|
||||
p.quantity
|
||||
FROM wms_picking p
|
||||
WHERE p.status = 'pending'
|
||||
AND p.warehouse_id = :warehouseId
|
||||
AND p.order_id IN (:orderIds)
|
||||
AND p.storage_id IS NOT NULL
|
||||
AND p.storage_id > 0
|
||||
ORDER BY p.id ASC
|
||||
LIMIT :limit
|
||||
`, {
|
||||
replacements: {
|
||||
warehouseId,
|
||||
orderIds: eligibleOrderIds,
|
||||
limit: MAX_BATCH_SIZE,
|
||||
},
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
});
|
||||
|
||||
return Array.isArray(pickingRows) ? pickingRows : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* 查找已取消订单关联的待处理拣货记录。
|
||||
* 在 pendingOrderIds 中筛选 dispatch 表中 status='cancel' 的订单,
|
||||
* 返回对应的 wms_picking 记录(status='pending')。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Object} factory OrderDeliveryFactory 实例。
|
||||
* @param {Array<number>} pendingOrderIds 待处理的订单ID列表。
|
||||
* @return {Promise<Array<Object>>} 已取消订单对应的拣货记录列表。
|
||||
*/
|
||||
async findPendingPickingForCancelledOrders(warehouseId, factory, pendingOrderIds) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
if (!Array.isArray(pendingOrderIds) || pendingOrderIds.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// 查询 dispatch 表中已取消的订单
|
||||
const dispatchModel = await factory.getDispatchModel(warehouseId);
|
||||
const cancelledOrders = await dispatchModel.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: pendingOrderIds },
|
||||
warehouse_id: warehouseId,
|
||||
status: 'cancel',
|
||||
},
|
||||
attributes: [ 'id' ],
|
||||
raw: true,
|
||||
});
|
||||
|
||||
const cancelledOrderIds = (Array.isArray(cancelledOrders) ? cancelledOrders : [])
|
||||
.map(row => Number(row.id));
|
||||
|
||||
if (cancelledOrderIds.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
// 查询对应的拣货记录(带 storage_id,限制每批处理上限)
|
||||
const pickingRows = await ctx.model.query(`
|
||||
SELECT
|
||||
p.id,
|
||||
p.order_id,
|
||||
p.warehouse_id,
|
||||
p.storage_id,
|
||||
p.quantity
|
||||
FROM wms_picking p
|
||||
WHERE p.status = 'pending'
|
||||
AND p.warehouse_id = :warehouseId
|
||||
AND p.order_id IN (:orderIds)
|
||||
AND p.storage_id IS NOT NULL
|
||||
AND p.storage_id > 0
|
||||
ORDER BY p.id ASC
|
||||
LIMIT :limit
|
||||
`, {
|
||||
replacements: {
|
||||
warehouseId,
|
||||
orderIds: cancelledOrderIds,
|
||||
limit: MAX_BATCH_SIZE,
|
||||
},
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
});
|
||||
|
||||
return Array.isArray(pickingRows) ? pickingRows : [];
|
||||
}
|
||||
|
||||
/**
|
||||
* 在事务中释放已取消订单的库存锁定。
|
||||
*
|
||||
* 事务步骤:
|
||||
* 1. 重新查询 wms_picking(status='pending')汇总各 storage_id 的 SUM(quantity)
|
||||
* 2. SELECT wms_storage FOR UPDATE
|
||||
* 3. 校验 locked_quantity >= 解锁数量
|
||||
* 4. UPDATE wms_storage 只解锁 locked_quantity(不扣减 quantity)
|
||||
* 5. UPDATE wms_picking SET status='cancelled_released'
|
||||
*
|
||||
* 注意:本方法不写入 wms_storage_transaction。
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Array<Object>} cancelledPickingRows 已取消订单关联的拣货记录列表。
|
||||
* @return {Promise<number>} 释放成功的拣货记录数。
|
||||
*/
|
||||
async releaseCancelledInTransaction(warehouseId, cancelledPickingRows) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
if (!Array.isArray(cancelledPickingRows) || cancelledPickingRows.length === 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const pickingIds = cancelledPickingRows.map(row => Number(row.id));
|
||||
|
||||
const transaction = await ctx.model.transaction();
|
||||
|
||||
try {
|
||||
// Step 1: 重新查询 wms_picking,确保只处理仍然 status='pending' 的记录
|
||||
const confirmedRows = await ctx.model.query(`
|
||||
SELECT
|
||||
p.id,
|
||||
p.order_id,
|
||||
p.storage_id,
|
||||
p.quantity
|
||||
FROM wms_picking p
|
||||
WHERE p.id IN (:pickingIds)
|
||||
AND p.warehouse_id = :warehouseId
|
||||
AND p.status = 'pending'
|
||||
AND p.storage_id IS NOT NULL
|
||||
AND p.storage_id > 0
|
||||
`, {
|
||||
replacements: { pickingIds, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
});
|
||||
|
||||
const normalizedConfirmedRows = Array.isArray(confirmedRows) ? confirmedRows : [];
|
||||
if (normalizedConfirmedRows.length === 0) {
|
||||
await transaction.rollback();
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 汇总各 storage_id 的 SUM(quantity)
|
||||
const storageQtyMap = new Map();
|
||||
for (const row of normalizedConfirmedRows) {
|
||||
const sid = Number(row.storage_id);
|
||||
const qty = Number(row.quantity) || 0;
|
||||
storageQtyMap.set(sid, (storageQtyMap.get(sid) || 0) + qty);
|
||||
}
|
||||
|
||||
const storageIds = [ ...storageQtyMap.keys() ];
|
||||
|
||||
// Step 2: SELECT wms_storage FOR UPDATE
|
||||
const storageRows = await ctx.model.Storage.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: storageIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'locked_quantity' ],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
// Step 3: 校验 locked_quantity >= 解锁数量
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.id);
|
||||
const deduction = storageQtyMap.get(sid) || 0;
|
||||
const locked = Number(sRow.locked_quantity) || 0;
|
||||
if (locked < deduction) {
|
||||
throw this.createBusinessError(
|
||||
`库存记录 ${sid} 锁定数量不足:当前锁定 ${locked},需解锁 ${deduction}`,
|
||||
400
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Step 4: UPDATE wms_storage 只解锁 locked_quantity(不扣减 quantity)
|
||||
const summaryRows = [];
|
||||
for (const [ sid, totalQty ] of storageQtyMap) {
|
||||
summaryRows.push({ storage_id: sid, total_qty: totalQty });
|
||||
}
|
||||
|
||||
const caseClauses = summaryRows
|
||||
.map(r => `WHEN ${Number(r.storage_id)} THEN ${Number(r.total_qty)}`)
|
||||
.join(' ');
|
||||
|
||||
const explicitStorageIdList = storageIds.map(id => Number(id)).join(', ');
|
||||
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_storage
|
||||
SET locked_quantity = locked_quantity - CASE id ${caseClauses} END,
|
||||
updated_at = NOW()
|
||||
WHERE id IN (${explicitStorageIdList})
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: { warehouseId },
|
||||
transaction,
|
||||
});
|
||||
|
||||
// Step 5: UPDATE wms_picking SET status='cancelled_released'
|
||||
const compensatedPickingIds = normalizedConfirmedRows.map(r => Number(r.id));
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_picking
|
||||
SET status = :status,
|
||||
updated_at = NOW()
|
||||
WHERE id IN (:pickingIds)
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: {
|
||||
status: CANCELLED_RELEASED_STATUS,
|
||||
pickingIds: compensatedPickingIds,
|
||||
warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
return compensatedPickingIds.length;
|
||||
} catch (error) {
|
||||
await transaction.rollback();
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 在事务中执行拣货补偿,与 wavePickTaskComplete 保持一致的逻辑。
|
||||
*
|
||||
* 事务步骤:
|
||||
* 1. 重新查询 wms_picking(status='pending')汇总各 storage_id 的 SUM(quantity)
|
||||
* 2. SELECT wms_storage FOR UPDATE
|
||||
* 3. 校验 locked_quantity >= 扣减数量
|
||||
* 4. UPDATE wms_storage 扣减 locked_quantity 和 quantity(CASE WHEN)
|
||||
* 5. 查询 dispatch 表获取订单的 delivery_order_code 和 source_order_codes,
|
||||
* 为每个拣货记录 INSERT 一条 wms_storage_transaction(OUTBOUND, PICK_COMPENSATION),
|
||||
* 同一 storage 的多条记录共享相同的 before/after 数量
|
||||
* 6. UPDATE wms_picking SET status='fin_compensated'
|
||||
*
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @param {Array<Object>} pickingRows 待补偿的拣货记录列表。
|
||||
* @return {Promise<number>} 补偿成功的拣货记录数。
|
||||
*/
|
||||
async compensateInTransaction(warehouseId, pickingRows) {
|
||||
const { ctx, app } = this;
|
||||
|
||||
if (!Array.isArray(pickingRows) || pickingRows.length === 0) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const pickingIds = pickingRows.map(row => Number(row.id));
|
||||
|
||||
const transaction = await ctx.model.transaction();
|
||||
|
||||
try {
|
||||
// Step 1: 重新查询 wms_picking,确保只处理仍然 status='pending' 的记录
|
||||
const confirmedRows = await ctx.model.query(`
|
||||
SELECT
|
||||
p.id,
|
||||
p.order_id,
|
||||
p.storage_id,
|
||||
p.quantity
|
||||
FROM wms_picking p
|
||||
WHERE p.id IN (:pickingIds)
|
||||
AND p.warehouse_id = :warehouseId
|
||||
AND p.status = 'pending'
|
||||
AND p.storage_id IS NOT NULL
|
||||
AND p.storage_id > 0
|
||||
`, {
|
||||
replacements: { pickingIds, warehouseId },
|
||||
type: ctx.model.QueryTypes.SELECT,
|
||||
transaction,
|
||||
});
|
||||
|
||||
const normalizedConfirmedRows = Array.isArray(confirmedRows) ? confirmedRows : [];
|
||||
if (normalizedConfirmedRows.length === 0) {
|
||||
await transaction.rollback();
|
||||
return 0;
|
||||
}
|
||||
|
||||
// 汇总各 storage_id 的 SUM(quantity)
|
||||
const storageQtyMap = new Map();
|
||||
for (const row of normalizedConfirmedRows) {
|
||||
const sid = Number(row.storage_id);
|
||||
const qty = Number(row.quantity) || 0;
|
||||
storageQtyMap.set(sid, (storageQtyMap.get(sid) || 0) + qty);
|
||||
}
|
||||
|
||||
const storageIds = [ ...storageQtyMap.keys() ];
|
||||
|
||||
// Step 2: SELECT wms_storage FOR UPDATE
|
||||
const storageRows = await ctx.model.Storage.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: storageIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [
|
||||
'id', 'locked_quantity', 'quantity',
|
||||
'store_id', 'stock_id', 'batch_no',
|
||||
'inventory_type', 'space_id',
|
||||
],
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
|
||||
// Step 3: 校验 locked_quantity >= 扣减数量
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.id);
|
||||
const deduction = storageQtyMap.get(sid) || 0;
|
||||
const locked = Number(sRow.locked_quantity) || 0;
|
||||
if (locked < deduction) {
|
||||
throw this.createBusinessError(
|
||||
`库存记录 ${sid} 锁定数量不足:当前锁定 ${locked},需扣减 ${deduction}`,
|
||||
400
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Step 4: UPDATE wms_storage 扣减 locked_quantity 和 quantity(CASE WHEN)
|
||||
const summaryRows = [];
|
||||
for (const [ sid, totalQty ] of storageQtyMap) {
|
||||
summaryRows.push({ storage_id: sid, total_qty: totalQty });
|
||||
}
|
||||
|
||||
const caseClauses = summaryRows
|
||||
.map(r => `WHEN ${Number(r.storage_id)} THEN ${Number(r.total_qty)}`)
|
||||
.join(' ');
|
||||
|
||||
const explicitStorageIdList = storageIds.map(id => Number(id)).join(', ');
|
||||
|
||||
const [ updateResult ] = await ctx.model.query(`
|
||||
UPDATE wms_storage
|
||||
SET locked_quantity = locked_quantity - CASE id ${caseClauses} END,
|
||||
quantity = quantity - CASE id ${caseClauses} END,
|
||||
updated_at = NOW()
|
||||
WHERE id IN (${explicitStorageIdList})
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: { warehouseId },
|
||||
transaction,
|
||||
});
|
||||
|
||||
if (!updateResult || Number(updateResult) === 0) {
|
||||
ctx.logger.warn(
|
||||
`[pick-compensation] wms_storage UPDATE 影响 0 行,storageIds=[${explicitStorageIdList}], warehouseId=${warehouseId}`
|
||||
);
|
||||
} else {
|
||||
ctx.logger.info(
|
||||
`[pick-compensation] wms_storage UPDATE 影响 ${updateResult} 行,storageIds=[${explicitStorageIdList}], warehouseId=${warehouseId}`
|
||||
);
|
||||
}
|
||||
|
||||
// Step 5: INSERT wms_storage_transaction(每个拣货记录对应一条流水)
|
||||
const confirmedOrderIds = [ ...new Set(normalizedConfirmedRows.map(r => Number(r.order_id))) ];
|
||||
|
||||
// 构建 storage_id -> storage row 映射
|
||||
const storageRowMap = new Map();
|
||||
for (const sRow of storageRows) {
|
||||
storageRowMap.set(Number(sRow.id), sRow);
|
||||
}
|
||||
|
||||
// 构建 storage 变更前后的数量映射(同一 storage 多条拣货记录共享相同的 before/after)
|
||||
const beforeQtyMap = new Map();
|
||||
const beforeLockedMap = new Map();
|
||||
for (const sRow of storageRows) {
|
||||
const sid = Number(sRow.id);
|
||||
beforeQtyMap.set(sid, Number(sRow.quantity) || 0);
|
||||
beforeLockedMap.set(sid, Number(sRow.locked_quantity) || 0);
|
||||
}
|
||||
|
||||
// 查询 dispatch 表获取 delivery_order_code 和 source_order_codes
|
||||
const factory = ctx.model && ctx.model.OrderDeliveryFactory;
|
||||
const dispatchModel = factory && typeof factory.getDispatchModel === 'function'
|
||||
? await factory.getDispatchModel(warehouseId)
|
||||
: null;
|
||||
|
||||
const orderInfoMap = new Map();
|
||||
if (dispatchModel && confirmedOrderIds.length > 0) {
|
||||
const dispatchRows = await dispatchModel.findAll({
|
||||
where: {
|
||||
id: { [app.Sequelize.Op.in]: confirmedOrderIds },
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'id', 'delivery_order_code', 'source_order_codes' ],
|
||||
raw: true,
|
||||
transaction,
|
||||
});
|
||||
for (const dRow of dispatchRows) {
|
||||
orderInfoMap.set(Number(dRow.id), {
|
||||
delivery_order_code: dRow.delivery_order_code,
|
||||
source_order_codes: dRow.source_order_codes,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
const transactionRows = [];
|
||||
for (const pickRow of normalizedConfirmedRows) {
|
||||
const orderId = Number(pickRow.order_id);
|
||||
const orderInfo = orderInfoMap.get(orderId);
|
||||
const sid = Number(pickRow.storage_id);
|
||||
const deduction = Number(pickRow.quantity) || 0;
|
||||
const sRow = storageRowMap.get(sid);
|
||||
if (!sRow || deduction <= 0) continue;
|
||||
|
||||
transactionRows.push({
|
||||
transaction_type: 'OUTBOUND',
|
||||
warehouse_id: warehouseId,
|
||||
store_id: Number(sRow.store_id) || 0,
|
||||
stock_id: Number(sRow.stock_id) || 0,
|
||||
storage_id: sid,
|
||||
space_id: Number(sRow.space_id) || null,
|
||||
quantity: deduction,
|
||||
before_quantity: beforeQtyMap.get(sid),
|
||||
after_quantity: Math.max(0, beforeQtyMap.get(sid) - (storageQtyMap.get(sid) || 0)),
|
||||
before_locked_quantity: beforeLockedMap.get(sid),
|
||||
after_locked_quantity: Math.max(0, beforeLockedMap.get(sid) - (storageQtyMap.get(sid) || 0)),
|
||||
batch_no: sRow.batch_no || null,
|
||||
inventory_type: sRow.inventory_type || 'ZP',
|
||||
order_type: COMPENSATION_ORDER_TYPE,
|
||||
order_no: orderInfo?.delivery_order_code || String(orderId),
|
||||
order_id: orderId,
|
||||
source_order_codes: orderInfo?.source_order_codes || String(orderId),
|
||||
operator_id: 'system',
|
||||
operator_name: 'system',
|
||||
remark: '拣货完成补偿出库',
|
||||
created_at: new Date(),
|
||||
});
|
||||
}
|
||||
|
||||
if (transactionRows.length > 0) {
|
||||
await ctx.model.StorageTransaction.bulkCreate(transactionRows, { transaction });
|
||||
}
|
||||
|
||||
// Step 6: UPDATE wms_picking SET status='fin_compensated'
|
||||
const compensatedPickingIds = normalizedConfirmedRows.map(r => Number(r.id));
|
||||
await ctx.model.query(`
|
||||
UPDATE wms_picking
|
||||
SET status = :compensationStatus,
|
||||
updated_at = NOW()
|
||||
WHERE id IN (:pickingIds)
|
||||
AND warehouse_id = :warehouseId
|
||||
`, {
|
||||
replacements: {
|
||||
compensationStatus: COMPENSATION_STATUS,
|
||||
pickingIds: compensatedPickingIds,
|
||||
warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
await transaction.commit();
|
||||
|
||||
return compensatedPickingIds.length;
|
||||
} catch (error) {
|
||||
await transaction.rollback();
|
||||
throw error;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 生成带业务状态码的错误对象。
|
||||
*
|
||||
* @param {string} message 错误文案。
|
||||
* @param {number} [code=400] 错误码。
|
||||
* @return {Error} 错误对象。
|
||||
*/
|
||||
createBusinessError(message, code = 400) {
|
||||
const error = new Error(message);
|
||||
error.code = code;
|
||||
return error;
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = PickCompensationService;
|
||||
@ -1,7 +1,7 @@
|
||||
'use strict';
|
||||
|
||||
const Service = require('egg').Service;
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING' ];
|
||||
const SUPPORTED_BUSINESS_TYPES = [ 'STOCK', 'RECEIPT', 'PICKING', 'OUTBOUND' ];
|
||||
|
||||
class PrintTemplateService extends Service {
|
||||
/**
|
||||
|
||||
@ -117,7 +117,7 @@ const WAREHOUSE_SETTING_FIELDS = Object.freeze([
|
||||
key: 'auto_outbound_rules',
|
||||
name: '自动出库规则',
|
||||
type: 'object',
|
||||
default: Object.freeze({ enabled: false, require_recheck: true, require_pack: true, require_weigh: true, require_sync: true }),
|
||||
default: Object.freeze({ enabled: false, require_recheck: true, require_pack: true, require_weigh: true, require_sync: true, require_print: true, require_pick: true }),
|
||||
required: false,
|
||||
description: '满足条件自动标记出库。全部条件满足时自动标记待出库',
|
||||
item_keys: Object.freeze([
|
||||
@ -126,6 +126,8 @@ const WAREHOUSE_SETTING_FIELDS = Object.freeze([
|
||||
Object.freeze({ key: 'require_pack', name: '需已打包', type: 'flag', required: false, description: '是否要求 pack_status=fin' }),
|
||||
Object.freeze({ key: 'require_weigh', name: '需已称重', type: 'flag', required: false, description: '是否要求 weighing_weight>0' }),
|
||||
Object.freeze({ key: 'require_sync', name: '需已同步', type: 'flag', required: false, description: '是否要求 sync_status=fin' }),
|
||||
Object.freeze({ key: 'require_print', name: '需已打印', type: 'flag', required: false, description: '是否要求 print_status=fin' }),
|
||||
Object.freeze({ key: 'require_pick', name: '需已拣货', type: 'flag', required: false, description: '是否要求 pick_status=fin' }),
|
||||
]),
|
||||
}),
|
||||
Object.freeze({
|
||||
|
||||
@ -962,9 +962,10 @@ class stockStoreService extends Service {
|
||||
* @param {number|null} orderId 订单 ID。
|
||||
* @param {number|null} orderItemId 订单明细 ID。
|
||||
* @param {Object|null} transaction 事务对象。
|
||||
* @param {number} warehouseId 仓库ID。
|
||||
* @return {Promise<Array<Object>>} 拣货分配列表。
|
||||
*/
|
||||
async getPickingRowsForOutbound(orderId, orderItemId, transaction) {
|
||||
async getPickingRowsForOutbound(orderId, orderItemId, transaction, warehouseId) {
|
||||
const { ctx } = this;
|
||||
const pickingModel = ctx.model && ctx.model.Picking;
|
||||
|
||||
@ -980,6 +981,7 @@ class stockStoreService extends Service {
|
||||
where: {
|
||||
order_id: orderId,
|
||||
order_item_id: orderItemId,
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
attributes: [ 'storage_id', 'space_id', 'quantity' ],
|
||||
order: [[ 'id', 'ASC' ]],
|
||||
@ -1214,7 +1216,8 @@ class stockStoreService extends Service {
|
||||
let pickingRows = [];
|
||||
if (outboundMeta.orderId && outboundMeta.orderItemId) {
|
||||
try {
|
||||
pickingRows = await this.getPickingRowsForOutbound(outboundMeta.orderId, outboundMeta.orderItemId, currentTransaction);
|
||||
const pickingWarehouseId = Number(storage.warehouse_id || updatedRecord.warehouse_id || ctx.user.store_id || 0);
|
||||
pickingRows = await this.getPickingRowsForOutbound(outboundMeta.orderId, outboundMeta.orderItemId, currentTransaction, pickingWarehouseId);
|
||||
} catch (error) {
|
||||
app.logger.warn(`[outbound] 读取拣货分配失败,降级为单条出库流水: ${error.message}`);
|
||||
}
|
||||
@ -2679,6 +2682,7 @@ class stockStoreService extends Service {
|
||||
box_width, box_height, box_volume, box_remark, id,
|
||||
box_volume_m3, boxVolumeM3,
|
||||
shelf_life_days, inbound_min_days, outbound_min_days, remaining_threshold_days,
|
||||
barcode,
|
||||
} = data;
|
||||
const normalizedVolume = volume ?? volume_cm3 ?? volumeCm3;
|
||||
const normalizedBoxVolume = box_volume ?? box_volume_m3 ?? boxVolumeM3;
|
||||
@ -2799,6 +2803,39 @@ class stockStoreService extends Service {
|
||||
warehouseId,
|
||||
},
|
||||
});
|
||||
|
||||
// 6.5 处理条码:清理旧条码并写入新条码
|
||||
if (Object.prototype.hasOwnProperty.call(data, 'barcode')) {
|
||||
const barcodesArr = Array.isArray(barcode)
|
||||
? barcode
|
||||
: typeof barcode === 'string'
|
||||
? barcode.split(';')
|
||||
: [];
|
||||
const normalizedBarcodes = barcodesArr
|
||||
.map(item => String(item || '').trim())
|
||||
.filter(item => item !== '');
|
||||
|
||||
// 删除该商品已有的所有条码
|
||||
await ctx.model.StockBarcode.destroy({
|
||||
where: {
|
||||
stock_id: id,
|
||||
warehouse_id: warehouseId,
|
||||
},
|
||||
transaction,
|
||||
});
|
||||
|
||||
// 写入新条码
|
||||
if (normalizedBarcodes.length > 0) {
|
||||
const refData = normalizedBarcodes.map(item => ({
|
||||
stock_id: id,
|
||||
barcode: item,
|
||||
warehouse_id: warehouseId,
|
||||
created_at: new Date(),
|
||||
}));
|
||||
await ctx.model.StockBarcode.bulkCreate(refData, { transaction });
|
||||
}
|
||||
}
|
||||
|
||||
// 7. 提交事务
|
||||
await transaction.commit();
|
||||
|
||||
|
||||
@ -551,7 +551,7 @@ class EntryService extends Service {
|
||||
supplier_code: data.supplier_code || '',
|
||||
supplier_name: data.supplier_name || '',
|
||||
source_type: 'API',
|
||||
order_status: 'CREATED',
|
||||
order_status: 'PENDING',
|
||||
sync_status: 'PENDING',
|
||||
sync_message: '',
|
||||
is_enabled: 1,
|
||||
|
||||
@ -414,15 +414,15 @@ class InventoryService extends Service {
|
||||
contract = contract_data.data;
|
||||
}
|
||||
|
||||
const entryOrderCode = `SCRK${Date.now()}${String(Math.floor(Math.random() * 10000)).padStart(4, '0')}`;
|
||||
const entryOrderCode = `SHRK${Date.now()}${String(Math.floor(Math.random() * 10000)).padStart(4, '0')}`;
|
||||
const entryOrder = await ctx.model.EntryOrder.create({
|
||||
entry_order_code: entryOrderCode,
|
||||
order_type: 'SCRK',
|
||||
order_type: 'SHRK',
|
||||
purchase_order_code: receiving.receiving_number || '',
|
||||
total_order_lines: pendingDetails.length,
|
||||
order_create_time: new Date(),
|
||||
source_type: 'WMS',
|
||||
order_status: 'CREATED',
|
||||
order_status: 'PENDING',
|
||||
sync_status: 'SUCCESS',
|
||||
sync_message: `快捷入库-来自收货单 ${receiving.receiving_number}`,
|
||||
is_enabled: 1,
|
||||
@ -561,7 +561,7 @@ class InventoryService extends Service {
|
||||
quantity: inboundQty,
|
||||
batch_no: batchNo,
|
||||
inventory_type: inventoryType,
|
||||
order_type: 'SCRK',
|
||||
order_type: 'SHRK',
|
||||
order_no: entryOrderCode,
|
||||
order_id: null,
|
||||
receiving_id: receivingId,
|
||||
@ -768,7 +768,7 @@ class InventoryService extends Service {
|
||||
warehouse_id: warehouseId,
|
||||
is_enabled: 1,
|
||||
deleted_at: null,
|
||||
order_status: { [Op.in]: [ 'PENDING', 'CONFIRMED', 'PARTIAL_RECEIVED', 'CREATED' ] },
|
||||
order_status: { [Op.in]: [ 'PENDING', 'CONFIRMED', 'PARTIAL_RECEIVED' ] },
|
||||
},
|
||||
lock: transaction.LOCK.UPDATE,
|
||||
transaction,
|
||||
|
||||
@ -13,6 +13,15 @@ const AUTH_STATUS_LABELS = Object.freeze({
|
||||
5: '已过期',
|
||||
});
|
||||
|
||||
const CHANGE_TYPE_LABEL_MAP = Object.freeze({
|
||||
manual_adjust: '人工调整',
|
||||
order_deduct: '订单扣减',
|
||||
});
|
||||
|
||||
const BUSINESS_TYPE_LABEL_MAP = Object.freeze({
|
||||
order_express: '快递订单',
|
||||
});
|
||||
|
||||
class SettingStoreWarehouseService extends Service {
|
||||
/**
|
||||
* 创建统一错误对象。
|
||||
@ -1858,7 +1867,11 @@ class SettingStoreWarehouseService extends Service {
|
||||
store_id: Number(payload.store_id || 0),
|
||||
warehouse_id: Number(payload.warehouse_id || 0),
|
||||
change_type: payload.change_type ? String(payload.change_type) : '',
|
||||
change_type_label: CHANGE_TYPE_LABEL_MAP[payload.change_type] || payload.change_type || '',
|
||||
business_type: payload.business_type ? String(payload.business_type) : null,
|
||||
business_type_label: payload.business_type
|
||||
? (BUSINESS_TYPE_LABEL_MAP[payload.business_type] || payload.business_type)
|
||||
: '-',
|
||||
business_id: payload.business_id !== undefined && payload.business_id !== null
|
||||
? Number(payload.business_id)
|
||||
: null,
|
||||
|
||||
@ -0,0 +1,22 @@
|
||||
'use strict';
|
||||
|
||||
/**
|
||||
* 为 wms_picking 表新增 warehouse_id 字段及索引。
|
||||
*/
|
||||
module.exports = {
|
||||
up: async queryInterface => {
|
||||
await queryInterface.sequelize.query(`
|
||||
ALTER TABLE wms_picking
|
||||
ADD COLUMN warehouse_id BIGINT(20) UNSIGNED NOT NULL DEFAULT 0 COMMENT '仓库ID' AFTER order_item_id,
|
||||
ADD INDEX idx_wms_picking_warehouse_id (warehouse_id)
|
||||
`);
|
||||
},
|
||||
|
||||
down: async queryInterface => {
|
||||
await queryInterface.sequelize.query(`
|
||||
ALTER TABLE wms_picking
|
||||
DROP INDEX idx_wms_picking_warehouse_id,
|
||||
DROP COLUMN warehouse_id
|
||||
`);
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,14 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
up: async queryInterface => {
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_type ENUM('SCRK','LYRK','CCRK','CGRK','DBRK','QTRK','B2BRK','XNRK','SHRK') NOT NULL COMMENT '业务类型'"
|
||||
);
|
||||
},
|
||||
down: async queryInterface => {
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_type ENUM('SCRK','LYRK','CCRK','CGRK','DBRK','QTRK','B2BRK','XNRK') NOT NULL COMMENT '业务类型'"
|
||||
);
|
||||
},
|
||||
};
|
||||
@ -0,0 +1,28 @@
|
||||
'use strict';
|
||||
|
||||
module.exports = {
|
||||
/**
|
||||
* 将 CREATED 状态合并到 PENDING:
|
||||
* 1. 先把现有 CREATED 行更新为 PENDING
|
||||
* 2. 再 ALTER TABLE 去掉 CREATED 枚举值
|
||||
*/
|
||||
up: async queryInterface => {
|
||||
// 先更新现有 CREATED 行
|
||||
await queryInterface.sequelize.query(
|
||||
"UPDATE wms_entry_order SET order_status = 'PENDING', updated_at = NOW() WHERE order_status = 'CREATED'"
|
||||
);
|
||||
// 再修改 ENUM 列定义,移除 CREATED
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_status ENUM('PENDING','CONFIRMED','PARTIAL_RECEIVED','COMPLETED','CANCELLED','CREATING') NOT NULL DEFAULT 'PENDING' COMMENT '订单状态'"
|
||||
);
|
||||
},
|
||||
|
||||
/**
|
||||
* 回滚:将 CREATED 加回 ENUM(数据不回退,因为无法区分哪些行原本是 CREATED)
|
||||
*/
|
||||
down: async queryInterface => {
|
||||
await queryInterface.sequelize.query(
|
||||
"ALTER TABLE wms_entry_order MODIFY COLUMN order_status ENUM('PENDING','CONFIRMED','PARTIAL_RECEIVED','COMPLETED','CANCELLED','CREATED','CREATING') NOT NULL DEFAULT 'PENDING' COMMENT '订单状态'"
|
||||
);
|
||||
},
|
||||
};
|
||||
10
logo.svg
Normal file
10
logo.svg
Normal file
@ -0,0 +1,10 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="108" height="108" viewBox="0 0 108 108">
|
||||
<defs>
|
||||
<linearGradient id="bg" x1="0" y1="0" x2="108" y2="108">
|
||||
<stop offset="0%" stop-color="#1a73e8"/>
|
||||
<stop offset="100%" stop-color="#0d47a1"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<rect width="108" height="108" rx="20" fill="url(#bg)"/>
|
||||
<text x="54" y="68" text-anchor="middle" fill="#fff" font-size="48" font-weight="bold" font-family="Arial">W</text>
|
||||
</svg>
|
||||
@ -3219,5 +3219,117 @@
|
||||
"字段来源:getOrderExpressesByOrderId 方法中 sys_logistics_code/sys_logistics_name 取自订单表 sys_logistics_code/sys_logistics_name,其余字段取自 OrderExpress 表"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.10-system-02",
|
||||
"date": "2026-06-10",
|
||||
"summary": "dashboard.order_trend 从 mock 数据改为查询真实数据库,按小时统计当日订单数与发货数,补充完整返回结构与错误说明",
|
||||
"methods": [
|
||||
"dashboard.order_trend"
|
||||
],
|
||||
"notes": [
|
||||
"接口实现从 mock 静态数据改为查询真实数据库(wms_order_delivery 与 dispatch 表),数据实时反映仓库当日运营情况。",
|
||||
"订单筛选条件:step in [1,2,3],排除 outbound_status='padding' 和 status='cancel',统计 create_at 在今日 00:00 到当前时刻的订单,按 HOUR(create_at) 分组。",
|
||||
"发货筛选条件:dispatch_lane='m4',统计 delivery_time 在今日 00:00 到当前时刻的发货记录,按 HOUR(delivery_time) 分组。",
|
||||
"时段范围:从 08:00 到当前小时(最晚 23:00),若当前时间早于 08:00 则从 08:00 开始。",
|
||||
"返回新增 summary 汇总对象:total_orders(订单总数)、total_shipments(发货总数)、shipment_rate(发货率百分比)、peak_hour(峰值时段)、peak_orders(峰值订单数)。",
|
||||
"categories/orders/shipments 三个数组一一对应,提供按时段的订单与发货趋势数据,可直接用于前端折线图/柱状图渲染。",
|
||||
"需要登录(Authorization header),从 token 中获取 warehouseId;若缺少仓库上下文则返回 flag='fail'。"
|
||||
],
|
||||
"type": "updated",
|
||||
"module": "dashboard"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.10-system-03",
|
||||
"date": "2026-06-10",
|
||||
"summary": "order.pendingOrder.manualWaybill 新增可选参数 logistics_interface_name 与响应字段 business_key/logistics_interface_name,补充行为说明",
|
||||
"methods": [
|
||||
"order.pendingOrder.manualWaybill"
|
||||
],
|
||||
"notes": [
|
||||
"新增可选参数 logistics_interface_name(string,选填,trim 后为空则传 null)",
|
||||
"响应新增字段 business_key(number):同一订单下从已有最大值 +1 递增,无记录时从 1 开始",
|
||||
"响应新增字段 logistics_interface_name(string/null):写入的物流接口名称",
|
||||
"补充 description 行为说明:完成后自动更新 wms_order_delivery_* 表的 print_status 和 post_status 为 'fin'",
|
||||
"wms_order_express 表写入时 status 固定为 1,warehouse_id 从订单记录取"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.10-system-04",
|
||||
"date": "2026-06-10",
|
||||
"summary": "stock.warehouse.import 新增 barcode(条码)字段支持",
|
||||
"methods": [
|
||||
"stock.warehouse.import"
|
||||
],
|
||||
"notes": [
|
||||
"新增 barcode(条码)字段支持,支持别名:条码、bar_code、barCode、barcodeList、barcode_list、barcode。",
|
||||
"条码字段支持数组格式(如 [\"6901234567890\"])和分号分隔字符串格式(如 \"6901234567890;6901234567891\")。",
|
||||
"新建和更新路径均已支持条码导入,条码写入 wms_stock_barcodes 表。",
|
||||
"仅同步文档,不修改业务代码或实现。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.10-system-05",
|
||||
"date": "2026-06-10",
|
||||
"summary": "stock.warehouse.import 的 barcode 字段分隔符改为逗号,对齐 stock.warehouse.export 导出格式;仅接收字符串格式,不再支持数组",
|
||||
"methods": [
|
||||
"stock.warehouse.import"
|
||||
],
|
||||
"notes": [
|
||||
"barcode 字段分隔符从分号 ; 改为逗号 ,",
|
||||
"barcode 字段仅接收字符串格式,不再支持数组格式",
|
||||
"格式示例:\"6901234567890,6901234567891\",与 stock.warehouse.export 导出格式一致"
|
||||
],
|
||||
"type": "modified"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.13-system-01",
|
||||
"date": "2026-06-13",
|
||||
"summary": "setting.warehouse 的 auto_outbound_rules 新增 require_print 和 require_pick 两个可选条件字段(同步代码实现)",
|
||||
"methods": [
|
||||
"setting.warehouse.getSettings",
|
||||
"setting.warehouse.saveSettings"
|
||||
],
|
||||
"notes": [
|
||||
"在 getSettings 响应和 saveSettings 入参中补充 subject_config.auto_outbound_rules 对象的完整字段文档(enabled、require_recheck、require_pack、require_weigh、require_sync、require_print、require_pick)。",
|
||||
"require_print:是否要求已打印(print_status=fin),默认 true。",
|
||||
"require_pick:是否要求已拣货(pick_status=fin),默认 true。",
|
||||
"该规则由自动出库定时任务 order_auto_outbound 消费,全部开启的条件均满足时自动标记待出库。"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.13-system-02",
|
||||
"date": "2026-06-13",
|
||||
"summary": "order.recheckOrder.scanOrder 团购模式响应新增 orders_detail 字段,暴露非拦截订单的详细列表(含 is_printed、is_reviewed 等状态字段)",
|
||||
"methods": [
|
||||
"order.recheckOrder.scanOrder"
|
||||
],
|
||||
"notes": [
|
||||
"团购模式(list_type='group')波次视图项新增 orders_detail 字段:非拦截订单详细列表,每项含 order_id、delivery_order_code、waybill_no、pick_status、is_printed(print_status === 'fin')、is_reviewed(recheck_status === 'fin')、recheck_status、shop_nick、items_count、wave_index、intercept_status",
|
||||
"orders_detail 与现有 order_ids(纯数字 ID 数组)并存,均在团购模式的波次视图项中返回",
|
||||
"orders_detail 仅在 list_type='group' 时返回,散单模式不受影响",
|
||||
"同步更新 list 字段 description 以反映 group 模式新增的 order_ids、orders_detail、stocks 字段"
|
||||
],
|
||||
"type": "updated"
|
||||
},
|
||||
{
|
||||
"version": "2026.06.13-system-03",
|
||||
"date": "2026-06-13",
|
||||
"summary": "新增批量快捷复核接口 batchQuickRecheck,支持批量订单 IDs 的前置条件检查(储位、快递、同步、拦截),自动完成拣货并标记复核,支持部分失败。拣货完成后同步更新 wms_wave_pick_task 状态",
|
||||
"methods": [
|
||||
"order.recheckOrder.batchQuickRecheck"
|
||||
],
|
||||
"notes": [
|
||||
"新增 order.recheckOrder.batchQuickRecheck 方法",
|
||||
"入参 ids 支持数组或逗号分隔字符串",
|
||||
"响应包含 success/failed 列表及计数,failed 项含 reason 说明"
|
||||
],
|
||||
"details": {
|
||||
"description": "包含拣货任务状态同步:全部拣完→任务状态=2(已完成),未全拣完→任务状态推进为1(拣货中)"
|
||||
},
|
||||
"type": "added"
|
||||
}
|
||||
]
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
{
|
||||
"module": "system",
|
||||
"description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内",
|
||||
"version": "0.3.5",
|
||||
"updatedAt": "2026-06-10",
|
||||
"version": "0.3.6",
|
||||
"updatedAt": "2026-06-13",
|
||||
"headers": [
|
||||
{
|
||||
"name": "platform",
|
||||
@ -294,7 +294,7 @@
|
||||
},
|
||||
{
|
||||
"method": "dashboard.order_trend",
|
||||
"description": "dashboard.order_trend 接口",
|
||||
"description": "订单趋势统计:按小时统计当日订单数与发货数,包含汇总信息(订单总数、发货总数、发货率、峰值时段)。数据来源于真实数据库查询,已废弃旧版 mock 数据。",
|
||||
"isNeedAuth": false,
|
||||
"isNeedLogin": true,
|
||||
"headers": [
|
||||
@ -302,12 +302,106 @@
|
||||
"name": "Authorization",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "Bearer token"
|
||||
"description": "Bearer token,从中解析 warehouseId(仓库上下文)"
|
||||
}
|
||||
],
|
||||
"params": [],
|
||||
"response": [],
|
||||
"errors": []
|
||||
"response": [
|
||||
{
|
||||
"name": "code",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "业务状态码,200 表示成功"
|
||||
},
|
||||
{
|
||||
"name": "message",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "业务提示信息"
|
||||
},
|
||||
{
|
||||
"name": "data",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"description": "成功时返回的趋势数据对象",
|
||||
"children": [
|
||||
{
|
||||
"name": "range",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "统计范围,固定为 'day'"
|
||||
},
|
||||
{
|
||||
"name": "date",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "统计日期,格式 YYYY-MM-DD"
|
||||
},
|
||||
{
|
||||
"name": "summary",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"description": "汇总统计信息",
|
||||
"children": [
|
||||
{
|
||||
"name": "total_orders",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "当日订单总数(step in [1,2,3],排除 outbound_status='padding' 和 status='cancel' 的订单)"
|
||||
},
|
||||
{
|
||||
"name": "total_shipments",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "当日发货总数(dispatch_lane='m4' 的发货记录数)"
|
||||
},
|
||||
{
|
||||
"name": "shipment_rate",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "发货率百分比(total_shipments / total_orders × 100,保留一位小数)"
|
||||
},
|
||||
{
|
||||
"name": "peak_hour",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "订单峰值时段,格式 HH:00"
|
||||
},
|
||||
{
|
||||
"name": "peak_orders",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "峰值时段订单数"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "categories",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "时段列表,从 08:00 到当前小时(最晚 23:00),格式 ['08:00', '09:00', ...]"
|
||||
},
|
||||
{
|
||||
"name": "orders",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "各时段订单数,与 categories 一一对应"
|
||||
},
|
||||
{
|
||||
"name": "shipments",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "各时段发货数,与 categories 一一对应"
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
{
|
||||
"code": "fail",
|
||||
"message": "缺少仓库上下文(token 中未解析到有效的 warehouseId),返回 { flag: 'fail', message: '缺少仓库上下文' }"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -4820,88 +4914,6 @@
|
||||
"message": "task_id 参数不能为空"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"method": "order.pendingOrder.manualWaybill",
|
||||
"description": "手工录入运单号。为指定待处理订单创建一条运单记录(wms_order_express 表),仅允许 step 在 [1,2,3] 且 outbound_status 不为 'padding' 的订单操作。",
|
||||
"isNeedAuth": false,
|
||||
"isNeedLogin": true,
|
||||
"headers": [
|
||||
{
|
||||
"name": "Authorization",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "Bearer token"
|
||||
}
|
||||
],
|
||||
"params": [
|
||||
{
|
||||
"name": "order_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "订单 ID,必须为正整数"
|
||||
},
|
||||
{
|
||||
"name": "waybill_code",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "运单号,非空字符串"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "创建的运单记录 ID"
|
||||
},
|
||||
{
|
||||
"name": "order_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "订单 ID"
|
||||
},
|
||||
{
|
||||
"name": "waybill_code",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "运单号"
|
||||
},
|
||||
{
|
||||
"name": "create_at",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "创建时间"
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
{
|
||||
"code": 400,
|
||||
"message": "order_id 必须为正整数"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "waybill_code(运单号)不能为空"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "订单不存在或不属于当前仓库"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "订单当前步骤不在允许范围,仅允许待处理状态(step 1/2/3)的订单手工录入运单号"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "订单已标记待出库,不允许手工录入运单号"
|
||||
},
|
||||
{
|
||||
"code": 500,
|
||||
"message": "内部错误:OrderExpress 模型未加载或数据库写入失败"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -5026,7 +5038,7 @@
|
||||
"name": "list",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "统一列表输出。散单模式(list_type=single)有波次信息时:扁平订单数组;无波次信息时退回单订单详情模式(每项含 detail、items、expresses、logs)。团购模式(list_type=group):波次视图数组(每项含 wave_id、wave_no、wave_type、wave_status、total_orders、processed_orders、creator、create_time、update_time、order_count、pick_mode、box_no、orders[])",
|
||||
"description": "统一列表输出。散单模式(list_type=single)有波次信息时:扁平订单数组;无波次信息时退回单订单详情模式(每项含 detail、items、expresses、logs)。团购模式(list_type=group):波次视图数组(每项含 wave_id、wave_no、wave_type、wave_status、total_orders、processed_orders、creator、create_time、update_time、order_count、pick_mode、box_no、order_ids、orders_detail、stocks[])",
|
||||
"children": [
|
||||
{
|
||||
"name": "order_id",
|
||||
@ -5245,6 +5257,73 @@
|
||||
"type": "number",
|
||||
"description": "[团购波次项] 箱号(来自 wms_wave_pick_task_wave.box_no)"
|
||||
},
|
||||
{
|
||||
"name": "order_ids",
|
||||
"type": "array<number>",
|
||||
"description": "[团购波次项] 非拦截订单 ID 数组,仅 list_type='group' 时返回"
|
||||
},
|
||||
{
|
||||
"name": "orders_detail",
|
||||
"type": "array",
|
||||
"description": "[团购波次项] 非拦截订单详细列表,每项含 order_id、delivery_order_code、waybill_no、pick_status、is_printed、is_reviewed、recheck_status、shop_nick、items_count、wave_index、intercept_status,仅 list_type='group' 时返回",
|
||||
"children": [
|
||||
{
|
||||
"name": "order_id",
|
||||
"type": "number",
|
||||
"description": "订单ID"
|
||||
},
|
||||
{
|
||||
"name": "delivery_order_code",
|
||||
"type": "string",
|
||||
"description": "发货单号"
|
||||
},
|
||||
{
|
||||
"name": "waybill_no",
|
||||
"type": "string",
|
||||
"description": "运单号"
|
||||
},
|
||||
{
|
||||
"name": "pick_status",
|
||||
"type": "string",
|
||||
"description": "拣货状态"
|
||||
},
|
||||
{
|
||||
"name": "is_printed",
|
||||
"type": "boolean",
|
||||
"description": "是否已打印(print_status === 'fin')"
|
||||
},
|
||||
{
|
||||
"name": "is_reviewed",
|
||||
"type": "boolean",
|
||||
"description": "是否已复核(recheck_status === 'fin')"
|
||||
},
|
||||
{
|
||||
"name": "recheck_status",
|
||||
"type": "string",
|
||||
"description": "复核状态"
|
||||
},
|
||||
{
|
||||
"name": "shop_nick",
|
||||
"type": "string",
|
||||
"description": "店铺昵称"
|
||||
},
|
||||
{
|
||||
"name": "items_count",
|
||||
"type": "number",
|
||||
"description": "商品种类数"
|
||||
},
|
||||
{
|
||||
"name": "wave_index",
|
||||
"type": "number",
|
||||
"description": "波次内序号"
|
||||
},
|
||||
{
|
||||
"name": "intercept_status",
|
||||
"type": "string",
|
||||
"description": "拦截状态(requested / intercepted_at_warehouse / 空字符串)"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "orders",
|
||||
"type": "array",
|
||||
@ -5818,6 +5897,90 @@
|
||||
"message": "未找到对应拣货任务"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"method": "order.recheckOrder.batchQuickRecheck",
|
||||
"description": "批量快捷复核:传入订单 IDs 列表,对每个有效订单执行前置检查(已分配储位、已分配快递、已同步且未被拦截),必要时自动完成拣货(含库存锁定校验与扣减、库存流水写入、拣货任务状态同步)后标记复核(含复核任务记录、任务复核状态更新、车任务解绑、操作日志)。每个订单在独立事务中执行,支持部分失败,不满足条件的订单跳过并返回原因。",
|
||||
"isNeedAuth": false,
|
||||
"isNeedLogin": true,
|
||||
"headers": [
|
||||
{
|
||||
"name": "Authorization",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "Bearer token"
|
||||
}
|
||||
],
|
||||
"params": [
|
||||
{
|
||||
"name": "ids",
|
||||
"type": "array<number>|string",
|
||||
"required": true,
|
||||
"source": "body|query",
|
||||
"description": "订单 ID 列表,支持数组或以逗号分隔的字符串"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "success",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "复核成功的订单列表",
|
||||
"children": [
|
||||
{
|
||||
"name": "order_id",
|
||||
"type": "number",
|
||||
"description": "订单ID"
|
||||
},
|
||||
{
|
||||
"name": "delivery_order_code",
|
||||
"type": "string",
|
||||
"description": "发货单号"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "failed",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "复核失败的订单列表",
|
||||
"children": [
|
||||
{
|
||||
"name": "order_id",
|
||||
"type": "number",
|
||||
"description": "订单ID"
|
||||
},
|
||||
{
|
||||
"name": "delivery_order_code",
|
||||
"type": "string",
|
||||
"description": "发货单号"
|
||||
},
|
||||
{
|
||||
"name": "reason",
|
||||
"type": "string",
|
||||
"description": "失败原因(未分配储位 / 没有分配快递 / 没有同步 / 已拦截 / 未找到对应订单 / 复核失败: xxx)"
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"name": "success_count",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "成功数量"
|
||||
},
|
||||
{
|
||||
"name": "failed_count",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "失败数量"
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
{
|
||||
"code": 400,
|
||||
"message": "订单ID列表不能为空"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -12313,6 +12476,54 @@
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否启用外部快递编码;默认 false(关闭)。开启后允许按外部系统传入的快递编码进行处理(如无匹配仍以业务校验为准)"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules",
|
||||
"type": "object",
|
||||
"required": true,
|
||||
"description": "自动出库规则配置。全部条件满足时自动标记待出库"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.enabled",
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否启用自动出库,默认 false"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_recheck",
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否要求已复核(recheck_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_pack",
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否要求已打包(pack_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_weigh",
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否要求已称重(weighing_weight>0),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_sync",
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否要求已同步(sync_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_print",
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否要求已打印(print_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_pick",
|
||||
"type": "boolean",
|
||||
"required": true,
|
||||
"description": "是否要求已拣货(pick_status=fin),默认 true"
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
@ -12451,6 +12662,62 @@
|
||||
"required": false,
|
||||
"source": "body.subject_config",
|
||||
"description": "是否启用外部快递编码;默认 false(关闭)。开启后允许按外部系统传入的快递编码进行处理(如无匹配仍以业务校验为准)"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules",
|
||||
"type": "object",
|
||||
"required": false,
|
||||
"source": "body.subject_config",
|
||||
"description": "自动出库规则配置。全部条件满足时自动标记待出库"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.enabled",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"source": "body.subject_config.auto_outbound_rules",
|
||||
"description": "是否启用自动出库,默认 false"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_recheck",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"source": "body.subject_config.auto_outbound_rules",
|
||||
"description": "是否要求已复核(recheck_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_pack",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"source": "body.subject_config.auto_outbound_rules",
|
||||
"description": "是否要求已打包(pack_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_weigh",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"source": "body.subject_config.auto_outbound_rules",
|
||||
"description": "是否要求已称重(weighing_weight>0),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_sync",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"source": "body.subject_config.auto_outbound_rules",
|
||||
"description": "是否要求已同步(sync_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_print",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"source": "body.subject_config.auto_outbound_rules",
|
||||
"description": "是否要求已打印(print_status=fin),默认 true"
|
||||
},
|
||||
{
|
||||
"name": "subject_config.auto_outbound_rules.require_pick",
|
||||
"type": "boolean",
|
||||
"required": false,
|
||||
"source": "body.subject_config.auto_outbound_rules",
|
||||
"description": "是否要求已拣货(pick_status=fin),默认 true"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
@ -14677,7 +14944,7 @@
|
||||
},
|
||||
{
|
||||
"method": "stock.warehouse.import",
|
||||
"description": "批量导入或更新仓库商品。请求体优先直接传入商品数据数组 JSON(主方式为数组);也兼容以 rows/items/list/data 包装。每项仅需包含商品相关字段;当 SKU 为空时创建新商品,SKU 非空时为更新操作;更新会写操作日志以便审计。未传 store_id 时默认使用当前上下文仓库/主体(ctx.user.store_id)。",
|
||||
"description": "批量导入或更新仓库商品。请求体优先直接传入商品数据数组 JSON(主方式为数组);也兼容以 rows/items/list/data 包装。每项仅需包含商品相关字段;当 SKU 为空时创建新商品,SKU 非空时为更新操作;更新会写操作日志以便审计。未传 store_id 时默认使用当前上下文仓库/主体(ctx.user.store_id)。支持导入条码(barcode),新建和更新均生效,条码写入 wms_stock_barcodes 表。",
|
||||
"isNeedAuth": true,
|
||||
"isNeedLogin": true,
|
||||
"headers": [
|
||||
@ -14741,6 +15008,12 @@
|
||||
"type": "number",
|
||||
"description": "零售价"
|
||||
},
|
||||
{
|
||||
"name": "条码 / bar_code / barCode / barcodeList / barcode_list / barcode",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "条码列表,逗号分隔字符串,如 \"6901234567890,6901234567891\"。与导出格式一致。新建和更新均支持,条码存储在 wms_stock_barcodes 表。"
|
||||
},
|
||||
{
|
||||
"name": "store_id / storeId",
|
||||
"type": "number",
|
||||
@ -14755,55 +15028,62 @@
|
||||
{
|
||||
"name": "total_count",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "解析到的总条目数"
|
||||
},
|
||||
{
|
||||
"name": "created_count",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "成功创建的新商品数"
|
||||
},
|
||||
{
|
||||
"name": "updated_count",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "成功更新的商品数"
|
||||
},
|
||||
{
|
||||
"name": "fail_count",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "导入失败数"
|
||||
},
|
||||
{
|
||||
"name": "created_ids",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "创建成功的商品 ID 列表"
|
||||
},
|
||||
{
|
||||
"name": "updated_ids",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "更新成功的商品 ID 列表"
|
||||
},
|
||||
{
|
||||
"name": "fail_items",
|
||||
"type": "array",
|
||||
"required": true,
|
||||
"description": "失败项明细数组,每项包含原始输入与错误信息"
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
{
|
||||
"code": "400",
|
||||
"description": "导入数据不能为空"
|
||||
"message": "导入数据不能为空"
|
||||
},
|
||||
{
|
||||
"code": "400",
|
||||
"description": "缺少仓库上下文"
|
||||
"message": "缺少仓库上下文"
|
||||
},
|
||||
{
|
||||
"code": "400",
|
||||
"description": "导入行数据无效"
|
||||
"message": "导入行数据无效"
|
||||
},
|
||||
{
|
||||
"code": "500",
|
||||
"description": "导入失败"
|
||||
"message": "导入失败"
|
||||
}
|
||||
]
|
||||
},
|
||||
@ -21922,7 +22202,7 @@
|
||||
]
|
||||
},
|
||||
{
|
||||
"groupName": "订单模块",
|
||||
"groupName": "订单待处理模块",
|
||||
"module": "order",
|
||||
"list": [
|
||||
{
|
||||
@ -22027,6 +22307,107 @@
|
||||
}
|
||||
],
|
||||
"errors": []
|
||||
},
|
||||
{
|
||||
"method": "order.pendingOrder.manualWaybill",
|
||||
"description": "手工录入运单号。为指定待处理订单创建一条运单记录(wms_order_express 表),仅允许 step 在 [1,2,3] 且 outbound_status 不为 'padding' 的订单操作。完成后自动更新订单表的 print_status 与 post_status 为 'fin',表示外部已打印。",
|
||||
"isNeedAuth": false,
|
||||
"isNeedLogin": true,
|
||||
"headers": [
|
||||
{
|
||||
"name": "Authorization",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "Bearer token"
|
||||
}
|
||||
],
|
||||
"params": [
|
||||
{
|
||||
"name": "order_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "订单 ID,必须为正整数"
|
||||
},
|
||||
{
|
||||
"name": "waybill_code",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"source": "body",
|
||||
"description": "运单号,非空字符串"
|
||||
},
|
||||
{
|
||||
"name": "logistics_interface_name",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"source": "body",
|
||||
"description": "物流接口名称(选填),手工填入的值,trim 后为空则传 null"
|
||||
}
|
||||
],
|
||||
"response": [
|
||||
{
|
||||
"name": "id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "创建的运单记录 ID"
|
||||
},
|
||||
{
|
||||
"name": "order_id",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "订单 ID"
|
||||
},
|
||||
{
|
||||
"name": "waybill_code",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "运单号"
|
||||
},
|
||||
{
|
||||
"name": "business_key",
|
||||
"type": "number",
|
||||
"required": true,
|
||||
"description": "递增的业务键,同一订单下从 1 开始递增"
|
||||
},
|
||||
{
|
||||
"name": "logistics_interface_name",
|
||||
"type": "string",
|
||||
"required": false,
|
||||
"description": "写入的物流接口名称,未传时为 null"
|
||||
},
|
||||
{
|
||||
"name": "create_at",
|
||||
"type": "string",
|
||||
"required": true,
|
||||
"description": "创建时间"
|
||||
}
|
||||
],
|
||||
"errors": [
|
||||
{
|
||||
"code": 400,
|
||||
"message": "order_id 必须为正整数"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "waybill_code(运单号)不能为空"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "订单不存在或不属于当前仓库"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "订单当前步骤不在允许范围,仅允许待处理状态(step 1/2/3)的订单手工录入运单号"
|
||||
},
|
||||
{
|
||||
"code": 400,
|
||||
"message": "订单已标记待出库,不允许手工录入运单号"
|
||||
},
|
||||
{
|
||||
"code": 500,
|
||||
"message": "内部错误:OrderExpress 模型未加载或数据库写入失败"
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
},
|
||||
|
||||
31
scripts/check_tables.js
Normal file
31
scripts/check_tables.js
Normal file
@ -0,0 +1,31 @@
|
||||
'use strict';
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
(async () => {
|
||||
const conn = await mysql.createConnection({host:'127.0.0.1',port:3307,user:'wms',password:'dspxmRwRdRbWtbm7',database:'wms'});
|
||||
|
||||
const [tables] = await conn.query("SHOW TABLES LIKE 'wms_order_delivery%'");
|
||||
console.log('order_delivery tables:');
|
||||
tables.forEach(t => console.log(' ', Object.values(t)[0]));
|
||||
|
||||
const [tables2] = await conn.query("SHOW TABLES LIKE '%recheck%'");
|
||||
console.log('recheck tables:');
|
||||
tables2.forEach(t => console.log(' ', Object.values(t)[0]));
|
||||
|
||||
const [tables3] = await conn.query("SHOW TABLES LIKE '%wave%'");
|
||||
console.log('wave tables:');
|
||||
tables3.forEach(t => console.log(' ', Object.values(t)[0]));
|
||||
|
||||
// Check the current model table for warehouse 100000
|
||||
console.log('\nChecking wms_order_delivery for recheck_status:');
|
||||
try {
|
||||
const [rows] = await conn.query("SELECT * FROM wms_order_delivery WHERE warehouse_id = 100000 LIMIT 1");
|
||||
if (rows.length > 0) {
|
||||
console.log('Keys:', Object.keys(rows[0]).join(', '));
|
||||
}
|
||||
} catch(e) {
|
||||
console.log('Error:', e.message);
|
||||
}
|
||||
|
||||
await conn.end();
|
||||
})().catch(e => console.error(e.message));
|
||||
50
scripts/query_more_test_orders.js
Normal file
50
scripts/query_more_test_orders.js
Normal file
@ -0,0 +1,50 @@
|
||||
'use strict';
|
||||
const mysql = require('mysql2/promise');
|
||||
const DB_CONFIG = {host:'127.0.0.1',port:3307,user:'wms',password:'dspxmRwRdRbWtbm7',database:'wms'};
|
||||
const TABLE = 'wms_order_delivery_100000';
|
||||
|
||||
(async () => {
|
||||
const conn = await mysql.createConnection(DB_CONFIG);
|
||||
try {
|
||||
// More success candidates: pick_status = 'fin' AND recheck_status != 'fin'
|
||||
console.log('=== 已拣货未复核 ===');
|
||||
const [r1] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pick_status, recheck_status, wave_id
|
||||
FROM ${TABLE}
|
||||
WHERE storage_status='fin' AND post_status='fin' AND status='created'
|
||||
AND intercept_status NOT IN ('intercepted','intercepted_at_warehouse')
|
||||
AND pick_status='fin' AND recheck_status!='fin'
|
||||
ORDER BY id DESC LIMIT 5`
|
||||
);
|
||||
r1.forEach(r => console.log(` ID:${r.id} pick="${r.pick_status}" recheck="${r.recheck_status}" wave_id:${r.wave_id}`));
|
||||
console.log(` 共 ${r1.length} 条\n`);
|
||||
|
||||
// Also check: pick_status='none' (未拣货未复核)
|
||||
console.log('=== 未拣货未复核 (pick_status=none) ===');
|
||||
const [r2] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pick_status, recheck_status
|
||||
FROM ${TABLE}
|
||||
WHERE storage_status='fin' AND post_status='fin' AND status='created'
|
||||
AND intercept_status NOT IN ('intercepted','intercepted_at_warehouse')
|
||||
AND pick_status='none' AND recheck_status!='fin'
|
||||
ORDER BY id DESC LIMIT 5`
|
||||
);
|
||||
r2.forEach(r => console.log(` ID:${r.id} pick="${r.pick_status}" recheck="${r.recheck_status}"`));
|
||||
console.log(` 共 ${r2.length} 条\n`);
|
||||
|
||||
// Other pick statuses
|
||||
console.log('=== 其他拣货状态未复核 ===');
|
||||
const [r3] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pick_status, recheck_status
|
||||
FROM ${TABLE}
|
||||
WHERE storage_status='fin' AND post_status='fin' AND status='created'
|
||||
AND intercept_status NOT IN ('intercepted','intercepted_at_warehouse')
|
||||
AND pick_status NOT IN ('fin','none') AND recheck_status!='fin'
|
||||
ORDER BY id DESC LIMIT 5`
|
||||
);
|
||||
r3.forEach(r => console.log(` ID:${r.id} pick="${r.pick_status}" recheck="${r.recheck_status}"`));
|
||||
console.log(` 共 ${r3.length} 条\n`);
|
||||
|
||||
await conn.end();
|
||||
} catch(e) { console.error(e.message); await conn.end(); }
|
||||
})();
|
||||
168
scripts/query_test_orders.js
Normal file
168
scripts/query_test_orders.js
Normal file
@ -0,0 +1,168 @@
|
||||
'use strict';
|
||||
|
||||
// 查询 wms_order_delivery 表的测试数据
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
const DB_CONFIG = {
|
||||
host: '127.0.0.1',
|
||||
port: 3307,
|
||||
user: 'wms',
|
||||
password: 'dspxmRwRdRbWtbm7',
|
||||
database: 'wms',
|
||||
};
|
||||
|
||||
const WAREHOUSE_ID = 100000;
|
||||
|
||||
async function queryTestOrders() {
|
||||
const conn = await mysql.createConnection(DB_CONFIG);
|
||||
|
||||
try {
|
||||
console.log('='.repeat(80));
|
||||
console.log('【成功用例候选】满足所有前置条件的订单(未复核):');
|
||||
console.log('-'.repeat(80));
|
||||
|
||||
const [successRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
storage_status, post_status, status, intercept_status,
|
||||
pick_status, recheck_status, wave_id, wave_no
|
||||
FROM wms_order_delivery
|
||||
WHERE warehouse_id = ?
|
||||
AND storage_status = 'fin'
|
||||
AND post_status = 'fin'
|
||||
AND status = 'created'
|
||||
AND intercept_status NOT IN ('intercepted', 'intercepted_at_warehouse')
|
||||
AND recheck_status != 'fin'
|
||||
ORDER BY pick_status ASC, id DESC
|
||||
LIMIT 10`,
|
||||
[WAREHOUSE_ID]
|
||||
);
|
||||
|
||||
for (const row of successRows) {
|
||||
console.log(` ID: ${row.id}`);
|
||||
console.log(` delivery_order_code: ${row.delivery_order_code || row.pre_delivery_order_code}`);
|
||||
console.log(` storage_status: ${row.storage_status}, post_status: ${row.post_status}, status: ${row.status}`);
|
||||
console.log(` intercept_status: ${row.intercept_status}, pick_status: ${row.pick_status}, recheck_status: ${row.recheck_status}`);
|
||||
console.log(` wave_id: ${row.wave_id}, wave_no: ${row.wave_no}`);
|
||||
console.log();
|
||||
}
|
||||
console.log(` 共 ${successRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - storage_status != fin】未分配储位:');
|
||||
console.log('-'.repeat(80));
|
||||
|
||||
const [noStorageRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
storage_status, post_status, status, intercept_status,
|
||||
pick_status, recheck_status
|
||||
FROM wms_order_delivery
|
||||
WHERE warehouse_id = ?
|
||||
AND storage_status != 'fin'
|
||||
AND (post_status = 'fin' OR 1=1)
|
||||
ORDER BY id DESC
|
||||
LIMIT 3`,
|
||||
[WAREHOUSE_ID]
|
||||
);
|
||||
|
||||
for (const row of noStorageRows) {
|
||||
console.log(` ID: ${row.id} storage_status="${row.storage_status}" delivery_order_code="${row.delivery_order_code || row.pre_delivery_order_code}"`);
|
||||
}
|
||||
console.log(` 共 ${noStorageRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - post_status != fin】未分配快递:');
|
||||
console.log('-'.repeat(80));
|
||||
|
||||
const [noPostRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
storage_status, post_status, status, intercept_status,
|
||||
pick_status, recheck_status
|
||||
FROM wms_order_delivery
|
||||
WHERE warehouse_id = ?
|
||||
AND post_status != 'fin'
|
||||
AND storage_status = 'fin'
|
||||
ORDER BY id DESC
|
||||
LIMIT 3`,
|
||||
[WAREHOUSE_ID]
|
||||
);
|
||||
|
||||
for (const row of noPostRows) {
|
||||
console.log(` ID: ${row.id} post_status="${row.post_status}" delivery_order_code="${row.delivery_order_code || row.pre_delivery_order_code}"`);
|
||||
}
|
||||
console.log(` 共 ${noPostRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - status != created】未同步:');
|
||||
console.log('-'.repeat(80));
|
||||
|
||||
const [noSyncRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
storage_status, post_status, status, intercept_status,
|
||||
pick_status, recheck_status
|
||||
FROM wms_order_delivery
|
||||
WHERE warehouse_id = ?
|
||||
AND status != 'created'
|
||||
AND storage_status = 'fin'
|
||||
AND post_status = 'fin'
|
||||
ORDER BY id DESC
|
||||
LIMIT 3`,
|
||||
[WAREHOUSE_ID]
|
||||
);
|
||||
|
||||
for (const row of noSyncRows) {
|
||||
console.log(` ID: ${row.id} status="${row.status}" delivery_order_code="${row.delivery_order_code || row.pre_delivery_order_code}"`);
|
||||
}
|
||||
console.log(` 共 ${noSyncRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - 已拦截】:');
|
||||
console.log('-'.repeat(80));
|
||||
|
||||
const [interceptedRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
storage_status, post_status, status, intercept_status,
|
||||
pick_status, recheck_status
|
||||
FROM wms_order_delivery
|
||||
WHERE warehouse_id = ?
|
||||
AND intercept_status IN ('intercepted', 'intercepted_at_warehouse')
|
||||
ORDER BY id DESC
|
||||
LIMIT 3`,
|
||||
[WAREHOUSE_ID]
|
||||
);
|
||||
|
||||
for (const row of interceptedRows) {
|
||||
console.log(` ID: ${row.id} intercept_status="${row.intercept_status}" delivery_order_code="${row.delivery_order_code || row.pre_delivery_order_code}"`);
|
||||
}
|
||||
console.log(` 共 ${interceptedRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
// 输出 JSON 汇总用于脚本
|
||||
console.log('='.repeat(80));
|
||||
console.log('=== JSON_SUMMARY ===');
|
||||
console.log(JSON.stringify({
|
||||
success: successRows.map(r => ({
|
||||
id: r.id,
|
||||
code: r.delivery_order_code || r.pre_delivery_order_code,
|
||||
pick_status: r.pick_status,
|
||||
recheck_status: r.recheck_status,
|
||||
pick_is_fin: r.pick_status === 'fin',
|
||||
})),
|
||||
noStorage: noStorageRows.map(r => ({ id: r.id, storage_status: r.storage_status })),
|
||||
noPost: noPostRows.map(r => ({ id: r.id, post_status: r.post_status })),
|
||||
noSync: noSyncRows.map(r => ({ id: r.id, status: r.status })),
|
||||
intercepted: interceptedRows.map(r => ({ id: r.id, intercept_status: r.intercept_status })),
|
||||
}, null, 2));
|
||||
|
||||
} finally {
|
||||
await conn.end();
|
||||
}
|
||||
}
|
||||
|
||||
queryTestOrders().catch(err => {
|
||||
console.error('查询失败:', err.message);
|
||||
process.exit(1);
|
||||
});
|
||||
98
scripts/query_test_orders_v2.js
Normal file
98
scripts/query_test_orders_v2.js
Normal file
@ -0,0 +1,98 @@
|
||||
'use strict';
|
||||
const mysql = require('mysql2/promise');
|
||||
|
||||
const DB_CONFIG = {
|
||||
host: '127.0.0.1', port: 3307,
|
||||
user: 'wms', password: 'dspxmRwRdRbWtbm7', database: 'wms',
|
||||
};
|
||||
const TABLE = 'wms_order_delivery_100000';
|
||||
|
||||
async function main() {
|
||||
const conn = await mysql.createConnection(DB_CONFIG);
|
||||
|
||||
try {
|
||||
console.log('='.repeat(80));
|
||||
console.log('【成功用例候选】满足所有前置条件的订单(未复核):');
|
||||
console.log('-'.repeat(80));
|
||||
|
||||
const [successRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
storage_status, post_status, status, intercept_status,
|
||||
pick_status, recheck_status, wave_id, wave_no
|
||||
FROM ${TABLE}
|
||||
WHERE storage_status = 'fin'
|
||||
AND post_status = 'fin'
|
||||
AND status = 'created'
|
||||
AND intercept_status NOT IN ('intercepted', 'intercepted_at_warehouse')
|
||||
AND recheck_status != 'fin'
|
||||
ORDER BY pick_status ASC, id DESC
|
||||
LIMIT 10`
|
||||
);
|
||||
|
||||
for (const row of successRows) {
|
||||
console.log(` ID: ${row.id} pick="${row.pick_status}" recheck="${row.recheck_status}"`);
|
||||
console.log(` code: ${row.delivery_order_code || row.pre_delivery_order_code || ''}`);
|
||||
console.log(` wave_id: ${row.wave_id}, wave_no: ${row.wave_no}`);
|
||||
}
|
||||
console.log(` 共 ${successRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - storage_status != fin】');
|
||||
const [noStorageRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, storage_status FROM ${TABLE} WHERE storage_status != 'fin' ORDER BY id DESC LIMIT 3`
|
||||
);
|
||||
noStorageRows.forEach(r => console.log(` ID: ${r.id} storage_status="${r.storage_status}"`));
|
||||
console.log(` 共 ${noStorageRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - post_status != fin】');
|
||||
const [noPostRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, post_status FROM ${TABLE} WHERE post_status != 'fin' AND storage_status = 'fin' ORDER BY id DESC LIMIT 3`
|
||||
);
|
||||
noPostRows.forEach(r => console.log(` ID: ${r.id} post_status="${r.post_status}"`));
|
||||
console.log(` 共 ${noPostRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - status != created】');
|
||||
const [noSyncRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, status FROM ${TABLE} WHERE status != 'created' AND storage_status = 'fin' AND post_status = 'fin' ORDER BY id DESC LIMIT 3`
|
||||
);
|
||||
noSyncRows.forEach(r => console.log(` ID: ${r.id} status="${r.status}"`));
|
||||
console.log(` 共 ${noSyncRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('='.repeat(80));
|
||||
console.log('【失败用例候选 - 已拦截】');
|
||||
const [interceptedRows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, intercept_status FROM ${TABLE} WHERE intercept_status IN ('intercepted','intercepted_at_warehouse') ORDER BY id DESC LIMIT 3`
|
||||
);
|
||||
interceptedRows.forEach(r => console.log(` ID: ${r.id} intercept_status="${r.intercept_status}"`));
|
||||
console.log(` 共 ${interceptedRows.length} 条`);
|
||||
console.log();
|
||||
|
||||
console.log('===JSON_SUMMARY===');
|
||||
console.log(JSON.stringify({
|
||||
success: successRows.map(r => ({
|
||||
id: r.id,
|
||||
code: r.delivery_order_code || r.pre_delivery_order_code || '',
|
||||
pick_status: r.pick_status,
|
||||
pick_is_fin: r.pick_status === 'fin',
|
||||
recheck_status: r.recheck_status,
|
||||
wave_id: r.wave_id,
|
||||
wave_no: r.wave_no,
|
||||
})),
|
||||
noStorage: noStorageRows.map(r => ({ id: r.id, storage_status: r.storage_status })),
|
||||
noPost: noPostRows.map(r => ({ id: r.id, post_status: r.post_status })),
|
||||
noSync: noSyncRows.map(r => ({ id: r.id, status: r.status })),
|
||||
intercepted: interceptedRows.map(r => ({ id: r.id, intercept_status: r.intercept_status })),
|
||||
}, null, 2));
|
||||
|
||||
} finally {
|
||||
await conn.end();
|
||||
}
|
||||
}
|
||||
|
||||
main().catch(e => { console.error('Query failed:', e.message); process.exit(1); });
|
||||
169
scripts/test_batch_quick_recheck.js
Normal file
169
scripts/test_batch_quick_recheck.js
Normal file
@ -0,0 +1,169 @@
|
||||
'use strict';
|
||||
// batchQuickRecheck 接口真实流程测试脚本
|
||||
const TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJsaXVmdW1pbmdyZW4iLCJyZWFsX25hbWUiOiLliJjku5jmmI7ku4EiLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjo0LCJjdXJyZW50X3N0b3JlX2lkIjoxMDAwMDAsImlhdCI6MTc4MTM2MDk3MiwiZXhwIjoxNzgxMzc1MzcyfQ.u0svJXHuk8RdlM8ObhDMlRj07gWQzS8Y_41dPcBDtc0';
|
||||
const BASE_URL = 'http://127.0.0.1:6060';
|
||||
const TABLE = 'wms_order_delivery_100000';
|
||||
const mysql = require('mysql2/promise');
|
||||
const DB_CONFIG = {host:'127.0.0.1',port:3307,user:'wms',password:'dspxmRwRdRbWtbm7',database:'wms'};
|
||||
|
||||
async function getOrderSnapshot(conn, ids) {
|
||||
if (!ids.length) return {};
|
||||
const [rows] = await conn.query(
|
||||
`SELECT id, pick_status, recheck_status, storage_status, post_status, status, intercept_status
|
||||
FROM ${TABLE} WHERE id IN (?)`, [ids]
|
||||
);
|
||||
const map = {};
|
||||
rows.forEach(r => { map[r.id] = r; });
|
||||
return map;
|
||||
}
|
||||
|
||||
async function callApi(ids) {
|
||||
const ts = Math.floor(Date.now() / 1000);
|
||||
const url = `${BASE_URL}/system?method=order.recheckOrder.batchQuickRecheck&v=1.0×tamp=${ts}`;
|
||||
const headers = {
|
||||
'platform': 'web',
|
||||
'project': 'wms',
|
||||
'Content-Type': 'application/json; charset=utf-8',
|
||||
'Authorization': `Bearer ${TOKEN}`,
|
||||
};
|
||||
const body = JSON.stringify({
|
||||
module: 'order.recheckOrder',
|
||||
method: 'batchQuickRecheck',
|
||||
params: { ids },
|
||||
});
|
||||
|
||||
const response = await fetch(url, { method: 'POST', headers, body });
|
||||
const text = await response.text();
|
||||
let json;
|
||||
try { json = JSON.parse(text); } catch { json = { raw: text }; }
|
||||
return { status: response.status, body: json };
|
||||
}
|
||||
|
||||
async function runTestCase(name, ids, expectedDesc) {
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log(`【${name}】`);
|
||||
console.log(` 输入IDs: [${ids.join(', ')}]`);
|
||||
console.log(` 预期: ${expectedDesc}`);
|
||||
|
||||
const conn = await mysql.createConnection(DB_CONFIG);
|
||||
let beforeSnapshot = {};
|
||||
let afterSnapshot = {};
|
||||
|
||||
try {
|
||||
// 测试前快照
|
||||
beforeSnapshot = await getOrderSnapshot(conn, ids);
|
||||
console.log(' 测试前状态:');
|
||||
for (const [id, snap] of Object.entries(beforeSnapshot)) {
|
||||
console.log(` ID ${id}: pick="${snap.pick_status}" recheck="${snap.recheck_status}" storage="${snap.storage_status}" post="${snap.post_status}" status="${snap.status}" intercept="${snap.intercept_status}"`);
|
||||
}
|
||||
|
||||
// 调用 API
|
||||
const result = await callApi(ids);
|
||||
console.log(` HTTP Status: ${result.status}`);
|
||||
console.log(` 返回结果: ${JSON.stringify(result.body, null, 2)}`);
|
||||
|
||||
// 结果校验
|
||||
const data = result.body && result.body.data;
|
||||
const passed = result.status === 200 && data;
|
||||
|
||||
// 测试后快照
|
||||
afterSnapshot = await getOrderSnapshot(conn, ids);
|
||||
console.log(' 测试后状态:');
|
||||
for (const [id, snap] of Object.entries(afterSnapshot)) {
|
||||
const before = beforeSnapshot[id] || {};
|
||||
const changes = [];
|
||||
if (snap.pick_status !== before.pick_status) changes.push(`pick: ${before.pick_status}→${snap.pick_status}`);
|
||||
if (snap.recheck_status !== before.recheck_status) changes.push(`recheck: ${before.recheck_status}→${snap.recheck_status}`);
|
||||
const changeStr = changes.length ? ` [变更: ${changes.join(', ')}]` : ' [无变更]';
|
||||
console.log(` ID ${id}: pick="${snap.pick_status}" recheck="${snap.recheck_status}"${changeStr}`);
|
||||
}
|
||||
|
||||
return { name, passed, result: data, beforeSnapshot, afterSnapshot, ids };
|
||||
} catch (e) {
|
||||
console.log(` 异常: ${e.message}`);
|
||||
return { name, passed: false, error: e.message, ids };
|
||||
} finally {
|
||||
await conn.end();
|
||||
}
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log('batchQuickRecheck 接口真实流程测试');
|
||||
console.log(`测试时间: ${new Date().toISOString()}`);
|
||||
console.log(`目标表: ${TABLE}`);
|
||||
console.log(`Base URL: ${BASE_URL}`);
|
||||
|
||||
const results = [];
|
||||
|
||||
// 用例1: 全成功-含未拣货(1个有效订单)
|
||||
results.push(await runTestCase(
|
||||
'用例1: 全成功-含未拣货',
|
||||
[120946],
|
||||
'pick_status=none → 自动完成拣货+复核, 全部 success'
|
||||
));
|
||||
|
||||
// 用例2: 全失败-无储位
|
||||
results.push(await runTestCase(
|
||||
'用例2: 全失败-无储位',
|
||||
[120947, 120939],
|
||||
'全部 failed, reason="未分配储位"'
|
||||
));
|
||||
|
||||
// 用例3: 全失败-无快递
|
||||
results.push(await runTestCase(
|
||||
'用例3: 全失败-无快递',
|
||||
[120944, 120943],
|
||||
'全部 failed, reason="没有分配快递"'
|
||||
));
|
||||
|
||||
// 用例4: 全失败-未同步
|
||||
results.push(await runTestCase(
|
||||
'用例4: 全失败-未同步',
|
||||
[120858, 120857],
|
||||
'全部 failed, reason="没有同步"'
|
||||
));
|
||||
|
||||
// 用例5: 全失败-已拦截
|
||||
results.push(await runTestCase(
|
||||
'用例5: 全失败-已拦截',
|
||||
[120945],
|
||||
'全部 failed, reason="已拦截"'
|
||||
));
|
||||
|
||||
// 用例6: 部分失败-混合
|
||||
results.push(await runTestCase(
|
||||
'用例6: 部分失败-混合',
|
||||
[120946, 120947, 999999999],
|
||||
'success 和 failed 各有'
|
||||
));
|
||||
|
||||
// 用例7: 空列表
|
||||
results.push(await runTestCase(
|
||||
'用例7: 空列表',
|
||||
[],
|
||||
'400 错误 "订单ID列表不能为空"'
|
||||
));
|
||||
|
||||
// 用例8: 不存在ID
|
||||
results.push(await runTestCase(
|
||||
'用例8: 不存在ID',
|
||||
[999999999],
|
||||
'全部 failed, reason="未找到对应订单"'
|
||||
));
|
||||
|
||||
// 汇总
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log('测试汇总');
|
||||
console.log('='.repeat(60));
|
||||
const passCount = results.filter(r => r.passed).length;
|
||||
const failCount = results.filter(r => !r.passed).length;
|
||||
console.log(`总用例数: ${results.length}`);
|
||||
console.log(`通过: ${passCount}`);
|
||||
console.log(`失败: ${failCount}`);
|
||||
|
||||
for (const r of results) {
|
||||
console.log(` [${r.passed ? 'PASS' : 'FAIL'}] ${r.name}`);
|
||||
}
|
||||
}
|
||||
|
||||
main().catch(e => { console.error('测试脚本异常:', e.message); process.exit(1); });
|
||||
420
scripts/test_batch_quick_recheck_full.js
Normal file
420
scripts/test_batch_quick_recheck_full.js
Normal file
@ -0,0 +1,420 @@
|
||||
'use strict';
|
||||
/**
|
||||
* batchQuickRecheck 接口完整真实流程测试
|
||||
* 测试时间: 2026-06-13
|
||||
* 测试仓库: 100000
|
||||
* 测试货主: 1000000
|
||||
* 目标: 验证 batchQuickRecheck 接口的 7 个测试用例
|
||||
*/
|
||||
|
||||
const mysql = require('mysql2/promise');
|
||||
const DB = { host: '127.0.0.1', port: 3307, user: 'wms', password: 'dspxmRwRdRbWtbm7', database: 'wms' };
|
||||
const BASE_URL = 'http://127.0.0.1:6060';
|
||||
const TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJsaXVmdW1pbmdyZW4iLCJyZWFsX25hbWUiOiLliJjku5jmmI7ku4EiLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjo0LCJjdXJyZW50X3N0b3JlX2lkIjoxMDAwMDAsImlhdCI6MTc4MTM2MDk3MiwiZXhwIjoxNzgxMzc1MzcyfQ.u0svJXHuk8RdlM8ObhDMlRj07gWQzS8Y_41dPcBDtc0';
|
||||
const TABLE = 'wms_order_delivery_100000';
|
||||
|
||||
// ========== 工具函数 ==========
|
||||
|
||||
let conn = null;
|
||||
|
||||
async function getConn() {
|
||||
if (!conn) conn = await mysql.createConnection(DB);
|
||||
return conn;
|
||||
}
|
||||
|
||||
async function closeConn() {
|
||||
if (conn) { await conn.end(); conn = null; }
|
||||
}
|
||||
|
||||
async function getOrderSnapshot(ids) {
|
||||
const c = await getConn();
|
||||
if (!ids.length) return {};
|
||||
const [rows] = await c.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
pick_status, recheck_status, storage_status, post_status, status, intercept_status
|
||||
FROM ${TABLE} WHERE id IN (?)`, [ids]
|
||||
);
|
||||
const map = {};
|
||||
rows.forEach(r => { map[r.id] = r; });
|
||||
return map;
|
||||
}
|
||||
|
||||
async function getStorageSnapshot(ids) {
|
||||
const c = await getConn();
|
||||
if (!ids.length) return {};
|
||||
const [rows] = await c.query(
|
||||
'SELECT id, quantity, locked_quantity FROM wms_storage WHERE id IN (?) AND warehouse_id = 100000', [ids]
|
||||
);
|
||||
const map = {};
|
||||
rows.forEach(r => { map[r.id] = r; });
|
||||
return map;
|
||||
}
|
||||
|
||||
async function callApi(ids) {
|
||||
const ts = Math.floor(Date.now() / 1000);
|
||||
const url = `${BASE_URL}/system?method=order.recheckOrder.batchQuickRecheck&v=1.0×tamp=${ts}`;
|
||||
const headers = {
|
||||
'platform': 'web',
|
||||
'project': 'wms',
|
||||
'Content-Type': 'application/json; charset=utf-8',
|
||||
'Authorization': `Bearer ${TOKEN}`,
|
||||
};
|
||||
const body = JSON.stringify({ ids });
|
||||
|
||||
const response = await fetch(url, { method: 'POST', headers, body });
|
||||
const text = await response.text();
|
||||
let json;
|
||||
try { json = JSON.parse(text); } catch { json = { raw: text }; }
|
||||
return { status: response.status, body: json };
|
||||
}
|
||||
|
||||
// ========== 测试用例 ==========
|
||||
|
||||
async function runTestCase(name, ids, expectedDesc, preSetup, postVerify, postCleanup) {
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log(`【${name}】`);
|
||||
console.log(` 输入IDs: [${ids.join(', ')}]`);
|
||||
console.log(` 预期: ${expectedDesc}`);
|
||||
|
||||
let beforeOrder = {}, beforeStorage = {}, afterOrder = {}, afterStorage = {};
|
||||
let passed = false;
|
||||
let failReason = '';
|
||||
|
||||
try {
|
||||
// 前置准备
|
||||
if (preSetup) {
|
||||
console.log(' [前置准备] 执行中...');
|
||||
await preSetup();
|
||||
console.log(' [前置准备] 完成');
|
||||
}
|
||||
|
||||
// 测试前快照
|
||||
beforeOrder = await getOrderSnapshot(ids);
|
||||
console.log(' 测试前订单状态:');
|
||||
for (const [id, snap] of Object.entries(beforeOrder)) {
|
||||
console.log(` ID ${id}: storage="${snap.storage_status}" post="${snap.post_status}" status="${snap.status}" intercept="${snap.intercept_status}" pick="${snap.pick_status}" recheck="${snap.recheck_status}" code="${snap.delivery_order_code || snap.pre_delivery_order_code || ''}"`);
|
||||
}
|
||||
|
||||
// 调用 API
|
||||
const result = await callApi(ids);
|
||||
console.log(` HTTP Status: ${result.status}`);
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
console.log(` 返回结果: ${JSON.stringify(data, null, 2)}`);
|
||||
|
||||
// 测试后快照
|
||||
afterOrder = await getOrderSnapshot(ids);
|
||||
console.log(' 测试后订单状态:');
|
||||
for (const [id, snap] of Object.entries(afterOrder)) {
|
||||
const before = beforeOrder[id] || {};
|
||||
const changes = [];
|
||||
if (snap.pick_status !== before.pick_status) changes.push(`pick: ${before.pick_status}→${snap.pick_status}`);
|
||||
if (snap.recheck_status !== before.recheck_status) changes.push(`recheck: ${before.recheck_status}→${snap.recheck_status}`);
|
||||
if (snap.storage_status !== before.storage_status) changes.push(`storage: ${before.storage_status}→${snap.storage_status}`);
|
||||
const changeStr = changes.length ? ` [变更: ${changes.join(', ')}]` : ' [无变更]';
|
||||
console.log(` ID ${id}: pick="${snap.pick_status}" recheck="${snap.recheck_status}" storage="${snap.storage_status}"${changeStr}`);
|
||||
}
|
||||
|
||||
// 自定义验证
|
||||
if (postVerify) {
|
||||
const verifyResult = await postVerify(result, beforeOrder, afterOrder);
|
||||
if (verifyResult === true) {
|
||||
passed = true;
|
||||
} else {
|
||||
passed = false;
|
||||
failReason = typeof verifyResult === 'string' ? verifyResult : '自定义验证失败';
|
||||
}
|
||||
} else {
|
||||
// 默认验证:HTTP 200
|
||||
passed = result.status === 200;
|
||||
if (!passed) failReason = `HTTP ${result.status}`;
|
||||
}
|
||||
|
||||
return { name, passed, failReason, result: data, beforeOrder, afterOrder, ids };
|
||||
} catch (e) {
|
||||
console.log(` 异常: ${e.message}`);
|
||||
return { name, passed: false, failReason: e.message, ids };
|
||||
} finally {
|
||||
// 后置清理
|
||||
if (postCleanup) {
|
||||
try {
|
||||
console.log(' [后置清理] 执行中...');
|
||||
await postCleanup();
|
||||
console.log(' [后置清理] 完成');
|
||||
} catch (cleanupErr) {
|
||||
console.log(` [后置清理] 失败: ${cleanupErr.message}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// ========== 主测试流程 ==========
|
||||
|
||||
async function main() {
|
||||
console.log('='.repeat(60));
|
||||
console.log('batchQuickRecheck 接口完整真实流程测试');
|
||||
console.log(`测试时间: ${new Date().toISOString()}`);
|
||||
console.log(`目标表: ${TABLE}`);
|
||||
console.log(`Base URL: ${BASE_URL}`);
|
||||
console.log(`测试仓库ID: 100000 | 测试货主ID: 1000000`);
|
||||
console.log('='.repeat(60));
|
||||
|
||||
const results = [];
|
||||
|
||||
// ── 全局前置准备:恢复 120946 的库存锁定数量 ──
|
||||
console.log('\n── 全局前置:恢复 120946 关联库存 locked_quantity ──');
|
||||
const c = await getConn();
|
||||
// 记录 storage 184 原始状态
|
||||
const [origStorage] = await c.query('SELECT id, quantity, locked_quantity FROM wms_storage WHERE id = 184 AND warehouse_id = 100000');
|
||||
console.log(` storage 184 原始: quantity=${origStorage[0].quantity}, locked=${origStorage[0].locked_quantity}`);
|
||||
// 恢复 locked_quantity 以便测试成功扣减
|
||||
if (origStorage[0].locked_quantity < 1) {
|
||||
await c.query('UPDATE wms_storage SET locked_quantity = locked_quantity + 1, updated_at = NOW() WHERE id = 184 AND warehouse_id = 100000');
|
||||
console.log(' storage 184 locked_quantity 已 +1(恢复用于测试)');
|
||||
}
|
||||
// 恢复 wms_picking 状态
|
||||
await c.query("UPDATE wms_picking SET status = 'pending', updated_at = NOW() WHERE id = 87425 AND warehouse_id = 100000");
|
||||
console.log(' wms_picking 87425 status 恢复为 pending');
|
||||
// 恢复 wave_pick_task_order
|
||||
await c.query('UPDATE wms_wave_pick_task_order SET pick_status = 0, picked_time = NULL, update_time = NOW() WHERE id = 6057 AND warehouse_id = 100000');
|
||||
console.log(' wave_pick_task_order 6057 pick_status 恢复为 0');
|
||||
// 恢复 120946 的 pick_status 和 recheck_status
|
||||
await c.query("UPDATE wms_order_delivery_100000 SET pick_status = 'none', recheck_status = 'none', updated_at = NOW() WHERE id = 120946 AND warehouse_id = 100000");
|
||||
console.log(' 订单 120946 pick_status/recheck_status 已恢复');
|
||||
|
||||
// ── 用例 7: 空列表(不修改数据,最先测) ──
|
||||
results.push(await runTestCase(
|
||||
'用例7: 空列表-应返回错误',
|
||||
[],
|
||||
'返回错误 "订单ID列表不能为空"',
|
||||
null,
|
||||
async (result) => {
|
||||
// batchQuickRecheck 返回 500 而非 400(内部 throw(400) 被框架包装为 500)
|
||||
// 检查是否包含错误消息
|
||||
const msg = result.body && (result.body.message || '');
|
||||
const dataMsg = result.body && result.body.data && result.body.data.message || '';
|
||||
if (msg.includes('订单ID列表不能为空') || dataMsg.includes('订单ID列表不能为空')) return true;
|
||||
return `期望包含"订单ID列表不能为空",实际: ${JSON.stringify(result.body)}`;
|
||||
}
|
||||
));
|
||||
|
||||
// ── 用例 8: 不存在的订单ID ──
|
||||
results.push(await runTestCase(
|
||||
'用例8: 不存在的订单ID',
|
||||
[999999999],
|
||||
'全部 failed, reason="未找到对应订单"',
|
||||
null,
|
||||
async (result) => {
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
if (!data || typeof data !== 'object') return `返回数据格式异常: ${JSON.stringify(result.body)}`;
|
||||
if (data.success_count === 0 && data.failed_count >= 1) {
|
||||
const firstFail = data.failed && data.failed[0];
|
||||
if (firstFail && firstFail.reason === '未找到对应订单') return true;
|
||||
return `期望 reason="未找到对应订单",实际: ${JSON.stringify(firstFail)}`;
|
||||
}
|
||||
return `期望 success_count=0, failed_count>=1,实际: ${JSON.stringify(data)}`;
|
||||
}
|
||||
));
|
||||
|
||||
// ── 用例 5: 失败-未同步(120858: status='pedding') ──
|
||||
results.push(await runTestCase(
|
||||
'用例5: 失败-未同步',
|
||||
[120858, 120857],
|
||||
'全部 failed, reason="没有同步"',
|
||||
null,
|
||||
async (result) => {
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
if (!data || data.success_count !== 0) return `期望 success_count=0,实际: ${JSON.stringify(data)}`;
|
||||
const allNoSync = (data.failed || []).every(f => f.reason === '没有同步');
|
||||
if (allNoSync) return true;
|
||||
return `期望所有 failed reason="没有同步",实际: ${JSON.stringify(data.failed)}`;
|
||||
}
|
||||
));
|
||||
|
||||
// ── 用例 4: 失败-无快递(120944: post_status='none') ──
|
||||
results.push(await runTestCase(
|
||||
'用例4: 失败-无快递',
|
||||
[120944, 120943],
|
||||
'全部 failed, reason="没有分配快递"',
|
||||
null,
|
||||
async (result) => {
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
if (!data || data.success_count !== 0) return `期望 success_count=0,实际: ${JSON.stringify(data)}`;
|
||||
const allNoPost = (data.failed || []).every(f => f.reason === '没有分配快递');
|
||||
if (allNoPost) return true;
|
||||
return `期望所有 failed reason="没有分配快递",实际: ${JSON.stringify(data.failed)}`;
|
||||
}
|
||||
));
|
||||
|
||||
// ── 用例 3: 失败-未分配储位(120947: storage_status='none') ──
|
||||
results.push(await runTestCase(
|
||||
'用例3: 失败-未分配储位',
|
||||
[120947, 120939],
|
||||
'全部 failed, reason="未分配储位"',
|
||||
null,
|
||||
async (result) => {
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
if (!data || data.success_count !== 0) return `期望 success_count=0,实际: ${JSON.stringify(data)}`;
|
||||
const allNoStorage = (data.failed || []).every(f => f.reason === '未分配储位');
|
||||
if (allNoStorage) return true;
|
||||
return `期望所有 failed reason="未分配储位",实际: ${JSON.stringify(data.failed)}`;
|
||||
}
|
||||
));
|
||||
|
||||
// ── 用例 2: 失败-已拦截(120945: intercept_status='intercepted_at_warehouse') ──
|
||||
results.push(await runTestCase(
|
||||
'用例2: 失败-已拦截',
|
||||
[120945],
|
||||
'全部 failed, reason="已拦截"',
|
||||
null,
|
||||
async (result) => {
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
if (!data || data.success_count !== 0) return `期望 success_count=0,实际: ${JSON.stringify(data)}`;
|
||||
const allIntercepted = (data.failed || []).every(f => f.reason === '已拦截');
|
||||
if (allIntercepted) return true;
|
||||
return `期望所有 failed reason="已拦截",实际: ${JSON.stringify(data.failed)}`;
|
||||
}
|
||||
));
|
||||
|
||||
// ── 用例 1: 成功-含未拣货(120946: storage='fin', post='fin', status='created', pick='none') ──
|
||||
// 前置: 确保 120946 的 picking 记录和库存已恢复
|
||||
let case1Cleanup = null;
|
||||
results.push(await runTestCase(
|
||||
'用例1: 成功-含未拣货',
|
||||
[120946],
|
||||
'success_count >= 1, 订单 recheck_status=fin, pick_status=fin',
|
||||
async () => {
|
||||
// 再次确认前置条件
|
||||
const c2 = await getConn();
|
||||
const [st] = await c2.query('SELECT locked_quantity FROM wms_storage WHERE id = 184 AND warehouse_id = 100000');
|
||||
console.log(` [前置确认] storage 184 locked_quantity=${st[0].locked_quantity}`);
|
||||
const [pk] = await c2.query('SELECT status FROM wms_picking WHERE id = 87425 AND warehouse_id = 100000');
|
||||
console.log(` [前置确认] picking 87425 status=${pk[0].status}`);
|
||||
},
|
||||
async (result) => {
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
if (!data || data.success_count < 1) return `期望 success_count >= 1,实际: ${JSON.stringify(data)}`;
|
||||
|
||||
// 验证 120946 的状态
|
||||
const c3 = await getConn();
|
||||
const [order] = await c3.query(
|
||||
'SELECT pick_status, recheck_status FROM wms_order_delivery_100000 WHERE id = 120946 AND warehouse_id = 100000'
|
||||
);
|
||||
console.log(` [验证] 120946 pick_status="${order[0].pick_status}" recheck_status="${order[0].recheck_status}"`);
|
||||
if (order[0].pick_status !== 'fin') return `期望 pick_status='fin',实际="${order[0].pick_status}"`;
|
||||
if (order[0].recheck_status !== 'fin') return `期望 recheck_status='fin',实际="${order[0].recheck_status}"`;
|
||||
|
||||
// 验证库存已扣减
|
||||
const [stAfter] = await c3.query('SELECT locked_quantity, quantity FROM wms_storage WHERE id = 184 AND warehouse_id = 100000');
|
||||
console.log(` [验证] storage 184 扣减后: locked=${stAfter[0].locked_quantity}, quantity=${stAfter[0].quantity}`);
|
||||
|
||||
// 记录清理函数
|
||||
case1Cleanup = async () => {
|
||||
const cc = await getConn();
|
||||
// 恢复库存
|
||||
await cc.query('UPDATE wms_storage SET locked_quantity = locked_quantity + 1, quantity = quantity + 1, updated_at = NOW() WHERE id = 184 AND warehouse_id = 100000');
|
||||
// 恢复 picking
|
||||
await cc.query("UPDATE wms_picking SET status = 'pending', updated_at = NOW() WHERE id = 87425 AND warehouse_id = 100000");
|
||||
// 恢复 wave_pick_task_order
|
||||
await cc.query('UPDATE wms_wave_pick_task_order SET pick_status = 0, picked_time = NULL, update_time = NOW() WHERE id = 6057 AND warehouse_id = 100000');
|
||||
// 恢复订单状态
|
||||
await cc.query("UPDATE wms_order_delivery_100000 SET pick_status = 'none', recheck_status = 'none', updated_at = NOW() WHERE id = 120946 AND warehouse_id = 100000");
|
||||
console.log(' [用例1恢复] 120946 相关数据已恢复');
|
||||
};
|
||||
return true;
|
||||
},
|
||||
case1Cleanup ? async () => { await case1Cleanup(); } : null
|
||||
));
|
||||
|
||||
// ── 用例 6: 部分失败-混合(有效+无效) ──
|
||||
// 需要先确保 120946 恢复到可测试状态
|
||||
results.push(await runTestCase(
|
||||
'用例6: 部分失败-混合',
|
||||
[120946, 120947, 999999999],
|
||||
'success_count >= 1 且 failed_count >= 2',
|
||||
async () => {
|
||||
// 恢复 120946 的前置条件
|
||||
const c4 = await getConn();
|
||||
const [st] = await c4.query('SELECT locked_quantity FROM wms_storage WHERE id = 184 AND warehouse_id = 100000');
|
||||
if (st[0].locked_quantity < 1) {
|
||||
await c4.query('UPDATE wms_storage SET locked_quantity = locked_quantity + 1, quantity = quantity + 1, updated_at = NOW() WHERE id = 184 AND warehouse_id = 100000');
|
||||
console.log(' [前置] storage 184 locked_quantity 已恢复 +1');
|
||||
}
|
||||
await c4.query("UPDATE wms_picking SET status = 'pending', updated_at = NOW() WHERE id = 87425 AND warehouse_id = 100000");
|
||||
await c4.query('UPDATE wms_wave_pick_task_order SET pick_status = 0, picked_time = NULL, update_time = NOW() WHERE id = 6057 AND warehouse_id = 100000');
|
||||
await c4.query("UPDATE wms_order_delivery_100000 SET pick_status = 'none', recheck_status = 'none', updated_at = NOW() WHERE id = 120946 AND warehouse_id = 100000");
|
||||
console.log(' [前置] 120946 数据已恢复');
|
||||
},
|
||||
async (result) => {
|
||||
const data = result.body && (result.body.data !== undefined ? result.body.data : result.body);
|
||||
if (!data) return `返回数据为空: ${JSON.stringify(result.body)}`;
|
||||
if (data.success_count >= 1 && data.failed_count >= 2) {
|
||||
const hasUnfound = (data.failed || []).some(f => f.reason === '未找到对应订单');
|
||||
const hasNoStorage = (data.failed || []).some(f => f.reason === '未分配储位');
|
||||
console.log(` [验证] 包含未找到: ${hasUnfound}, 包含未分配储位: ${hasNoStorage}`);
|
||||
return true;
|
||||
}
|
||||
return `期望 success_count>=1 且 failed_count>=2,实际 success_count=${data.success_count}, failed_count=${data.failed_count}`;
|
||||
},
|
||||
async () => {
|
||||
// 恢复 120946
|
||||
const c5 = await getConn();
|
||||
const [st] = await c5.query('SELECT locked_quantity, quantity FROM wms_storage WHERE id = 184 AND warehouse_id = 100000');
|
||||
// 如果 locked_quantity 减少了(测试成功扣减了),恢复
|
||||
await c5.query("UPDATE wms_picking SET status = 'pending', updated_at = NOW() WHERE id = 87425 AND warehouse_id = 100000");
|
||||
await c5.query('UPDATE wms_wave_pick_task_order SET pick_status = 0, picked_time = NULL, update_time = NOW() WHERE id = 6057 AND warehouse_id = 100000');
|
||||
await c5.query("UPDATE wms_order_delivery_100000 SET pick_status = 'none', recheck_status = 'none', updated_at = NOW() WHERE id = 120946 AND warehouse_id = 100000");
|
||||
// 检查库存是否需要恢复
|
||||
const [st2] = await c5.query('SELECT locked_quantity FROM wms_storage WHERE id = 184 AND warehouse_id = 100000');
|
||||
console.log(` [用例6恢复] 120946 数据已恢复,storage 184 locked=${st2[0].locked_quantity}`);
|
||||
}
|
||||
));
|
||||
|
||||
// ── 全局恢复:将 storage 184 恢复到测试前状态 ──
|
||||
console.log('\n── 全局恢复:storage 184 ──');
|
||||
// 检查当前状态,恢复到原始值
|
||||
const [finalSt] = await c.query('SELECT quantity, locked_quantity FROM wms_storage WHERE id = 184 AND warehouse_id = 100000');
|
||||
console.log(` storage 184 最终: quantity=${finalSt[0].quantity}, locked=${finalSt[0].locked_quantity}`);
|
||||
console.log(` storage 184 原始: quantity=${origStorage[0].quantity}, locked=${origStorage[0].locked_quantity}`);
|
||||
|
||||
// 恢复 picking 87425 到 pending
|
||||
await c.query("UPDATE wms_picking SET status = 'pending', updated_at = NOW() WHERE id = 87425 AND warehouse_id = 100000");
|
||||
// 恢复 wave_pick_task_order 6057 到 pick_status=0
|
||||
await c.query('UPDATE wms_wave_pick_task_order SET pick_status = 0, picked_time = NULL, update_time = NOW() WHERE id = 6057 AND warehouse_id = 100000');
|
||||
// 恢复订单 120946
|
||||
await c.query("UPDATE wms_order_delivery_100000 SET pick_status = 'none', recheck_status = 'none', updated_at = NOW() WHERE id = 120946 AND warehouse_id = 100000");
|
||||
console.log(' 全局恢复完成');
|
||||
|
||||
// ── 汇总 ──
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log('测试汇总');
|
||||
console.log('='.repeat(60));
|
||||
const passCount = results.filter(r => r.passed).length;
|
||||
const failCount = results.filter(r => !r.passed).length;
|
||||
console.log(`总用例数: ${results.length}`);
|
||||
console.log(`通过: ${passCount}`);
|
||||
console.log(`失败: ${failCount}`);
|
||||
console.log('');
|
||||
|
||||
for (const r of results) {
|
||||
const status = r.passed ? 'PASS' : 'FAIL';
|
||||
console.log(` [${status}] ${r.name}`);
|
||||
if (r.result && r.result.success_count !== undefined) {
|
||||
console.log(` success_count=${r.result.success_count}, failed_count=${r.result.failed_count}`);
|
||||
}
|
||||
if (!r.passed && r.failReason) {
|
||||
console.log(` 失败原因: ${r.failReason}`);
|
||||
}
|
||||
}
|
||||
|
||||
await closeConn();
|
||||
return { results, passCount, failCount };
|
||||
}
|
||||
|
||||
main().then(({ results, passCount, failCount }) => {
|
||||
console.log('\n测试完成。');
|
||||
// 返回给调用者
|
||||
process.exit(failCount > 0 ? 1 : 0);
|
||||
}).catch(e => {
|
||||
console.error('测试脚本异常:', e.message);
|
||||
process.exit(1);
|
||||
});
|
||||
171
scripts/test_batch_quick_recheck_v2.js
Normal file
171
scripts/test_batch_quick_recheck_v2.js
Normal file
@ -0,0 +1,171 @@
|
||||
'use strict';
|
||||
// batchQuickRecheck 接口真实流程测试脚本 v2 - 修复 body 格式
|
||||
const TOKEN = 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpZCI6MSwidXNlcm5hbWUiOiJsaXVmdW1pbmdyZW4iLCJyZWFsX25hbWUiOiLliJjku5jmmI7ku4EiLCJwbGF0Zm9ybV9jb2RlIjoid2ViIiwiY3VycmVudF9yb2xlX2lkIjo0LCJjdXJyZW50X3N0b3JlX2lkIjoxMDAwMDAsImlhdCI6MTc4MTM2MDk3MiwiZXhwIjoxNzgxMzc1MzcyfQ.u0svJXHuk8RdlM8ObhDMlRj07gWQzS8Y_41dPcBDtc0';
|
||||
const BASE_URL = 'http://127.0.0.1:6060';
|
||||
const TABLE = 'wms_order_delivery_100000';
|
||||
const mysql = require('mysql2/promise');
|
||||
const DB_CONFIG = {host:'127.0.0.1',port:3307,user:'wms',password:'dspxmRwRdRbWtbm7',database:'wms'};
|
||||
|
||||
async function getOrderSnapshot(conn, ids) {
|
||||
if (!ids.length) return {};
|
||||
const [rows] = await conn.query(
|
||||
`SELECT id, delivery_order_code, pre_delivery_order_code,
|
||||
pick_status, recheck_status, storage_status, post_status, status, intercept_status
|
||||
FROM ${TABLE} WHERE id IN (?)`, [ids]
|
||||
);
|
||||
const map = {};
|
||||
rows.forEach(r => { map[r.id] = r; });
|
||||
return map;
|
||||
}
|
||||
|
||||
async function callApi(ids) {
|
||||
const ts = Math.floor(Date.now() / 1000);
|
||||
const url = `${BASE_URL}/system?method=order.recheckOrder.batchQuickRecheck&v=1.0×tamp=${ts}`;
|
||||
const headers = {
|
||||
'platform': 'web',
|
||||
'project': 'wms',
|
||||
'Content-Type': 'application/json; charset=utf-8',
|
||||
'Authorization': `Bearer ${TOKEN}`,
|
||||
};
|
||||
// IMPORTANT: body 必须扁平化,ids 直接在顶层。callMethod 将整个 body 传给业务方法
|
||||
const body = JSON.stringify({ ids });
|
||||
|
||||
const response = await fetch(url, { method: 'POST', headers, body });
|
||||
const text = await response.text();
|
||||
let json;
|
||||
try { json = JSON.parse(text); } catch { json = { raw: text }; }
|
||||
return { status: response.status, body: json };
|
||||
}
|
||||
|
||||
async function runTestCase(name, ids, expectedDesc) {
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log(`【${name}】`);
|
||||
console.log(` 输入IDs: [${ids.join(', ')}]`);
|
||||
console.log(` 预期: ${expectedDesc}`);
|
||||
|
||||
const conn = await mysql.createConnection(DB_CONFIG);
|
||||
let beforeSnapshot = {};
|
||||
let afterSnapshot = {};
|
||||
let passed = false;
|
||||
|
||||
try {
|
||||
beforeSnapshot = await getOrderSnapshot(conn, ids);
|
||||
console.log(' 测试前状态:');
|
||||
for (const [id, snap] of Object.entries(beforeSnapshot)) {
|
||||
console.log(` ID ${id}: pick="${snap.pick_status}" recheck="${snap.recheck_status}" storage="${snap.storage_status}" post="${snap.post_status}" status="${snap.status}" intercept="${snap.intercept_status}" code="${snap.delivery_order_code || snap.pre_delivery_order_code || ''}"`);
|
||||
}
|
||||
|
||||
const result = await callApi(ids);
|
||||
console.log(` HTTP Status: ${result.status}`);
|
||||
const data = result.body && result.body.data;
|
||||
console.log(` 返回结果: ${JSON.stringify(data || result.body, null, 2)}`);
|
||||
|
||||
passed = result.status === 200;
|
||||
|
||||
afterSnapshot = await getOrderSnapshot(conn, ids);
|
||||
console.log(' 测试后状态:');
|
||||
for (const [id, snap] of Object.entries(afterSnapshot)) {
|
||||
const before = beforeSnapshot[id] || {};
|
||||
const changes = [];
|
||||
if (snap.pick_status !== before.pick_status) changes.push(`pick: ${before.pick_status}→${snap.pick_status}`);
|
||||
if (snap.recheck_status !== before.recheck_status) changes.push(`recheck: ${before.recheck_status}→${snap.recheck_status}`);
|
||||
const changeStr = changes.length ? ` [变更: ${changes.join(', ')}]` : ' [无变更]';
|
||||
console.log(` ID ${id}: pick="${snap.pick_status}" recheck="${snap.recheck_status}"${changeStr}`);
|
||||
}
|
||||
|
||||
return { name, passed, result: data || result.body, beforeSnapshot, afterSnapshot, ids };
|
||||
} catch (e) {
|
||||
console.log(` 异常: ${e.message}`);
|
||||
return { name, passed: false, error: e.message, ids };
|
||||
} finally {
|
||||
await conn.end();
|
||||
}
|
||||
}
|
||||
|
||||
async function main() {
|
||||
console.log('='.repeat(60));
|
||||
console.log('batchQuickRecheck 接口真实流程测试');
|
||||
console.log(`测试时间: ${new Date().toISOString()}`);
|
||||
console.log(`目标表: ${TABLE}`);
|
||||
console.log(`Base URL: ${BASE_URL}`);
|
||||
console.log('='.repeat(60));
|
||||
|
||||
const results = [];
|
||||
|
||||
// 用例7: 空列表 (先测,不修改数据)
|
||||
results.push(await runTestCase(
|
||||
'用例7: 空列表',
|
||||
[],
|
||||
'400 错误 "订单ID列表不能为空"'
|
||||
));
|
||||
|
||||
// 用例8: 不存在ID
|
||||
results.push(await runTestCase(
|
||||
'用例8: 不存在ID',
|
||||
[999999999],
|
||||
'全部 failed, reason="未找到对应订单"'
|
||||
));
|
||||
|
||||
// 用例4: 全失败-未同步
|
||||
results.push(await runTestCase(
|
||||
'用例4: 全失败-未同步',
|
||||
[120858, 120857],
|
||||
'全部 failed, reason="没有同步"'
|
||||
));
|
||||
|
||||
// 用例3: 全失败-无快递
|
||||
results.push(await runTestCase(
|
||||
'用例3: 全失败-无快递',
|
||||
[120944, 120943],
|
||||
'全部 failed, reason="没有分配快递"'
|
||||
));
|
||||
|
||||
// 用例2: 全失败-无储位
|
||||
results.push(await runTestCase(
|
||||
'用例2: 全失败-无储位',
|
||||
[120947, 120939],
|
||||
'全部 failed, reason="未分配储位"'
|
||||
));
|
||||
|
||||
// 用例5: 全失败-已拦截
|
||||
results.push(await runTestCase(
|
||||
'用例5: 全失败-已拦截',
|
||||
[120945],
|
||||
'全部 failed, reason="已拦截"'
|
||||
));
|
||||
|
||||
// 用例6: 部分失败-混合(valid + invalid)
|
||||
results.push(await runTestCase(
|
||||
'用例6: 部分失败-混合',
|
||||
[120946, 120947, 999999999],
|
||||
'success 和 failed 各有'
|
||||
));
|
||||
|
||||
// 用例1: 全成功-含未拣货 (最后测,会修改数据)
|
||||
results.push(await runTestCase(
|
||||
'用例1: 全成功-含未拣货',
|
||||
[120946],
|
||||
'pick_status=none → 自动完成拣货+复核, recheck_status=fin'
|
||||
));
|
||||
|
||||
// 汇总
|
||||
console.log(`\n${'='.repeat(60)}`);
|
||||
console.log('测试汇总');
|
||||
console.log('='.repeat(60));
|
||||
const passCount = results.filter(r => r.passed).length;
|
||||
const failCount = results.filter(r => !r.passed).length;
|
||||
console.log(`总用例数: ${results.length}`);
|
||||
console.log(`通过: ${passCount}`);
|
||||
console.log(`失败: ${failCount}`);
|
||||
console.log('');
|
||||
|
||||
for (const r of results) {
|
||||
const status = r.passed ? 'PASS' : 'FAIL';
|
||||
console.log(` [${status}] ${r.name}`);
|
||||
if (r.result && r.result.success_count !== undefined) {
|
||||
console.log(` success_count=${r.result.success_count}, failed_count=${r.result.failed_count}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
main().catch(e => { console.error('测试脚本异常:', e.message); process.exit(1); });
|
||||
@ -137,4 +137,230 @@ describe('test/app/service/systemMethods/stock.warehouse.import.test.js', () =>
|
||||
assert.equal(calls.saveArgs[0].goods_code, 'CARGO-321');
|
||||
assert.equal(calls.saveArgs[0].item_code, 'ITEM-321');
|
||||
});
|
||||
|
||||
// ======================= _normalizeBarcodeField 单元测试 =======================
|
||||
describe('_normalizeBarcodeField()', () => {
|
||||
let service;
|
||||
before(() => {
|
||||
const h = createHarness();
|
||||
service = h.service;
|
||||
});
|
||||
|
||||
it('should return empty array for null', () => {
|
||||
assert.deepEqual(service._normalizeBarcodeField(null), []);
|
||||
});
|
||||
|
||||
it('should return empty array for undefined', () => {
|
||||
assert.deepEqual(service._normalizeBarcodeField(undefined), []);
|
||||
});
|
||||
|
||||
it('should return empty array for array input (arrays no longer supported)', () => {
|
||||
const result = service._normalizeBarcodeField([ 'A', 'B', 'A', '', 'C ' ]);
|
||||
assert.deepEqual(result, []);
|
||||
});
|
||||
|
||||
it('should return empty array for array input with whitespace items', () => {
|
||||
const result = service._normalizeBarcodeField([ ' 69123456 ', '69123456', ' 7890 ' ]);
|
||||
assert.deepEqual(result, []);
|
||||
});
|
||||
|
||||
it('should split comma-separated string', () => {
|
||||
const result = service._normalizeBarcodeField('A,B,C');
|
||||
assert.deepEqual(result, [ 'A', 'B', 'C' ]);
|
||||
});
|
||||
|
||||
it('should trim and filter empty parts from comma string', () => {
|
||||
const result = service._normalizeBarcodeField(' A ,, B , ,C ');
|
||||
assert.deepEqual(result, [ 'A', 'B', 'C' ]);
|
||||
});
|
||||
|
||||
it('should return empty array for empty string', () => {
|
||||
assert.deepEqual(service._normalizeBarcodeField(''), []);
|
||||
});
|
||||
|
||||
it('should return empty array for whitespace-only string', () => {
|
||||
assert.deepEqual(service._normalizeBarcodeField(' '), []);
|
||||
});
|
||||
|
||||
it('should return empty array for all-empty array', () => {
|
||||
assert.deepEqual(service._normalizeBarcodeField([ '', '', '' ]), []);
|
||||
});
|
||||
|
||||
it('should return single item for single-value string', () => {
|
||||
assert.deepEqual(service._normalizeBarcodeField('6901234567890'), [ '6901234567890' ]);
|
||||
});
|
||||
|
||||
it('should deduplicate comma-separated values', () => {
|
||||
const result = service._normalizeBarcodeField('A,A,B');
|
||||
assert.deepEqual(result, [ 'A', 'B' ]);
|
||||
});
|
||||
});
|
||||
|
||||
// ======================= _normalizeWarehouseImportRow 条码别名映射测试 =======================
|
||||
describe('_normalizeWarehouseImportRow barcode alias mapping', () => {
|
||||
let service;
|
||||
before(() => {
|
||||
const h = createHarness();
|
||||
service = h.service;
|
||||
});
|
||||
|
||||
it('should map 条码 to barcode', () => {
|
||||
const row = { '条码': 'A,B' };
|
||||
const normalized = service._normalizeWarehouseImportRow(row);
|
||||
assert.deepEqual(normalized.barcode, [ 'A', 'B' ]);
|
||||
});
|
||||
|
||||
it('should map bar_code to barcode', () => {
|
||||
const row = { bar_code: 'X,Y' };
|
||||
const normalized = service._normalizeWarehouseImportRow(row);
|
||||
assert.deepEqual(normalized.barcode, [ 'X', 'Y' ]);
|
||||
});
|
||||
|
||||
it('should map barCode to barcode', () => {
|
||||
const row = { barCode: 'P,Q' };
|
||||
const normalized = service._normalizeWarehouseImportRow(row);
|
||||
assert.deepEqual(normalized.barcode, [ 'P', 'Q' ]);
|
||||
});
|
||||
|
||||
it('should return empty array for barcodeList (array no longer supported)', () => {
|
||||
const row = { barcodeList: [ 'M', 'N' ] };
|
||||
const normalized = service._normalizeWarehouseImportRow(row);
|
||||
assert.deepEqual(normalized.barcode, []);
|
||||
});
|
||||
|
||||
it('should map barcode_list to barcode', () => {
|
||||
const row = { barcode_list: 'R,S,T' };
|
||||
const normalized = service._normalizeWarehouseImportRow(row);
|
||||
assert.deepEqual(normalized.barcode, [ 'R', 'S', 'T' ]);
|
||||
});
|
||||
|
||||
it('should return empty array for barcode pass-through (array no longer supported)', () => {
|
||||
const row = { barcode: [ 'U', 'V' ] };
|
||||
const normalized = service._normalizeWarehouseImportRow(row);
|
||||
assert.deepEqual(normalized.barcode, []);
|
||||
});
|
||||
});
|
||||
|
||||
// ======================= 新建商品时传入 barcode =======================
|
||||
describe('create with barcode', () => {
|
||||
it('should pass barcode as array to createWarehouseStock (comma string input)', async () => {
|
||||
const { service, calls, ctx } = createHarness();
|
||||
|
||||
await service.import([
|
||||
{
|
||||
item_code: 'NEW-SKU-1',
|
||||
goods_code: 'G-NEW-1',
|
||||
条码: '6901234567890,6901234567891',
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(calls.createArgs.length, 1);
|
||||
assert.equal(calls.saveArgs.length, 0);
|
||||
assert.equal(calls.createArgs[0].item_code, 'NEW-SKU-1');
|
||||
assert.equal(calls.createArgs[0].store_id, ctx.user.store_id);
|
||||
assert.deepEqual(calls.createArgs[0].barcode, [ '6901234567890', '6901234567891' ]);
|
||||
});
|
||||
|
||||
it('should pass barcode as array to createWarehouseStock (comma string input via bar_code)', async () => {
|
||||
const { service, calls, ctx } = createHarness();
|
||||
|
||||
await service.import([
|
||||
{
|
||||
item_code: 'NEW-SKU-2',
|
||||
goods_code: 'G-NEW-2',
|
||||
bar_code: '6901234567892,6901234567893',
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(calls.createArgs.length, 1);
|
||||
assert.equal(calls.saveArgs.length, 0);
|
||||
assert.equal(calls.createArgs[0].item_code, 'NEW-SKU-2');
|
||||
assert.deepEqual(calls.createArgs[0].barcode, [ '6901234567892', '6901234567893' ]);
|
||||
});
|
||||
|
||||
it('should pass empty barcode array to createWarehouseStock when no barcode provided', async () => {
|
||||
const { service, calls } = createHarness();
|
||||
|
||||
await service.import([
|
||||
{
|
||||
item_code: 'NEW-SKU-3',
|
||||
goods_code: 'G-NEW-3',
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(calls.createArgs.length, 1);
|
||||
assert.deepEqual(calls.createArgs[0].barcode, []);
|
||||
});
|
||||
});
|
||||
|
||||
// ======================= 更新商品时传入 barcode =======================
|
||||
describe('update with barcode', () => {
|
||||
it('should pass barcode to saveWarehouseStock when updating (comma string format)', async () => {
|
||||
const { service, calls } = createHarness();
|
||||
|
||||
await service.import([
|
||||
{
|
||||
SKU: '500',
|
||||
item_code: 'SKU-500',
|
||||
barcode_list: 'BAR-1,BAR-2,BAR-3',
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(calls.saveArgs.length, 1);
|
||||
assert.equal(calls.createArgs.length, 0);
|
||||
assert.equal(calls.saveArgs[0].id, '500');
|
||||
assert.deepEqual(calls.saveArgs[0].barcode, [ 'BAR-1', 'BAR-2', 'BAR-3' ]);
|
||||
});
|
||||
|
||||
it('should return empty barcode array when updating (array no longer supported)', async () => {
|
||||
const { service, calls } = createHarness();
|
||||
|
||||
await service.import([
|
||||
{
|
||||
id: '501',
|
||||
item_code: 'SKU-501',
|
||||
barcodeList: [ 'BAR-A', 'BAR-B' ],
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(calls.saveArgs.length, 1);
|
||||
assert.equal(calls.saveArgs[0].id, '501');
|
||||
assert.deepEqual(calls.saveArgs[0].barcode, []);
|
||||
});
|
||||
|
||||
it('should pass empty barcode array to saveWarehouseStock when barcode is explicitly empty', async () => {
|
||||
const { service, calls } = createHarness();
|
||||
|
||||
await service.import([
|
||||
{
|
||||
SKU: '502',
|
||||
item_code: 'SKU-502',
|
||||
barcode: [],
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(calls.saveArgs.length, 1);
|
||||
assert.equal(calls.saveArgs[0].id, '502');
|
||||
assert.deepEqual(calls.saveArgs[0].barcode, []);
|
||||
});
|
||||
|
||||
it('should pass empty barcode array to saveWarehouseStock when barcode is not provided at all', async () => {
|
||||
const { service, calls } = createHarness();
|
||||
|
||||
await service.import([
|
||||
{
|
||||
SKU: '503',
|
||||
item_code: 'SKU-503',
|
||||
goods_code: 'G-503',
|
||||
},
|
||||
]);
|
||||
|
||||
assert.equal(calls.saveArgs.length, 1);
|
||||
assert.equal(calls.saveArgs[0].id, '503');
|
||||
// barcode 属性由 _normalizeWarehouseImportRow 始终设置,未传入时为空数组 []
|
||||
// saveWarehouseStock 中通过 hasOwnProperty('barcode') 判定为 true,会清空旧条码
|
||||
assert.equal(Object.prototype.hasOwnProperty.call(calls.saveArgs[0], 'barcode'), true);
|
||||
assert.deepEqual(calls.saveArgs[0].barcode, []);
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@ -146,7 +146,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
const customDataContent = result.print_data.contents.find(content => content && content.customData);
|
||||
assert.ok(customDataContent);
|
||||
assert.equal(customDataContent.templateURL, 'http://www.ye4s.com/mb/kuaishou.xml');
|
||||
assert.ok(customDataContent.customData.productInfo.includes('W010 申通快递 商品数量【2】'));
|
||||
assert.ok(customDataContent.customData.productInfo.includes('W010 申通快递'));
|
||||
assert.ok(customDataContent.customData.productInfo.includes('E2区02-04-02 化妆品 6973348850399 【2】'));
|
||||
});
|
||||
|
||||
@ -242,7 +242,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
assert.ok(customContent);
|
||||
assert.equal(customContent.templateURL, 'http://www.ye4s.com/mb/pdd.xml');
|
||||
assert.ok(customContent.data.list[0].text.includes('\r'));
|
||||
assert.ok(customContent.data.list[0].text.includes('W020 顺丰空运 商品数量【1】'));
|
||||
assert.ok(customContent.data.list[0].text.includes('W020 顺丰空运'));
|
||||
assert.ok(customContent.data.list[0].text.includes('A1-01-01 90123 【1】'));
|
||||
});
|
||||
|
||||
@ -339,7 +339,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
|
||||
const customContent = result.print_data.contents.find(content => content && content.data && Array.isArray(content.data.list));
|
||||
assert.ok(customContent);
|
||||
assert.ok(customContent.data.list[0].text.includes('W021 圆通 商品数量【3】'));
|
||||
assert.ok(customContent.data.list[0].text.includes('W021 圆通'));
|
||||
assert.ok(customContent.data.list[0].text.includes('C1-01-01 9988776655443 【3】'));
|
||||
});
|
||||
|
||||
@ -424,7 +424,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
const customContent = result.print_data.contents[1];
|
||||
assert.ok(customContent);
|
||||
assert.equal(customContent.templateURL, 'http://cloudprint.cainiao.com/cloudprint/customArea/queryCustomAreaList4Top.json?custom_area_id=6474956');
|
||||
assert.ok(customContent.data.CustomControl.includes('商品数量【2】'));
|
||||
assert.ok(customContent.data.CustomControl.includes('W026 申通快递'));
|
||||
assert.ok(customContent.data.CustomControl.includes('E1区01-19-01 运动短袖 988948487 【2】'));
|
||||
});
|
||||
|
||||
@ -564,7 +564,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
|
||||
const customContent = result.print_data.contents[1];
|
||||
assert.ok(customContent);
|
||||
assert.ok(customContent.data.CustomControl.includes('商品数量【1】'));
|
||||
assert.ok(customContent.data.CustomControl.includes('W027 申通快递'));
|
||||
assert.ok(customContent.data.CustomControl.includes('A1-01-01 fallback 运动短袖 111111111 【1】'));
|
||||
});
|
||||
|
||||
@ -808,7 +808,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
|
||||
const customContent = result.print_data.contents.find(content => content && content.data && Array.isArray(content.data.list));
|
||||
assert.ok(customContent);
|
||||
assert.ok(customContent.data.list[0].text.includes('W022 韵达 商品数量【1】'));
|
||||
assert.ok(customContent.data.list[0].text.includes('W022 韵达'));
|
||||
assert.ok(customContent.data.list[0].text.includes('E2区08-05-02 皮带黑色 665835404213 【1】'));
|
||||
});
|
||||
|
||||
@ -898,7 +898,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
|
||||
const customContent = result.print_data.contents.find(content => content && content.data && Array.isArray(content.data.list));
|
||||
assert.ok(customContent);
|
||||
assert.equal(customContent.data.list[0].text, 'W023 中通 商品数量【2】\r');
|
||||
assert.equal(customContent.data.list[0].text, 'W023 中通\r');
|
||||
});
|
||||
|
||||
it('should render detail lines from non-json string items', () => {
|
||||
@ -960,7 +960,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
|
||||
const customDataContent = result.print_data.contents.find(content => content && content.customData);
|
||||
assert.ok(customDataContent);
|
||||
assert.ok(customDataContent.customData.productInfo.includes('W024 申通快递 商品数量【3】'));
|
||||
assert.ok(customDataContent.customData.productInfo.includes('W024 申通快递'));
|
||||
assert.ok(customDataContent.customData.productInfo.includes('皮带黑色 【1】'));
|
||||
assert.ok(customDataContent.customData.productInfo.includes('皮带金色 【2】'));
|
||||
});
|
||||
@ -1052,7 +1052,7 @@ describe('test/app/service/systems/order_print.getWavePlatformPrintData.test.js'
|
||||
const customContent = result.print_data.contents.find(content => content && content.data && Array.isArray(content.data.list));
|
||||
assert.ok(customContent);
|
||||
const text = customContent.data.list[0].text;
|
||||
assert.ok(text.includes('W025 顺丰空运 商品数量【2】'));
|
||||
assert.ok(text.includes('W025 顺丰空运'));
|
||||
assert.ok(text.includes('E2区08-05-02 04213 【1】'));
|
||||
assert.ok(text.includes('E2区08-04-02 00507 【1】'));
|
||||
assert.ok(!text.includes('\r【1】\r'));
|
||||
|
||||
@ -252,6 +252,11 @@ function createHarness(options = {}) {
|
||||
},
|
||||
async bulkCreate(rows) {
|
||||
captures.pickingRows = rows.map(row => ({ ...row }));
|
||||
// 推入 pickingRows 以支持 find/destroy(多轮分配场景需要)
|
||||
let nextId = pickingRows.reduce((max, r) => Math.max(max, Number(r.id) || 0), 0) + 1;
|
||||
for (const row of rows) {
|
||||
pickingRows.push({ ...row, id: nextId++ });
|
||||
}
|
||||
return rows;
|
||||
},
|
||||
},
|
||||
@ -261,6 +266,11 @@ function createHarness(options = {}) {
|
||||
storage: {
|
||||
index: {
|
||||
async lockQuantity(storageId, quantity) {
|
||||
// 支持测试场景:模拟锁定失败以验证事务回退
|
||||
if (options.throwOnLockStorageId && Number(storageId) === Number(options.throwOnLockStorageId)) {
|
||||
throw new Error(`模拟事务回退: lockQuantity 对 storageId=${storageId} 抛异常`);
|
||||
}
|
||||
|
||||
const matchedRow = storageRows.find(row => Number(row.id) === Number(storageId));
|
||||
if (!matchedRow) {
|
||||
throw new Error(`库存记录不存在: ${storageId}`);
|
||||
@ -838,4 +848,520 @@ describe('test/app/service/systems/order_storage_allocation.test.js', () => {
|
||||
assert.equal(orders[0].order_flag, '');
|
||||
assert.equal(captures.reversePendingExceptionRequest, undefined);
|
||||
});
|
||||
|
||||
// ============================================================
|
||||
// 场景 1:error 订单重分配 — 旧 picking 清理 + 库存锁定释放 + 新分配正确
|
||||
// ============================================================
|
||||
it('should clean old picking, unlock old storage locks, and create correct new picking when retrying an error order', async () => {
|
||||
const { service, captures, orders, storageRows } = createHarness({
|
||||
orders: [
|
||||
{ id: 100, warehouse_id: 100000, storage_status: 'error', order_flag: '库存不足:sku(501),数量:3,库位数量:0', step: 3 },
|
||||
],
|
||||
orderItems: [
|
||||
{ id: 1001, order_id: 100, stock_id: 501, plan_qty: 3, order_line_no: '1' },
|
||||
{ id: 1002, order_id: 100, stock_id: 502, plan_qty: 2, order_line_no: '2' },
|
||||
],
|
||||
pickingRows: [
|
||||
{
|
||||
id: 101,
|
||||
order_id: 100,
|
||||
order_item_id: 1001,
|
||||
warehouse_id: 100000,
|
||||
storage_id: 3001,
|
||||
quantity: 3,
|
||||
space_id: 1,
|
||||
space_name: '旧库位A',
|
||||
status: 'pending',
|
||||
created_at: '2026-06-01 10:00:00',
|
||||
updated_at: '2026-06-01 10:00:00',
|
||||
},
|
||||
{
|
||||
id: 102,
|
||||
order_id: 100,
|
||||
order_item_id: 1002,
|
||||
warehouse_id: 100000,
|
||||
storage_id: 3002,
|
||||
quantity: 2,
|
||||
space_id: 2,
|
||||
space_name: '旧库位B',
|
||||
status: 'pending',
|
||||
created_at: '2026-06-01 10:00:00',
|
||||
updated_at: '2026-06-01 10:00:00',
|
||||
},
|
||||
],
|
||||
stockRows: [
|
||||
{ id: 501, item_code: 'SKU-501', item_name: '商品501', warehouse_id: 100000, deleted_at: null, is_valid: 'Y', locked_quantity: 0 },
|
||||
{ id: 502, item_code: 'SKU-502', item_name: '商品502', warehouse_id: 100000, deleted_at: null, is_valid: 'Y', locked_quantity: 0 },
|
||||
],
|
||||
storageRows: [
|
||||
// 旧库存(首次分配时已被锁定,available=0)
|
||||
{
|
||||
id: 3001,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 501,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 0,
|
||||
quantity: 3,
|
||||
locked_quantity: 3,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-01 08:00:00',
|
||||
space_id: 1,
|
||||
space: { id: 1, space_code: 'OLD-A', custom_name: '旧库位A', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
{
|
||||
id: 3002,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 502,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 0,
|
||||
quantity: 2,
|
||||
locked_quantity: 2,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-01 08:00:00',
|
||||
space_id: 2,
|
||||
space: { id: 2, space_code: 'OLD-B', custom_name: '旧库位B', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
// 新库存(补货后可用)
|
||||
{
|
||||
id: 4001,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 501,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 5,
|
||||
quantity: 5,
|
||||
locked_quantity: 0,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-10 08:00:00',
|
||||
space_id: 3,
|
||||
space: { id: 3, space_code: 'NEW-A', custom_name: '新库位A', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
{
|
||||
id: 4002,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 502,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 4,
|
||||
quantity: 4,
|
||||
locked_quantity: 0,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-10 08:00:00',
|
||||
space_id: 4,
|
||||
space: { id: 4, space_code: 'NEW-B', custom_name: '新库位B', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
],
|
||||
policies: {
|
||||
501: { policyConfig: { storage_separation: 1 } },
|
||||
502: { policyConfig: { storage_separation: 1 } },
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.allocateStorage({
|
||||
allow_storage_location: true,
|
||||
order_ids: [ 100 ],
|
||||
});
|
||||
|
||||
// 1) 旧库存锁定已释放
|
||||
assert.equal(captures.storageUnlocks.length, 2);
|
||||
assert.deepEqual(captures.storageUnlocks[0], { storageId: 3001, quantity: 3 });
|
||||
assert.deepEqual(captures.storageUnlocks[1], { storageId: 3002, quantity: 2 });
|
||||
|
||||
// 2) 旧 picking 已删除
|
||||
assert.deepEqual(captures.pickingDestroyIds, [ 101, 102 ]);
|
||||
|
||||
// 3) 新库存已锁定(只锁定新的,不锁旧的)
|
||||
assert.equal(captures.storageLocks.length, 2);
|
||||
const lockedIds = captures.storageLocks.map(l => l.storageId);
|
||||
assert.ok(!lockedIds.includes(3001), '旧库存3001不应被重新锁定');
|
||||
assert.ok(!lockedIds.includes(3002), '旧库存3002不应被重新锁定');
|
||||
assert.ok(lockedIds.includes(4001), '新库存4001应被锁定');
|
||||
assert.ok(lockedIds.includes(4002), '新库存4002应被锁定');
|
||||
|
||||
// 4) 新 picking 数量正确(只有2条,无重复)
|
||||
assert.equal(captures.pickingRows.length, 2);
|
||||
|
||||
// 5) 同一 (order_item_id, space_name) 组合只有 1 条
|
||||
const itemSpacePairs = captures.pickingRows.map(r => `${r.order_item_id}_${r.space_name}`);
|
||||
assert.equal(new Set(itemSpacePairs).size, 2, `存在重复的 (order_item_id, space_name) 组合: ${JSON.stringify(itemSpacePairs)}`);
|
||||
|
||||
// 6) 新 picking 指向新库位
|
||||
const picking1001 = captures.pickingRows.find(r => r.order_item_id === 1001);
|
||||
const picking1002 = captures.pickingRows.find(r => r.order_item_id === 1002);
|
||||
assert.ok(picking1001, '应存在 order_item_id=1001 的 picking 记录');
|
||||
assert.equal(picking1001.storage_id, 4001);
|
||||
assert.equal(picking1001.space_name, '新库位A');
|
||||
assert.equal(picking1001.quantity, 3);
|
||||
assert.ok(picking1002, '应存在 order_item_id=1002 的 picking 记录');
|
||||
assert.equal(picking1002.storage_id, 4002);
|
||||
assert.equal(picking1002.space_name, '新库位B');
|
||||
assert.equal(picking1002.quantity, 2);
|
||||
|
||||
// 7) storageRows 状态正确:旧库存已解锁,新库存已锁定
|
||||
const oldStorageA = storageRows.find(r => r.id === 3001);
|
||||
assert.equal(oldStorageA.available_quantity, 3, '旧库存3001解锁后available应为3');
|
||||
assert.equal(oldStorageA.locked_quantity, 0, '旧库存3001 locked应为0');
|
||||
|
||||
const oldStorageB = storageRows.find(r => r.id === 3002);
|
||||
assert.equal(oldStorageB.available_quantity, 2, '旧库存3002解锁后available应为2');
|
||||
assert.equal(oldStorageB.locked_quantity, 0, '旧库存3002 locked应为0');
|
||||
|
||||
const newStorageA = storageRows.find(r => r.id === 4001);
|
||||
assert.equal(newStorageA.available_quantity, 2, '新库存4001锁定后available应为2(5-3)');
|
||||
assert.equal(newStorageA.locked_quantity, 3, '新库存4001 locked应为3');
|
||||
|
||||
const newStorageB = storageRows.find(r => r.id === 4002);
|
||||
assert.equal(newStorageB.available_quantity, 2, '新库存4002锁定后available应为2(4-2)');
|
||||
assert.equal(newStorageB.locked_quantity, 2, '新库存4002 locked应为2');
|
||||
|
||||
// 8) 订单状态变为 fin,无缺货信息
|
||||
assert.equal(result.code, 200);
|
||||
const orderResult = result.data.orders.find(item => item.order_id === 100);
|
||||
assert.ok(orderResult, '返回结果应包含订单100');
|
||||
assert.equal(orderResult.storage_status, 'fin');
|
||||
assert.equal(orderResult.status, 'success');
|
||||
assert.equal(orders[0].storage_status, 'fin');
|
||||
assert.equal(orders[0].order_flag, '');
|
||||
});
|
||||
|
||||
// ============================================================
|
||||
// 场景 2:连续两次 error 重试 — picking 始终无重复,库存锁定不泄漏
|
||||
// ============================================================
|
||||
it('should not leave duplicate picking or leaked locks after consecutive error retries', async () => {
|
||||
const harness = createHarness({
|
||||
orders: [
|
||||
{ id: 200, warehouse_id: 100000, storage_status: 'none', order_flag: '', step: 2 },
|
||||
],
|
||||
orderItems: [
|
||||
{ id: 2001, order_id: 200, stock_id: 601, plan_qty: 5, order_line_no: '1' },
|
||||
],
|
||||
pickingRows: [],
|
||||
stockRows: [
|
||||
{ id: 601, item_code: 'SKU-601', item_name: '商品601', warehouse_id: 100000, deleted_at: null, is_valid: 'Y', locked_quantity: 0 },
|
||||
],
|
||||
storageRows: [
|
||||
{
|
||||
id: 6001,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 601,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 2,
|
||||
quantity: 2,
|
||||
locked_quantity: 0,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-01 08:00:00',
|
||||
space_id: 10,
|
||||
space: { id: 10, space_code: 'LOC-10', custom_name: '库位10', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
],
|
||||
policies: {
|
||||
601: { policyConfig: { storage_separation: 1 } },
|
||||
},
|
||||
});
|
||||
|
||||
const { service, captures, orders, storageRows, pickingRows } = harness;
|
||||
|
||||
// === 第 1 次分配:部分成功 → error ===
|
||||
const result1 = await service.allocateStorage({ allow_storage_location: true, order_ids: [ 200 ] });
|
||||
assert.equal(result1.code, 200);
|
||||
assert.equal(orders[0].storage_status, 'error');
|
||||
assert.equal(captures.storageLocks.length, 1);
|
||||
assert.deepEqual(captures.storageLocks[0], { storageId: 6001, quantity: 2 });
|
||||
assert.equal(captures.pickingRows.length, 1);
|
||||
assert.equal(pickingRows.length, 1);
|
||||
assert.equal(pickingRows[0].order_id, 200);
|
||||
assert.equal(pickingRows[0].storage_id, 6001);
|
||||
assert.equal(pickingRows[0].quantity, 2);
|
||||
assert.equal(pickingRows[0].status, 'pending');
|
||||
assert.equal(storageRows[0].available_quantity, 0);
|
||||
assert.equal(storageRows[0].locked_quantity, 2);
|
||||
|
||||
const unlockCountAfterCall1 = captures.storageUnlocks.length;
|
||||
|
||||
// 补货 — 追加新库存(仍不够:1 < 3)
|
||||
storageRows.push({
|
||||
id: 6002,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 601,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 1,
|
||||
quantity: 1,
|
||||
locked_quantity: 0,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-02 08:00:00',
|
||||
space_id: 11,
|
||||
space: { id: 11, space_code: 'LOC-11', custom_name: '库位11', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
});
|
||||
|
||||
// === 第 2 次分配:仍然缺货 → error ===
|
||||
const result2 = await service.allocateStorage({ allow_storage_location: true, order_ids: [ 200 ] });
|
||||
assert.equal(result2.code, 200);
|
||||
assert.equal(orders[0].storage_status, 'error');
|
||||
|
||||
// 验证第 2 次调用清理了第 1 次的旧数据
|
||||
const newUnlocks = captures.storageUnlocks.slice(unlockCountAfterCall1);
|
||||
assert.equal(newUnlocks.length, 1, '第2次调用应释放第1次的1条锁定');
|
||||
assert.deepEqual(newUnlocks[0], { storageId: 6001, quantity: 2 });
|
||||
|
||||
// picking 表只有新记录(旧的已被 destroy),无重复
|
||||
assert.equal(pickingRows.length, 1, 'picking表应只有1条记录(旧的已删除)');
|
||||
assert.equal(pickingRows[0].storage_id, 6002);
|
||||
assert.equal(pickingRows[0].quantity, 1);
|
||||
|
||||
const unlockCountAfterCall2 = captures.storageUnlocks.length;
|
||||
|
||||
// 再次补货 — 这次够了
|
||||
storageRows.push({
|
||||
id: 6003,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 601,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 10,
|
||||
quantity: 10,
|
||||
locked_quantity: 0,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-03 08:00:00',
|
||||
space_id: 12,
|
||||
space: { id: 12, space_code: 'LOC-12', custom_name: '库位12', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
});
|
||||
|
||||
// === 第 3 次分配:成功 ===
|
||||
const result3 = await service.allocateStorage({ allow_storage_location: true, order_ids: [ 200 ] });
|
||||
assert.equal(result3.code, 200);
|
||||
assert.equal(orders[0].storage_status, 'fin');
|
||||
|
||||
// 验证第 3 次调用清理了第 2 次的旧数据
|
||||
const finalUnlocks = captures.storageUnlocks.slice(unlockCountAfterCall2);
|
||||
assert.equal(finalUnlocks.length, 1, '第3次调用应释放第2次的1条锁定');
|
||||
assert.deepEqual(finalUnlocks[0], { storageId: 6002, quantity: 1 });
|
||||
|
||||
// 注意:第3次分配的 Storage.findAll 查询时,6001 已被第2次清理释放(available=2),
|
||||
// 6003 是新增的(available=10),6002 在查询时 available=0 被过滤。
|
||||
// 所以分配结果:6001(qty=2) + 6003(qty=3) = 5 → 2 条 picking
|
||||
assert.equal(pickingRows.length, 2, 'picking应有2条(6001和6003各一条)');
|
||||
|
||||
// 验证每条 picking 的分配数量
|
||||
const picking6001 = pickingRows.find(r => r.storage_id === 6001);
|
||||
const picking6003 = pickingRows.find(r => r.storage_id === 6003);
|
||||
assert.ok(picking6001, '应存在 storage_id=6001 的 picking');
|
||||
assert.equal(picking6001.quantity, 2);
|
||||
assert.ok(picking6003, '应存在 storage_id=6003 的 picking');
|
||||
assert.equal(picking6003.quantity, 3);
|
||||
|
||||
// 总分配数量 = 5
|
||||
const totalAllocated = pickingRows.reduce((sum, r) => sum + Number(r.quantity), 0);
|
||||
assert.equal(totalAllocated, 5, '总分配数量应为5');
|
||||
|
||||
// 所有 picking 的 (order_item_id, space_name) 无重复
|
||||
const itemSpacePairs = pickingRows.map(r => `${r.order_item_id}_${r.space_name}`);
|
||||
assert.equal(new Set(itemSpacePairs).size, pickingRows.length, '不应存在重复的 (order_item_id, space_name)');
|
||||
|
||||
// 库存锁定没有泄漏:6002 在清理后被释放锁定,且本轮未被重新分配(因为 findAll 查询时其 available=0)
|
||||
// 6001 被重新锁定 2,6003 被锁定 3
|
||||
assert.equal(storageRows.find(r => r.id === 6002).locked_quantity, 0, '6002锁定应已清零');
|
||||
});
|
||||
|
||||
// ============================================================
|
||||
// 场景 3:fin 订单在混合批次中不被影响
|
||||
// ============================================================
|
||||
it('should skip fin orders and only clean up error order data in a mixed batch', async () => {
|
||||
const { service, captures, orders } = createHarness({
|
||||
orders: [
|
||||
{ id: 300, warehouse_id: 100000, storage_status: 'fin', order_flag: '', step: 2 },
|
||||
{ id: 301, warehouse_id: 100000, storage_status: 'error', order_flag: '库存不足:sku(701),数量:5,库位数量:2', step: 3 },
|
||||
],
|
||||
orderItems: [
|
||||
{ id: 3001, order_id: 300, stock_id: 701, plan_qty: 1, order_line_no: '1' },
|
||||
{ id: 3011, order_id: 301, stock_id: 701, plan_qty: 5, order_line_no: '1' },
|
||||
],
|
||||
pickingRows: [
|
||||
{
|
||||
id: 301,
|
||||
order_id: 301,
|
||||
order_item_id: 3011,
|
||||
warehouse_id: 100000,
|
||||
storage_id: 7001,
|
||||
quantity: 2,
|
||||
space_id: 20,
|
||||
space_name: '旧库位X',
|
||||
status: 'pending',
|
||||
created_at: '2026-06-01 10:00:00',
|
||||
updated_at: '2026-06-01 10:00:00',
|
||||
},
|
||||
],
|
||||
stockRows: [
|
||||
{ id: 701, item_code: 'SKU-701', item_name: '商品701', warehouse_id: 100000, deleted_at: null, is_valid: 'Y', locked_quantity: 0 },
|
||||
],
|
||||
storageRows: [
|
||||
// 旧库存(error 订单首次分配锁定的)
|
||||
{
|
||||
id: 7001,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 701,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 0,
|
||||
quantity: 2,
|
||||
locked_quantity: 2,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-01 08:00:00',
|
||||
space_id: 20,
|
||||
space: { id: 20, space_code: 'OLD-X', custom_name: '旧库位X', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
// 新库存(补货后可用,同时供 fin 和 error 订单使用)
|
||||
{
|
||||
id: 7002,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 701,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 10,
|
||||
quantity: 10,
|
||||
locked_quantity: 0,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-10 08:00:00',
|
||||
space_id: 21,
|
||||
space: { id: 21, space_code: 'NEW-X', custom_name: '新库位X', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
],
|
||||
policies: {
|
||||
701: { policyConfig: { storage_separation: 1 } },
|
||||
},
|
||||
});
|
||||
|
||||
const result = await service.allocateStorage({
|
||||
allow_storage_location: true,
|
||||
order_ids: [ 300, 301 ],
|
||||
});
|
||||
|
||||
// 1) fin 订单被跳过
|
||||
const skippedOrder300 = result.data.skipped_orders.find(item => item.order_id === 300);
|
||||
assert.ok(skippedOrder300, '订单300应在skipped中');
|
||||
assert.equal(skippedOrder300.skipped_reason, 'already_allocated');
|
||||
assert.equal(orders[0].storage_status, 'fin');
|
||||
|
||||
// 2) error 订单的旧 picking 被清理
|
||||
assert.deepEqual(captures.pickingDestroyIds, [ 301 ]);
|
||||
|
||||
// 3) 旧库存锁定被释放
|
||||
assert.equal(captures.storageUnlocks.length, 1);
|
||||
assert.deepEqual(captures.storageUnlocks[0], { storageId: 7001, quantity: 2 });
|
||||
|
||||
// 4) fin 订单的 picking 没有被删除(它不在 pending 状态或不在 errorRetryOrderIds 中)
|
||||
// 注意:fin 订单没有 pending picking,所以 destroy 的 where 只匹配 error 订单的 picking
|
||||
|
||||
// 5) error 订单被分配并变为 fin
|
||||
const orderResult301 = result.data.orders.find(item => item.order_id === 301);
|
||||
assert.ok(orderResult301, '返回结果应包含订单301');
|
||||
assert.equal(orderResult301.storage_status, 'fin');
|
||||
assert.equal(orderResult301.status, 'success');
|
||||
assert.equal(orders[1].storage_status, 'fin');
|
||||
assert.equal(orders[1].order_flag, '');
|
||||
|
||||
// 6) 新 picking 只有 error 订单的记录
|
||||
assert.equal(captures.pickingRows.length, 1);
|
||||
assert.equal(captures.pickingRows[0].order_id, 301);
|
||||
assert.equal(captures.pickingRows[0].order_item_id, 3011);
|
||||
assert.equal(captures.pickingRows[0].storage_id, 7002);
|
||||
assert.equal(captures.pickingRows[0].quantity, 5);
|
||||
});
|
||||
|
||||
// ============================================================
|
||||
// 场景 4:事务回退验证 — 清理后的分配异常触发回滚
|
||||
// ============================================================
|
||||
it('should rollback transaction and preserve old data when allocation fails after cleanup', async () => {
|
||||
const { service, captures, pickingRows } = createHarness({
|
||||
orders: [
|
||||
{ id: 400, warehouse_id: 100000, storage_status: 'error', order_flag: '库存不足', step: 3 },
|
||||
],
|
||||
orderItems: [
|
||||
{ id: 4001, order_id: 400, stock_id: 801, plan_qty: 3, order_line_no: '1' },
|
||||
],
|
||||
pickingRows: [
|
||||
{
|
||||
id: 401,
|
||||
order_id: 400,
|
||||
order_item_id: 4001,
|
||||
warehouse_id: 100000,
|
||||
storage_id: 8001,
|
||||
quantity: 1,
|
||||
space_id: 30,
|
||||
space_name: '旧库位Z',
|
||||
status: 'pending',
|
||||
created_at: '2026-06-01 10:00:00',
|
||||
updated_at: '2026-06-01 10:00:00',
|
||||
},
|
||||
],
|
||||
stockRows: [
|
||||
{ id: 801, item_code: 'SKU-801', item_name: '商品801', warehouse_id: 100000, deleted_at: null, is_valid: 'Y', locked_quantity: 0 },
|
||||
],
|
||||
storageRows: [
|
||||
{
|
||||
id: 8001,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 801,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 0,
|
||||
quantity: 1,
|
||||
locked_quantity: 1,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-01 08:00:00',
|
||||
space_id: 30,
|
||||
space: { id: 30, space_code: 'OLD-Z', custom_name: '旧库位Z', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
// 新库存,但可用量不足以满足需求(导致分配时抛异常)
|
||||
{
|
||||
id: 8002,
|
||||
warehouse_id: 100000,
|
||||
stock_id: 801,
|
||||
is_enabled: 1,
|
||||
delete_at: null,
|
||||
available_quantity: 1, // 需要3,只有1 → lockQuantity 不会抛异常(分配1个),但最终标记 error,不会触发 rollback
|
||||
quantity: 1,
|
||||
locked_quantity: 0,
|
||||
production_date: null,
|
||||
inbound_time: '2026-06-10 08:00:00',
|
||||
space_id: 31,
|
||||
space: { id: 31, space_code: 'NEW-Z', custom_name: '新库位Z', is_preferred_pick: false, locationType: { id: 1, allow_allocation: 1, is_active: 1 } },
|
||||
},
|
||||
],
|
||||
policies: {
|
||||
801: { policyConfig: { storage_separation: 1 } },
|
||||
},
|
||||
// 触发事务回退:在 lockQuantity 中对特定 storage_id 抛异常
|
||||
throwOnLockStorageId: 8002,
|
||||
});
|
||||
|
||||
// 记录事务回退前的状态快照
|
||||
const unlockBefore = captures.storageUnlocks.length;
|
||||
|
||||
// 验证清理前存在旧 picking 记录
|
||||
assert.equal(pickingRows.length, 1, '清理前应有1条旧picking');
|
||||
|
||||
// 预期:分配过程中 lockQuantity 对 8002 抛出异常,事务回退
|
||||
await assert.rejects(
|
||||
() => service.allocateStorage({ allow_storage_location: true, order_ids: [ 400 ] }),
|
||||
/模拟事务回退/,
|
||||
'应抛出模拟异常'
|
||||
);
|
||||
|
||||
// 验证事务已回退
|
||||
assert.equal(captures.rolledBack, true, '事务应已回退');
|
||||
|
||||
// 注意:mock 层的事务回退不会真实恢复 pickingRows/storageRows 状态,
|
||||
// 但 unlockQuantity 和 destroy 在执行时仍然会修改数据(因为它们在 rollback 之前执行)。
|
||||
// 在实际 MySQL 中,这些修改会被 rollback 撤销;在 mock 中无法模拟此行为。
|
||||
// 因此这里只验证 rollback 被调用,状态恢复需由集成测试验证。
|
||||
|
||||
// 但我们可以验证:unlockQuantity 确实在 rollback 之前被调用了
|
||||
const unlocksAfterCleanup = captures.storageUnlocks.slice(unlockBefore);
|
||||
assert.equal(unlocksAfterCleanup.length, 1, '清理阶段应调用 unlockQuantity');
|
||||
assert.deepEqual(unlocksAfterCleanup[0], { storageId: 8001, quantity: 1 });
|
||||
});
|
||||
});
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user