diff --git a/app/model/store.js b/app/model/store.js index a9405f8..3db1c62 100644 --- a/app/model/store.js +++ b/app/model/store.js @@ -97,6 +97,7 @@ module.exports = app => { single_order_pack_max_minutes: 3, group_order_pack_max_minutes: 40, big_group_pack_coefficient: 3, + single_weigh_require_pack: false, return_unpack_max_record_minutes: 5, inventory_warning_rules: DEFAULT_INVENTORY_WARNING_RULES, auto_outbound_rules: DEFAULT_AUTO_OUTBOUND_RULES, @@ -531,6 +532,14 @@ module.exports = app => { normalized.big_group_pack_coefficient = bigGroupPackCoefficient; } + // 散单称重是否需要打包:默认关闭(未配置的仓库不校验打包状态) + if (Object.prototype.hasOwnProperty.call(parsed, 'single_weigh_require_pack')) { + normalized.single_weigh_require_pack = normalizeBooleanFlag( + parsed.single_weigh_require_pack, + 'subject_config.single_weigh_require_pack' + ); + } + const rawReturnUnpackMaxRecordMinutes = parsed.return_unpack_max_record_minutes; if (rawReturnUnpackMaxRecordMinutes === undefined || rawReturnUnpackMaxRecordMinutes === null || rawReturnUnpackMaxRecordMinutes === '') { normalized.return_unpack_max_record_minutes = DEFAULT_SUBJECT_CONFIG.return_unpack_max_record_minutes; diff --git a/app/service/systems/order_express.js b/app/service/systems/order_express.js index dac69a0..ccac611 100644 --- a/app/service/systems/order_express.js +++ b/app/service/systems/order_express.js @@ -247,6 +247,133 @@ class OrderExpressService extends Service { } } + /** + * 读取订单的波次范围与打包状态(依次查询 current → history → dispatch 分表)。 + * + * 序列表定位优先:命中时先查对应分表,未命中(存量订单)按原遍历顺序回退。 + * + * @param {number} orderId 订单ID。 + * @param {number} warehouseId 仓库ID。 + * @return {Promise} { id, wave_scope, pack_status },未命中时返回 null。 + */ + async findOrderWaveAndPackStatus(orderId, warehouseId) { + const orderDeliveryFactory = this.ctx.model && this.ctx.model.OrderDeliveryFactory; + if (!orderDeliveryFactory || typeof orderDeliveryFactory.getCurrentModel !== 'function') { + return null; + } + + const tableOrders = [ + { label: 'current', getModel: () => orderDeliveryFactory.getCurrentModel(warehouseId) }, + { label: 'history', getModel: () => orderDeliveryFactory.getHistoryModel(warehouseId) }, + { label: 'dispatch', getModel: () => orderDeliveryFactory.getDispatchModel(warehouseId) }, + ]; + + try { + if (typeof orderDeliveryFactory.getOrderLocation === 'function') { + const preferredLocation = await orderDeliveryFactory.getOrderLocation(orderId, warehouseId); + if (preferredLocation) { + tableOrders.sort((a, b) => (a.label === preferredLocation ? -1 : b.label === preferredLocation ? 1 : 0)); + } + } + } catch (_err) { /* 定位失败,保持原遍历顺序 */ } + + for (const entry of tableOrders) { + try { + const model = await entry.getModel(); + if (!model || typeof model.findOne !== 'function') continue; + const row = await model.findOne({ + where: { id: orderId, warehouse_id: warehouseId }, + attributes: [ 'id', 'wave_scope', 'pack_status' ], + raw: true, + }); + if (row) return row; + } catch (_err) { continue; } + } + + return null; + } + + /** + * 读取仓库「散单称重是否需要打包」配置。 + * + * 配置来源:wms_store.subject_config.single_weigh_require_pack(默认关闭)。 + * 走 deliveryOrder.getStoreSubjectConfig 公共读取链路(带缓存);配置缺失、 + * 读取失败或值非法时按「关闭」处理,保证称重主流程可用。 + * + * @param {number|null} warehouseId 仓库ID。 + * @return {Promise} 是否要求散单称重前已完成打包。 + */ + async isSingleWeighRequirePack(warehouseId) { + const normalizedWarehouseId = Number(warehouseId || 0); + if (!Number.isFinite(normalizedWarehouseId) || normalizedWarehouseId <= 0) { + return false; + } + + try { + const deliveryOrderService = this.ctx.service + && this.ctx.service.systems + && this.ctx.service.systems.deliveryOrder; + if (!deliveryOrderService || typeof deliveryOrderService.getStoreSubjectConfig !== 'function') { + return false; + } + + const subjectConfig = await deliveryOrderService.getStoreSubjectConfig(normalizedWarehouseId); + return !!(subjectConfig && subjectConfig.single_weigh_require_pack === true); + } catch (error) { + this.ctx.logger.warn( + '[OrderExpressService.isSingleWeighRequirePack] 读取仓库配置失败,按关闭处理: %s', + error.message + ); + return false; + } + } + + /** + * 散单称重前置校验:开启「散单称重是否需要打包」时,未打包订单禁止称重。 + * + * 适用范围:订单波次范围 wave_scope 不属于 1(大团购)/ 3(小团购)时生效, + * 即未分配波次、散单、单品单件等按散单处理的订单;团购订单不校验。 + * 订单未命中(分表无记录)时跳过校验,由后续称重逻辑自行报错。 + * + * @param {number} orderId 订单ID。 + * @param {number|null} warehouseId 仓库ID,缺失时跳过校验。 + * @return {Promise} 无返回值;未打包时抛出业务异常。 + */ + async assertSingleOrderPackedForWeigh(orderId, warehouseId) { + const normalizedWarehouseId = Number(warehouseId || 0); + if (!Number.isFinite(normalizedWarehouseId) || normalizedWarehouseId <= 0) { + return; + } + + const requirePack = await this.isSingleWeighRequirePack(normalizedWarehouseId); + if (!requirePack) { + return; + } + + const orderRow = await this.findOrderWaveAndPackStatus(orderId, normalizedWarehouseId); + if (!orderRow) { + return; + } + + const waveScope = Number(orderRow.wave_scope || 0); + if (waveScope === 1 || waveScope === 3) { + return; + } + + const packStatus = String(orderRow.pack_status || '').trim(); + if (packStatus !== 'fin') { + throw this.createBusinessError(this.buildWeighPackBlockedMessage(), 400); + } + } + + /** + * 构造「散单称重需先打包」拦截文案,供各称重入口复用(保证提示语一致)。 + * @return {string} 拦截提示文案,固定为「订单未打包」,不附加其它提示。 + */ + buildWeighPackBlockedMessage() { + return '订单未打包'; + } + /** * 规范化并校验称重重量。 * @@ -464,7 +591,7 @@ class OrderExpressService extends Service { * * @param {Object} payload 入参对象。 * @param {string} payload.waybillCode 运单号(必填)。 - * @param {number|string} payload.weighingWeight 称重重量(kg)。 + * @param {number|string} payload.weighingWeight 称重重量(g)。 * @return {Promise} 单运单返回 {order_id, waybill_code, weighing_weight, items_weight}; * 团购批量返回 {wave_id, wave_no, order_id, weighing_weight, total_weight, split_count, splits, store_name, sys_logistics_name, items_weight}。 */ @@ -861,6 +988,9 @@ class OrderExpressService extends Service { * @return {Promise<{order_id:number, waybill_code:string, weighing_weight:number, items_weight:number}>} 更新结果。 */ async _updateSingleOrderWeight(orderId, waybillCode, weight, warehouseId) { + // 散单称重前置校验:开启「散单称重是否需要打包」后,未打包订单禁止称重 + await this.assertSingleOrderPackedForWeigh(orderId, warehouseId); + const rows = await this.findValidOrderExpressRows(orderId, warehouseId); if (rows.length === 0) { diff --git a/app/service/systems/setting/warehouse.js b/app/service/systems/setting/warehouse.js index 300dd6e..baf587a 100644 --- a/app/service/systems/setting/warehouse.js +++ b/app/service/systems/setting/warehouse.js @@ -346,6 +346,14 @@ const WAREHOUSE_SETTING_FIELDS = Object.freeze([ description: '大团购波次(wave_scope=1)打包中,扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒,单位:秒/单,默认 3,必须大于 0', min: 0.1, }), + Object.freeze({ + key: 'single_weigh_require_pack', + name: '散单称重是否需要打包', + type: 'flag', + default: false, + required: false, + description: '开启后散单称重(订单波次范围 wave_scope 非 1 大团购 / 3 小团购)前必须已打包完成(pack_status=fin),未打包时拒绝称重并返回错误,默认 false(关闭)', + }), Object.freeze({ key: 'return_unpack_max_record_minutes', name: '拆包最大录制时长(分钟)', diff --git a/app/service/systems/workbench.js b/app/service/systems/workbench.js index ba19238..44a7926 100644 --- a/app/service/systems/workbench.js +++ b/app/service/systems/workbench.js @@ -1608,7 +1608,7 @@ class WorkbenchService extends Service { if (!model || typeof model.findOne !== 'function') continue; const row = await model.findOne({ where: { id: orderId, warehouse_id: warehouseId }, - attributes: [ 'id', 'wave_id', 'wave_no', 'items_weight', 'intercept_status' ], + attributes: [ 'id', 'wave_id', 'wave_no', 'wave_scope', 'pack_status', 'items_weight', 'intercept_status' ], raw: true, }); if (row) { @@ -1631,6 +1631,9 @@ class WorkbenchService extends Service { throw new Error(`订单已被拦截,无法称重 [${normalizedBarcode}]`); } + // 散单称重前置校验:开启「散单称重是否需要打包」后,波次范围非大团购(1)/小团购(3)的未打包订单禁止称重 + await this._assertSingleWeighPackedForWeigh(orderRow, warehouseId); + const waveId = Number(orderRow.wave_id || 0); // 步骤3:散单(wave_id=0)→ 仅更新该运单的称重重量 @@ -1762,6 +1765,48 @@ class WorkbenchService extends Service { }; } + /** + * 散单称重前置校验(工作台):开启仓库配置「散单称重是否需要打包」后, + * 波次范围(wave_scope)非 1(大团购)/ 3(小团购)的订单未打包完成 + * (pack_status != fin)时禁止称重。 + * + * 配置读取与提示文案复用 systems/order_express,避免多处判定逻辑漂移; + * 当前订单行已含 wave_scope/pack_status,故无需重复查询订单表。 + * 配置服务不可用时静默跳过,不阻断称重主流程。 + * + * @param {Object} orderRow 订单行(需包含 wave_scope/pack_status) + * @param {number} warehouseId 仓库ID + * @return {Promise} 无返回值;未打包时抛出错误 + */ + async _assertSingleWeighPackedForWeigh(orderRow, warehouseId) { + const waveScope = Number((orderRow && orderRow.wave_scope) || 0); + if (waveScope === 1 || waveScope === 3) { + return; + } + + const orderExpressService = this.ctx.service + && this.ctx.service.systems + && this.ctx.service.systems.orderExpress; + if (!orderExpressService || typeof orderExpressService.isSingleWeighRequirePack !== 'function') { + return; + } + + const requirePack = await orderExpressService.isSingleWeighRequirePack(warehouseId); + if (!requirePack) { + return; + } + + const packStatus = String((orderRow && orderRow.pack_status) || '').trim(); + if (packStatus === 'fin') { + return; + } + + const message = typeof orderExpressService.buildWeighPackBlockedMessage === 'function' + ? orderExpressService.buildWeighPackBlockedMessage() + : '订单未打包'; + throw new Error(message); + } + /** * 写入称重操作日志(内部方法,失败不影响主流程) * @param {Object} opts diff --git a/methods/changes/system.json b/methods/changes/system.json index 101d1bd..f224873 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,57 @@ [ + { + "version": "2026.09.27-weigh-pack-message-simplify", + "date": "2026-09-27", + "type": "updated", + "summary": "散单称重未打包拦截文案简化为固定「订单未打包」(移除打包状态明细与工作台条码后缀)", + "methods": [ + "order.updateExpressWeighingWeight", + "workbench.sendWeight" + ], + "notes": [ + "代码依据:app/service/systems/order_express.js 的 buildWeighPackBlockedMessage() 现返回固定文案「订单未打包」,assertSingleOrderPackedForWeigh 沿用该文案抛 400;原 formatPackStatusText 状态文案方法已移除。", + "代码依据:app/service/systems/workbench.js 的 _assertSingleWeighPackedForWeigh(orderRow, warehouseId) 复用同一文案,不再追加 ` [条码]` 后缀。", + "判定规则未变:开启仓库配置 single_weigh_require_pack 后,wave_scope 非 1 大团购/3 小团购的订单 pack_status 非 fin 时拒绝称重;团购波次批量称重不校验。", + "测试:test/single_weigh_require_pack.test.cjs(26 用例,已按新文案断言)。", + "本次仅文档文案对齐,无接口结构变化。" + ] + }, + { + "version": "2026.09.27-setting-save-big-group-coefficient-doc-fix", + "date": "2026-09-27", + "type": "updated", + "summary": "补 setting.warehouse.saveSettings 入参遗漏的 subject_config.big_group_pack_coefficient(对齐 getSettings/getFieldMeta 与代码实现):大团购波次(wave_scope=1)打包中扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒,默认 3,必须大于 0;非法值报 400。", + "methods": [ + "setting.warehouse.saveSettings" + ], + "notes": [ + "代码依据:app/service/systems/setting/warehouse.js#WAREHOUSE_SETTING_FIELDS 已有 key=big_group_pack_coefficient(name=大团购打包系数,type=number,default=3,required=false,min=0.1,description=大团购波次(wave_scope=1)打包中,扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒,单位:秒/单,默认 3,必须大于 0);app/model/store.js#DEFAULT_SUBJECT_CONFIG.big_group_pack_coefficient=3,normalizeSubjectConfig 对非空值 Number() 后校验有限且 >0,非法抛错 subject_config.big_group_pack_coefficient 必须是大于 0 的数字,空值/null/'' 回落默认 3。", + "历史新增来源:该字段为上一期仓库配置新增(changes 已有记录「仓库设置新增大团购打包系数」,当时同步了 setting.warehouse.getSettings 响应与 getFieldMeta 字段元信息,但遗漏 saveSettings 入参文档);本次为文档补漏修正,仅补齐该遗漏,不涉及任何代码变更。", + "文档变更范围:methods/system.json 仅 setting.warehouse.saveSettings 一条(params 在 subject_config.group_order_pack_max_minutes 之后、subject_config.single_weigh_require_pack 之前新增 subject_config.big_group_pack_coefficient;errors 新增对应 400;description 追加补漏说明);根版本 0.3.192 → 0.3.193、updatedAt 保持 2026-09-27;methods/changes/system.json 新增本条(插入数组首位);其余 method 逐字节未变。", + "维护源口径(遗留事项):methods/system.json 的维护源为库表(wms_api_method_doc + wms_method_doc_meta);本次按 docs/api-doc-update-workflow.md 走 npm run doc:api:update 直接写 JSON,未连接数据库、未写库,后续由维护者决定是否同步入库。" + ] + }, + { + "version": "2026.09.27-single-weigh-require-pack", + "date": "2026-09-27", + "type": "updated", + "summary": "新增仓库配置「散单称重是否需要打包」single_weigh_require_pack(默认关闭)+ 散单称重前置打包校验:开启后,订单波次范围 wave_scope 非 1(大团购)/3(小团购)且 pack_status 非 fin 的散单称重被拒绝(业务错误 code=400)。", + "methods": [ + "setting.warehouse.getSettings", + "setting.warehouse.getFieldMeta", + "setting.warehouse.saveSettings", + "order.updateExpressWeighingWeight", + "workbench.sendWeight" + ], + "notes": [ + "代码依据:app/service/systems/setting/warehouse.js#WAREHOUSE_SETTING_FIELDS 新增 key=single_weigh_require_pack(name=散单称重是否需要打包,type=flag,default=false,required=false,位于 big_group_pack_coefficient 与 return_unpack_max_record_minutes 之间);app/model/store.js#DEFAULT_SUBJECT_CONFIG 新增默认 false,normalizeSubjectConfig 仅布尔/like-flag(true/1/'1'/'true' → true;false/0/'0'/'false → false),非法值抛错 subject_config.single_weigh_require_pack 必须是布尔值,未配置时不写该键。", + "校验逻辑(app/service/systems/order_express.js):新增 findOrderWaveAndPackStatus(current→history→dispatch 分表 + 序列表定位优先)/formatPackStatusText(none=未打包、padding=打包中、fin=已打包、error=打包异常,未知值按未打包)/isSingleWeighRequirePack(走 deliveryOrder.getStoreSubjectConfig 带缓存,缺失/读取异常按关闭)/assertSingleOrderPackedForWeigh/buildWeighPackBlockedMessage;_updateSingleOrderWeight 开头调用 assertSingleOrderPackedForWeigh,因此订单模式(order_id>0)与运单号模式(order_id=0)的散单/非团购波次路径均生效;规则:配置开启且 wave_scope ∉ {1,3} 且 pack_status != fin → 业务错误 code=400「散单称重需先完成打包:订单尚未打包(当前打包状态:未打包)」;warehouseId 缺失跳过校验;团购波次 _updateWaveOrderWeight/_updateWaveAllOrdersWeight 不校验。", + "工作台路径(app/service/systems/workbench.js):_sendWeight 订单行查询补充 wave_scope/pack_status,拦截校验后调用 _assertSingleWeighPackedForWeigh,复用 order_express.buildWeighPackBlockedMessage 文案并在末尾追加「 [条码]」,经 workbench.sendWeight 出口以业务失败(code=400)返回。", + "测试证据:test/single_weigh_require_pack.test.cjs(26 用例全部通过,覆盖配置规范化、wave_scope 1/3 跳过、未打包拦截且不落库、已打包放行、配置读取异常降级)。", + "文档变更范围:methods/system.json 更新 5 条 method(setting.warehouse.getSettings 响应新增 subject_config.single_weigh_require_pack;getFieldMeta 描述补新字段元信息;saveSettings 入参补该字段与非法值 400;order.updateExpressWeighingWeight 与 workbench.sendWeight 的 errors 补未打包拦截 400 场景);根版本 0.3.191 → 0.3.192、updatedAt 2026-09-26 → 2026-09-27;methods/changes/system.json 新增本条(插入数组首位)。分组结构、其它 method、响应结构(除 getSettings 新增 1 字段)不变。", + "维护源口径(遗留事项):methods/system.json 的维护源为库表(wms_api_method_doc + wms_method_doc_meta);本次按 docs/api-doc-update-workflow.md 走 npm run doc:api:update 直接写 JSON,未连接数据库、未写库,后续由维护者决定是否同步入库(method-doc-update 或全量 method-doc-import 后重新导出)。" + ] + }, { "version": "2026.09.26-order-packing-returnUnpack-where-person-filter", "date": "2026-09-26", diff --git a/methods/system.json b/methods/system.json index 1ea7d20..b1183e2 100644 --- a/methods/system.json +++ b/methods/system.json @@ -1,8 +1,8 @@ { "module": "system", "description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内", - "version": "0.3.191", - "updatedAt": "2026-09-26", + "version": "0.3.194", + "updatedAt": "2026-09-27", "headers": [ { "name": "platform", @@ -3003,7 +3003,7 @@ }, { "method": "order.updateExpressWeighingWeight", - "description": "更新订单运单称重重量。支持两种模式:1) 订单模式(order_id>0):规则:订单仅一个运单时,直接写入该运单重量;多运单时,必须传 waybill_code 并按运单写入;团购波次批量设置同一重量到波次下所有订单运单,并返回拆单汇总信息(total_weight/split_count/splits/store_name/sys_logistics_name)。2) 运单号模式(order_id=0):从运单号反查订单与波次,散单/非团购波次仅更新单个运单重量,团购波次按 wave_no+business_key 批量设置并返回拆单汇总信息。", + "description": "更新订单运单称重重量。支持两种模式:1) 订单模式(order_id>0):规则:订单仅一个运单时,直接写入该运单重量;多运单时,必须传 waybill_code 并按运单写入;团购波次批量设置同一重量到波次下所有订单运单,并返回拆单汇总信息(total_weight/split_count/splits/store_name/sys_logistics_name)。2) 运单号模式(order_id=0):从运单号反查订单与波次,散单/非团购波次仅更新单个运单重量,团购波次按 wave_no+business_key 批量设置并返回拆单汇总信息。;散单称重前置打包校验:开启仓库配置 single_weigh_require_pack 后,散单路径(订单模式与运单号模式的散单/非团购波次)写入重量前校验订单波次范围与打包状态,wave_scope 非 1(大团购)/3(小团购)且 pack_status 非 fin 时拒绝称重(400);团购波次批量称重不校验;配置缺失/读取异常按关闭处理", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -3126,6 +3126,10 @@ "code": 400, "message": "多运单订单必须传入 waybill_code" }, + { + "code": 400, + "message": "订单未打包" + }, { "code": 404, "message": "未找到有效的订单运单记录" @@ -15159,7 +15163,7 @@ "list": [ { "method": "setting.warehouse.getSettings", - "description": "获取当前登录仓库的 subject_config;subject_config 新增大团购打包系数 big_group_pack_coefficient(数字,默认 3,单位秒/单,必须大于 0,用于 workbench 大团购波次打包时长闸门与倒计时)", + "description": "获取当前登录仓库的 subject_config;subject_config 新增大团购打包系数 big_group_pack_coefficient(数字,默认 3,单位秒/单,必须大于 0,用于 workbench 大团购波次打包时长闸门与倒计时);新增散单称重是否需要打包 single_weigh_require_pack(flag 布尔,默认 false 关闭;开启后散单称重(订单波次范围 wave_scope 非 1 大团购/3 小团购)前必须已打包完成 pack_status=fin,未打包时拒绝称重并返回错误)", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -15304,6 +15308,12 @@ "required": false, "description": "大团购波次(wave_scope=1)打包中,扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒,单位:秒/单,默认 3,必须大于 0" }, + { + "name": "subject_config.single_weigh_require_pack", + "type": "boolean", + "required": false, + "description": "散单称重是否需要打包(flag,默认 false 关闭):开启后散单称重(订单波次范围 wave_scope 非 1 大团购/3 小团购)前必须已打包完成(pack_status=fin),未打包时拒绝称重并返回错误" + }, { "name": "subject_config.return_unpack_max_record_minutes", "type": "number", @@ -15412,7 +15422,7 @@ }, { "method": "setting.warehouse.getFieldMeta", - "description": "获取仓库设置字段元信息;本次 list 新增「大团购打包系数」(key=big_group_pack_coefficient,type=number,default=3,min=0.1,单位秒/单,用于大团购波次打包时长闸门与倒计时)", + "description": "获取仓库设置字段元信息;本次 list 新增「大团购打包系数」(key=big_group_pack_coefficient,type=number,default=3,min=0.1,单位秒/单,用于大团购波次打包时长闸门与倒计时);本次新增「散单称重是否需要打包」(key=single_weigh_require_pack,type=flag,default=false,required=false,开启后散单称重(wave_scope 非 1 大团购/3 小团购)前必须已打包完成 pack_status=fin)", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -15497,7 +15507,7 @@ }, { "method": "setting.warehouse.saveSettings", - "description": "修改仓库设置并清理指定仓库缓存", + "description": "修改仓库设置并清理指定仓库缓存(subject_config 支持部分字段更新,本次新增 subject_config.single_weigh_require_pack);本次文档补漏 subject_config.big_group_pack_coefficient 入参说明(对齐 getSettings/getFieldMeta 与代码实现)", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -15663,6 +15673,20 @@ "source": "body.subject_config", "description": "团购打包最大时长,单位:分钟,默认 40,须为大于 0 的整数" }, + { + "name": "subject_config.big_group_pack_coefficient", + "type": "number", + "required": false, + "source": "body.subject_config", + "description": "大团购波次(wave_scope=1)打包中,扫描其他波次订单至少需等待「当前波次打包数 × 系数」秒,单位:秒/单,默认 3,必须大于 0;非法值报 400:subject_config.big_group_pack_coefficient 必须是大于 0 的数字" + }, + { + "name": "subject_config.single_weigh_require_pack", + "type": "boolean", + "required": false, + "source": "body.subject_config", + "description": "散单称重是否需要打包(flag,默认 false 关闭):开启后散单称重(wave_scope 非 1 大团购/3 小团购)前必须已打包完成(pack_status=fin)。仅接受布尔/like-flag(true/1/'1'/'true' → true;false/0/'0'/'false' → false),非法值报 400:subject_config.single_weigh_require_pack 必须是布尔值" + }, { "name": "subject_config.return_unpack_max_record_minutes", "type": "number", @@ -15800,6 +15824,14 @@ "code": "400", "message": "未识别到当前仓库/参数不合法" }, + { + "code": "400", + "message": "subject_config.single_weigh_require_pack 必须是布尔值(仅接受 true/false/1/0 及其字符串)" + }, + { + "code": "400", + "message": "subject_config.big_group_pack_coefficient 必须是大于 0 的数字(非有限数字或小于等于 0 视为非法)" + }, { "code": "404", "message": "仓库不存在" @@ -35771,7 +35803,7 @@ }, { "method": "workbench.sendWeight", - "description": "工作台称重上报(免登录、免权限、免鉴权,以工作台 token 鉴权):仓库由服务端从 token 解析注入(body 传入 warehouse_id/workbench_id 一律忽略,禁止前端传值),入参条码(运单号)+ 重量(单位克,必须为正整数);条码→运单记录(wms_order_express,按 waybill_code+warehouse_id 精确匹配)→ 定位订单分表(current→history→dispatch,序列表定位优先,命中先查对应分表)→ 更新运单称重重量 weighing_weight(DB 统一单位 g):散单(wave_id=0)仅更新该运单;团购波次(wave_type=1)批量更新波次下所有未拦截订单的运单称重重量并返回 total_weight(单件重量×订单数)与 order_count;非团购波次降级为散单逻辑;拦截流程中的订单不允许称重;写称重操作日志(ORDER_WEIGH,团购逐订单批量写);保留系统日志(systemInit 未声明免日志);成功返回 flag=success、code=200", + "description": "工作台称重上报(免登录、免权限、免鉴权,以工作台 token 鉴权):仓库由服务端从 token 解析注入(body 传入 warehouse_id/workbench_id 一律忽略,禁止前端传值),入参条码(运单号)+ 重量(单位克,必须为正整数);条码→运单记录(wms_order_express,按 waybill_code+warehouse_id 精确匹配)→ 定位订单分表(current→history→dispatch,序列表定位优先,命中先查对应分表)→ 更新运单称重重量 weighing_weight(DB 统一单位 g):散单(wave_id=0)仅更新该运单;团购波次(wave_type=1)批量更新波次下所有未拦截订单的运单称重重量并返回 total_weight(单件重量×订单数)与 order_count;非团购波次降级为散单逻辑;拦截流程中的订单不允许称重;写称重操作日志(ORDER_WEIGH,团购逐订单批量写);保留系统日志(systemInit 未声明免日志);成功返回 flag=success、code=200;散单称重前置打包校验:开启仓库配置 single_weigh_require_pack 后,散单路径(订单 wave_scope 非 1 大团购/3 小团购)在拦截校验后校验打包状态,pack_status 非 fin 时拒绝称重(业务失败 code=400,提示末尾附 [条码]);团购波次批量称重不校验", "isNeedAuth": false, "isNeedLogin": false, "isNeedRight": false, @@ -35893,6 +35925,10 @@ { "code": "400", "message": "订单已被拦截,无法称重 [xxx]" + }, + { + "code": 400, + "message": "订单未打包" } ] },