fix(order,workbench): 散单称重拦截提示区分打包中状态

- pack_status=padding(打包中)时提示「订单打包中」,其余未完成状态仍提示「订单未打包」
- order_express.buildWeighPackBlockedMessage(packStatus) 恢复入参按状态区分;
  工作台 _assertSingleWeighPackedForWeigh 复用同一文案口径
- 判定规则不变:配置 single_weigh_require_pack 开启、wave_scope 非 1/3、
  pack_status 非 fin 时拒绝称重;团购波次批量称重不校验
- 测试:test/single_weigh_require_pack.test.cjs(27 用例全部通过)
- 文档:methods/system.json 0.3.195 -> 0.3.196,changes 新增 2026.09.28-weigh-pack-padding-message
This commit is contained in:
liufumingren 2026-09-28 16:34:10 +08:00
parent f8081b876f
commit 7838e1cf03
4 changed files with 27 additions and 9 deletions

View File

@ -362,16 +362,17 @@ class OrderExpressService extends Service {
const packStatus = String(orderRow.pack_status || '').trim();
if (packStatus !== 'fin') {
throw this.createBusinessError(this.buildWeighPackBlockedMessage(), 400);
throw this.createBusinessError(this.buildWeighPackBlockedMessage(packStatus), 400);
}
}
/**
* 构造「散单称重需先打包」拦截文案,供各称重入口复用(保证提示语一致)。
* @return {string} 拦截提示文案,固定为「订单未打包」,不附加其它提示。
* @param {string} packStatus 打包状态原值。
* @return {string} 拦截提示文案:打包中(padding)返回「订单打包中」,其余未完成状态返回「订单未打包」。
*/
buildWeighPackBlockedMessage() {
return '订单未打包';
buildWeighPackBlockedMessage(packStatus) {
return packStatus === 'padding' ? '订单打包中' : '订单未打包';
}
/**

View File

@ -1802,8 +1802,8 @@ class WorkbenchService extends Service {
}
const message = typeof orderExpressService.buildWeighPackBlockedMessage === 'function'
? orderExpressService.buildWeighPackBlockedMessage()
: '订单未打包';
? orderExpressService.buildWeighPackBlockedMessage(packStatus)
: (packStatus === 'padding' ? '订单打包中' : '订单未打包');
throw new Error(message);
}

View File

@ -1,4 +1,21 @@
[
{
"version": "2026.09.28-weigh-pack-padding-message",
"date": "2026-09-28",
"type": "updated",
"summary": "散单称重拦截提示区分打包中状态:pack_status=padding 返回「订单打包中」,其余未完成状态返回「订单未打包」",
"methods": [
"order.updateExpressWeighingWeight",
"workbench.sendWeight"
],
"notes": [
"代码依据:app/service/systems/order_express.js 的 buildWeighPackBlockedMessage(packStatus) 恢复入参,padding 返回「订单打包中」、其余非 fin 状态返回「订单未打包」;assertSingleOrderPackedForWeigh 沿用该文案抛 400。",
"代码依据:app/service/systems/workbench.js 的 _assertSingleWeighPackedForWeigh 复用同一文案,不再固定「订单未打包」。",
"判定规则未变:开启仓库配置 single_weigh_require_pack 后,wave_scope 非 1 大团购/3 小团购的订单 pack_status 非 fin 时拒绝称重;团购波次批量称重不校验。",
"测试:test/single_weigh_require_pack.test.cjs(27 用例,新增打包中文案断言,全部通过)。",
"本次仅提示文案区分,无接口结构变化。"
]
},
{
"version": "2026.09.28-order-wave-fetchable-order-count",
"date": "2026-09-28",

View File

@ -1,7 +1,7 @@
{
"module": "system",
"description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内",
"version": "0.3.195",
"version": "0.3.196",
"updatedAt": "2026-09-28",
"headers": [
{
@ -3128,7 +3128,7 @@
},
{
"code": 400,
"message": "订单未打包"
"message": "订单未打包(pack_status=padding 打包中时返回「订单打包中」)——开启仓库配置 single_weigh_require_pack 后,散单/非团购波次(wave_scope 非 1 大团购/3 小团购)订单 pack_status 未达 fin 时拒绝称重"
},
{
"code": 404,
@ -36031,7 +36031,7 @@
},
{
"code": 400,
"message": "订单未打包"
"message": "订单未打包(pack_status=padding 打包中时返回「订单打包中」)——开启仓库配置 single_weigh_require_pack 后,wave_scope 非 1 大团购/3 小团购 且 pack_status 非 fin 时拦截;团购波次不校验"
}
]
},