fix: 库内拦截扫描严格校验,非拦截订单直接拒绝且不再补建缺失运单

This commit is contained in:
liufumingren 2026-08-13 21:42:58 +08:00
parent 59ef8117d7
commit d25ea39e87

View File

@ -3700,11 +3700,13 @@ class RecheckOrderService extends OrderBaseService {
* 拦截扫描:通过运单号查找运单记录,标记退回与拦截并处理关联工单与订单拦截状态。
*
* 处理流程:
* 1. 根据运单号查询 wms_order_express,找到则将 is_back、is_intercept 设为 'Y';未找到则创建新记录补充缺失快递
* 2. 检查是否存在关联的未完结售后工单(wms_after_sale),若有则调用 handleWorkOrder 写入
* 1. 根据运单号查询 wms_order_express;运单不存在,或运单 is_intercept≠'Y' 且关联订单
* intercept_status 不在 requested/intercepting 时,视为非拦截订单并拒绝
* 2. 校验通过后将运单 is_back、is_intercept 设为 'Y'
* 3. 检查是否存在关联的未完结售后工单(wms_after_sale),若有则调用 handleWorkOrder 写入
* "库内拦截成功"步骤并将工单置为 completed
* 3. 同步更新 wms_order_delivery 的 intercept_status 为 intercepted_at_warehouse,
* 并释放储位分配与订单锁(与 confirmIntercept 行为一致,订单级拦截覆盖所有面单含子面单)
* 4. 同步更新 wms_order_delivery 的 intercept_status 为 intercepted_at_warehouse,
* 并释放储位分配与订单锁(仅订单级状态更新,不标记订单下其他面单)
*
* 注:库内拦截确认需标记退回 is_back='Y';发起拦截链路仅写 is_intercept,不写 is_back。
*
@ -3725,31 +3727,45 @@ class RecheckOrderService extends OrderBaseService {
const now = new Date();
// 1. 查询运单记录
let expressRecord = await ctx.model.OrderExpress.findOne({
const expressRecord = await ctx.model.OrderExpress.findOne({
where: { waybill_code: normalizedWaybillCode, warehouse_id: warehouseId },
raw: true,
});
// 1a. 缺失快递补充:运单记录不存在则创建新记录(库内拦截确认需标记退回)
// 1a. 非拦截订单校验:运单不存在,或运单/关联订单均未发起系统拦截,则拒绝
if (!expressRecord) {
const created = await ctx.model.OrderExpress.create({
waybill_code: normalizedWaybillCode,
order_id: null,
warehouse_id: warehouseId,
is_back: 'Y',
is_intercept: 'Y',
create_at: now,
});
expressRecord = (created && created.toJSON ? created.toJSON() : created) || {};
} else {
// 2. 标记退回 + 拦截
await ctx.model.OrderExpress.update(
{ is_back: 'Y', is_intercept: 'Y' },
{ where: { id: expressRecord.id } }
);
throw new Error('非拦截订单');
}
const expressIntercepted = String(expressRecord.is_intercept || '').trim() === 'Y';
let orderIntercepted = false;
if (!expressIntercepted) {
const linkedOrderId = Number(expressRecord.order_id || 0);
if (linkedOrderId > 0) {
const checkOrderModel = await this.getOrderModelByTableType('current', warehouseId);
const linkedOrder = await checkOrderModel.findOne({
where: this.buildOrderWhere([ linkedOrderId ], warehouseId),
attributes: [ 'id', 'intercept_status' ],
raw: true,
});
orderIntercepted = linkedOrder
? [ 'requested', 'intercepting' ].includes(String(linkedOrder.intercept_status || '').trim())
: false;
}
}
if (!expressIntercepted && !orderIntercepted) {
throw new Error('非拦截订单');
}
// 2. 标记退回 + 拦截
await ctx.model.OrderExpress.update(
{ is_back: 'Y', is_intercept: 'Y' },
{ where: { id: expressRecord.id } }
);
// 3. 检查关联的未完结售后工单
const afterSale = await ctx.model.AfterSale.findOne({
where: {