From 145fc04022e83c009cfd845be321c197a6b0d878 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Fri, 21 Aug 2026 02:20:48 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=E4=BB=93=E5=BA=93?= =?UTF-8?q?=20webhook=20=E9=85=8D=E7=BD=AE=E5=B9=B6=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除 subject_config.webhook_enabled/callback_strategy 配置与校验 - 修正 package-lock 项目名 oms -> wms - methods 文档同步 searchSpaces/领料/命中数口径/打印合并/手动单归属等变更记录 --- AI_METHOD_ROUTING.md | 8 +- app/model/store.js | 12 -- app/service/systems/setting/warehouse.js | 20 --- methods/changes/system.json | 160 ++++++++++++++++++ methods/system.json | 198 ++++++++++++++++++++++- package-lock.json | 4 +- 6 files changed, 357 insertions(+), 45 deletions(-) diff --git a/AI_METHOD_ROUTING.md b/AI_METHOD_ROUTING.md index afa7e3c..a3d6db6 100644 --- a/AI_METHOD_ROUTING.md +++ b/AI_METHOD_ROUTING.md @@ -153,8 +153,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods - list - app/service/systemMethods/dashboard.js (6) - storeStats, warehouseStats, hot_order_rank, express_ratio, platform_distribution, order_trend -- app/service/systemMethods/index.js (13) - - fastWhereTree, loadStores, getCOSUploadConfig, getImages, uploadSuccessNotify, ReferenceFile, getMessageDetail, getI18nMessage, putI18nCollect, extractModule, tryAutoTranslateNewKeys, searchSpace, getExpressList +- app/service/systemMethods/index.js (14) + - fastWhereTree, loadStores, getCOSUploadConfig, getImages, uploadSuccessNotify, ReferenceFile, getMessageDetail, getI18nMessage, putI18nCollect, extractModule, tryAutoTranslateNewKeys, searchSpace, searchSpaces, getExpressList - app/service/systemMethods/order.js (11) - getWarehouseId, getOrderModels, applyDateRange, buildWhere, parseDateTime, list, detail, listItems, stats, updateStatus, updateDeliveryTime - app/service/systemMethods/print.js (3) @@ -215,8 +215,8 @@ rg "class .*Service|module.exports" app/service/qimenMethods - listTemplatesByType, getTree, getTemplatesByType, save, getBusinessTypesAndItem, getGroupedPrintItems, getTableConfigs, clearBusinessTypesCache, getXmlByTemplate, buildXmlFromElements, renderElement, computeItemStyle, computeTableItemStyle, renderTable - app/service/systems/sign.js (10) - Constants, toXml, signTopRequest, verifyTopRequest, verifyAndExtractParams, generateSignedParams, encryptHMAC, encryptHMACSHA256, encryptMD5, byte2hex -- app/service/systems/space.js (1) - - searchSpace +- app/service/systems/space.js (2) + - searchSpace, searchSpaces - app/service/systems/stock_store.js (34) - create, initQimenStockData, convertToQimenFormat, getItemInfoWithCache, getItemStorages, _calculateCacheTTL, clearItemStorageCache, lockItemStorages, ID, inbound, outbound, checkAndCreateWarehouseStock, getWarehouseStock, buildSequelizeCondition, processConditionValue, formatDate, isEmptyValue, getProhibitedType, getBarcodes, handleBatchChange, saveWarehouseStockBarcode, getStoreStocks, bindItem, unbindItem, getInfo, saveWarehouseStock, createWarehouseStock, validateSaveParams, stockLog, checkItemCodeUnique, handleBatchDelete, deleteUnit, deleteProhibited, search - app/service/systems/storage/index.js (1) diff --git a/app/model/store.js b/app/model/store.js index 783d3bc..c70cbfc 100644 --- a/app/model/store.js +++ b/app/model/store.js @@ -326,18 +326,6 @@ module.exports = app => { } } - if (Object.prototype.hasOwnProperty.call(parsed, 'webhook_enabled')) { - normalized.webhook_enabled = normalizeBooleanFlag(parsed.webhook_enabled, 'subject_config.webhook_enabled'); - } - - if (Object.prototype.hasOwnProperty.call(parsed, 'callback_strategy')) { - const strategy = String(parsed.callback_strategy || '').trim().toLowerCase(); - if (strategy && ![ 'sync', 'async' ].includes(strategy)) { - throw new Error('subject_config.callback_strategy 仅支持 sync 或 async'); - } - normalized.callback_strategy = strategy || 'async'; - } - normalized.inventory_warning_rules = normalizeInventoryWarningRules(parsed.inventory_warning_rules); normalized.auto_outbound_rules = normalizeAutoOutboundRules(parsed.auto_outbound_rules); diff --git a/app/service/systems/setting/warehouse.js b/app/service/systems/setting/warehouse.js index e9d804c..77a1856 100644 --- a/app/service/systems/setting/warehouse.js +++ b/app/service/systems/setting/warehouse.js @@ -189,26 +189,6 @@ const WAREHOUSE_SETTING_FIELDS = Object.freeze([ required: false, description: '可配置多个库存预警项,每项包含 name、key、expire_days、tip_text', }), - Object.freeze({ - key: 'webhook_enabled', - name: '是否启用 Webhook', - type: 'flag', - default: false, - required: false, - description: '控制仓库是否启用 Webhook 事件推送', - }), - Object.freeze({ - key: 'callback_strategy', - name: '回调策略', - type: 'enum', - default: 'async', - required: false, - description: '仓库 Webhook 事件的回调执行策略', - options: [ - Object.freeze({ value: 'sync', label: '同步回调' }), - Object.freeze({ value: 'async', label: '异步回调' }), - ], - }), Object.freeze({ key: 'auto_outbound_rules', name: '自动出库规则', diff --git a/methods/changes/system.json b/methods/changes/system.json index 92e3a32..f6d7c21 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -1,4 +1,164 @@ [ + { + "version": "2026.08.21-index.searchSpaces-batch-search", + "date": "2026-08-21", + "type": "added", + "summary": "新增 index.searchSpaces 批量库位查询接口:keywords 传入字符串数组,逐项按当前仓库上下文模糊查询(space_code/custom_barcode/custom_name,每项最多 50 条),结果按传入顺序以二维数组返回,无记录对应项返回空数组。", + "methods": [ + "index.searchSpaces" + ], + "notes": [ + "app/service/systems/space.js 抽取 _searchByKeyword 私有查询方法(searchSpace 与 searchSpaces 共用同一查询口径),新增 searchSpaces 并行查询每个关键字并保持传入顺序输出,无记录项返回 []", + "app/service/systemMethods/index.js 新增 searchSpaces 出口方法,并加入 _noNeedRight/_noNeedAuth 白名单(与 searchSpace 一致,免鉴权免权限、需登录)", + "同步更新 methods/system.json 与 AI_METHOD_ROUTING.md" + ], + "module": "index" + }, + { + "version": "2026.08.20-order.wave.matched-count-same-express-split", + "date": "2026-08-20", + "type": "fixed", + "summary": "order.wave.waveStrategyList 的 matched_order_count_filtered 计数口径与按策略抓取保持一致:require_same_express=1 的策略按「结构(items_hash)+快递」分组计数并应用 min/max_same_structure,不再仅按结构分组统计,避免列表显示有命中订单但 waveStrategyFetchAdmin 实际抓取为 0 的口径不一致。", + "methods": [ + "order.wave.waveStrategyList" + ], + "notes": [ + "app/service/systemMethods/order/wave.js getWaveStrategyMatchedOrderCountFilteredMap 改为接收策略行数组并按 require_same_express 拆分两类计数查询:同快递策略按 items_hash+快递(sys_logistics_code>logistics_code>logistics_name COALESCE 口径)分组,其余仅按 items_hash 分组;max_same_structure<=0 视为不设上限,与抓取候选 SQL 归一化一致;调用方 waveStrategyList 改传当前页策略行 list", + "同步更新 methods/system.json 中 matched_order_count_filtered 字段描述" + ], + "module": "order" + }, + { + "version": "2026.08.20-pick.waveClaimScan-print-gate", + "date": "2026-08-20", + "type": "enhanced", + "summary": "pick.waveClaimScan 新增波次打印校验:整波领料前检查波次下全部订单 print_status,存在未打印订单(print_status != fin)时返回 400「波次未打印,禁止领料」(data 含 wave_id、wave_no、unprinted_order_count、total_order_count),波次全部打印后才允许将订单 claim_status 置为 fin;已全部领料幂等结果优先返回,不受打印校验拦截。", + "methods": [ + "pick.waveClaimScan" + ], + "notes": [ + "app/service/systemMethods/pick.js waveClaimScan 波次订单查询 attributes 增加 print_status,already_claimed 幂等判断之后插入打印校验:unprinted_order_count > 0 时 fail 400「波次未打印,禁止领料」", + "同步更新 methods/system.json 中 pick.waveClaimScan 的 description 与 400 错误说明" + ], + "module": "pick" + }, + { + "version": "2026.08.20-pick.waveClaimScan-source-gate", + "date": "2026-08-20", + "type": "enhanced", + "summary": "pick.waveClaimScan 整波领料资格判定收敛为仅普通波次(wms_wave_batch.source=0)生效:符合时将该波次下全部未领单订单 claim_status 置为 fin 并返回 wave_id/wave_no 与领单说明;策略抓取波次(source=1/2)返回「该波次为抓取波次,无需领料」(data 含 no_claim_needed=true、wave_id、wave_no);波次已全部领料返回 already_claimed 并提示「该波次已领料,无需重复领取」;面单号无记录/订单不在待处理订单表返回 404 无记录提示。", + "methods": [ + "pick.waveClaimScan" + ], + "notes": [ + "app/service/systemMethods/pick.js waveClaimScan 资格判定由(大团购 wave_type=1 且 pick_mode=5 / 非抓取散单 wave_type=2 且 source=0)改为仅按 source 判定:source=0 全部支持整波领料,source∈{1,2} 返回抓取波次无需领料并携带 no_claim_needed=true、wave_id、wave_no,其余返回不支持提示;already_claimed tip 改为「该波次已领料,无需重复领取」", + "app/dict/businessDict.js OPERATION_CODE 补记 ORDER_WAVE_CLAIM:'领取波次'", + "同步更新 methods/system.json 中 pick.waveClaimScan 的 description/400/404 错误说明" + ], + "module": "pick" + }, + { + "version": "2026.08.19-print-custom-area-stock-merge", + "date": "2026-08-19", + "type": "fixed", + "summary": "修复打印自定义区同库位不同商品被合并为一行的问题:拣货明细聚合键由「库位」改为「库位+stock_id」复合键,仅同一库位同一商品才合并数量;stock_id 缺失时依次回退 order_item_id、商品名称+条码,无法识别商品身份时不再跨行合并。", + "methods": [ + "order.print.getOrderPrintData", + "order.print.getWavePlatformPrintData", + "order.print.getPrintDataByWaybillCodes" + ], + "notes": [ + "app/service/systems/order_print.js buildPrintOrderRowMapWithPicking 阶段五聚合改为 buildPrintItemAggregationKey 复合键(pick_location::stock:stock_id),同库位不同商品保持独立行,数量/条码不再串;stock_id 字段延迟到聚合完成后才删除,避免污染 items JSON" + ], + "module": "order" + }, + { + "version": "2026.08.19-pick.claim-prompt-refine", + "date": "2026-08-19", + "type": "enhanced", + "summary": "领料提示文案细化:pick.query 领单前置校验拦截时直接提示「订单未领料,请先领料后再拣货」;pick.waveClaimScan 对抓取的波次(团购小波次 pick_mode=1、策略抓取散单波次 source=1/2)返回「该波次为抓取波次,无需领料」提示(失败 data 新增 no_claim_needed=true),其余未知类型保留通用不支持提示。", + "methods": [ + "pick.query", + "pick.waveClaimScan" + ], + "notes": [ + "app/service/systemMethods/pick.js query 领单前置校验拦截文案由「该波次尚未领单,请先整波领单后再拣货」改为「订单未领料,请先领料后再拣货」,action=wave_claim 等失败 data 字段不变", + "app/service/systemMethods/pick.js waveClaimScan 资格判定失败时细分提示:抓取波次(wave_type=2 且 source∈{1,2},或 wave_type=1 且 pick_mode=1)返回「该波次为抓取波次,无需领料」并携带 no_claim_needed=true;其他未知类型保留「当前波次类型不支持整波领单」", + "同步更新 methods/system.json 中 pick.query 与 pick.waveClaimScan 的 description/400 错误说明" + ], + "module": "pick" + }, + { + "version": "2026.08.19-pick.query-wave-claim-gate", + "date": "2026-08-19", + "type": "enhanced", + "summary": "pick.query 新增领单前置校验:扫描命中的波次属于大团购(pick_mode=5)或非抓取散单(wms_wave_batch.source=0 普通波次)时,若波次内存在未领单订单(claim_status != fin)则返回 400 并携带 action=wave_claim 提示先整波领单(pick.waveClaimScan),中止拣货任务创建;已全部领单则继续原流程。", + "methods": [ + "pick.query" + ], + "notes": [ + "app/service/systemMethods/pick.js query 在解析目标波次后、活动任务去重前插入领单校验:复用 getWavePickModeByWaveId 与 wms_wave_batch.source 判定波次类型(大团购=wave_type 1 且 pick_mode 5;非抓取散单=wave_type 2 且 source 0),查询波次订单 claim_status,存在未领单订单时 fail 400(data 含 action=wave_claim、wave_id、wave_no、wave_type、wave_source、pick_mode、unclaimed_order_count、total_order_count)", + "同步更新 methods/system.json 中 pick.query 的 description 与 400 错误说明" + ], + "module": "pick" + }, + { + "version": "2026.08.19-pick.waveClaimScan", + "date": "2026-08-19", + "type": "enhanced", + "summary": "新增 pick.waveClaimScan 整波领单接口:PDA 扫描波次内一个面单号后,针对大团购(pick_mode=5 团购大波次)与非抓取的散单(wms_wave_batch.source=0 普通波次)将该波次下全部订单 claim_status 置为 fin(领单完成),并写入 ORDER_WAVE_CLAIM 订单操作日志;团购小波次与策略抓取散单波次不支持整波领单,返回 400;波次已全部领单时返回 already_claimed 幂等结果。", + "methods": [ + "pick.waveClaimScan" + ], + "notes": [ + "app/service/systemMethods/pick.js 新增 waveClaimScan:面单号定位订单(wms_order_express.waybill_code)→ 订单定位波次 → 读取 wms_wave_batch(wave_type/source)与拣货任务 pick_mode 判定资格(大团购=wave_type 1 且 pick_mode 5;非抓取散单=wave_type 2 且 source 0)→ 整波订单 claim_status='fin',并新增 getWavePickModeByWaveId 查询关联拣货模式", + "app/service/systemMethods/pick.js 鉴权配置:waveClaimScan 加入 _noNeedRight/_noNeedAuth(免权限、免仓库有效期校验),保留登录校验与请求日志", + "app/dict/businessDict.js OPERATION_CODE 新增 ORDER_WAVE_CLAIM:'领取波次'", + "同步更新 methods/system.json 中 pick.waveClaimScan 接口文档" + ], + "module": "pick" + }, + { + "version": "2026.08.19-manual-order-stock-store-guard", + "date": "2026-08-19", + "type": "fixed", + "summary": "手工单(order.pendingOrder.createOrder)新增库存归属货主校验:item_id 直接传仓库 stock_id 时,校验 wms_stock_warehouse.store_id 与订单货主 store_id 一致,跨货主传库存将被拒绝,杜绝把其他货主库存挂在当前货主订单下。", + "methods": [ + "order.pendingOrder.createOrder" + ], + "notes": [ + "app/service/systems/delivery_order.js addOrderLines 手工单分支(line.stockId)新增 StockWarehouse 归属校验,不一致时计入 errors 并跳过该行,错误文案:商品《xxx》编码《xxx》库存归属货主(store_id=…)与当前货主(store_id=…)不一致,无法创建订单", + "同步更新 methods/system.json 中 order.pendingOrder.createOrder 的 notes 说明" + ], + "module": "order" + }, + { + "version": "2026.08.19-wave-fallback-excluded-reason-cn-label", + "date": "2026-08-19", + "type": "enhanced", + "summary": "order.wave.waveStrategyFallbackOrderList 响应 excluded_reason 由英文枚举值改为中文标签:locked→已锁定、intercepted→已拦截、printed→已打印、no_match→未匹配策略。", + "methods": [ + "order.wave.waveStrategyFallbackOrderList" + ], + "notes": [ + "app/service/systemMethods/order/wave.js 新增 WAVE_STRATEGY_FALLBACK_EXCLUDED_REASON_LABELS 常量并用于 buildWaveStrategyFallbackOrderListItem,判定优先级不变", + "同步更新 methods/system.json 中该接口 excluded_reason 字段与 list 说明" + ], + "module": "order" + }, + { + "version": "2026.08.19-wave-fallback-excluded-reason-lock-fix", + "date": "2026-08-19", + "type": "fixed", + "summary": "修复 order.wave.waveStrategyFallbackOrderList 所有行 excluded_reason 恒为 locked 的问题:列表行经 normalizeOrderListItem 后 lock_status 已归一化为 Y/N,原判断 lock_status !== 'none' 恒成立导致全部误标 locked;改为兼容归一化值(Y=锁定,N/none/空=未锁定)与原始值(warehouse/store 等),恢复 locked/intercepted/printed/no_match 的正确判定。", + "methods": [ + "order.wave.waveStrategyFallbackOrderList" + ], + "notes": [ + "app/service/systemMethods/order/wave.js buildWaveStrategyFallbackOrderListItem 新增 lockStatus 归一化与 isLocked 判定(Y 或非 none/非 N 的原始值视为锁定),excluded_reason 优先级不变:locked > intercepted > printed > no_match" + ], + "module": "order" + }, { "version": "2026.08.19-order-list-wave-index-range-filter", "date": "2026-08-19", diff --git a/methods/system.json b/methods/system.json index bc78520..5da4f63 100644 --- a/methods/system.json +++ b/methods/system.json @@ -1,8 +1,8 @@ { "module": "system", "description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内", - "version": "0.3.29", - "updatedAt": "2026-08-18", + "version": "0.3.32", + "updatedAt": "2026-08-19", "headers": [ { "name": "platform", @@ -949,6 +949,79 @@ ], "errors": [] }, + { + "method": "index.searchSpaces", + "description": "按当前仓库上下文批量搜索库位(使用 ctx.user.store_id;对每个关键字在 location_space 表中按 space_code/custom_barcode/custom_name 做模糊匹配,结果按传入顺序返回)", + "isNeedAuth": false, + "isNeedLogin": true, + "headers": [ + { + "name": "Authorization", + "type": "string", + "required": true, + "description": "Bearer token" + } + ], + "params": [ + { + "name": "keywords", + "type": "array", + "required": true, + "source": "body", + "description": "搜索关键字数组,每项对 space_code、custom_barcode、custom_name 做模糊匹配(%keyword%);非数组视为空数组" + } + ], + "response": [ + { + "name": "flag", + "type": "string", + "description": "全局调用结果标识,成功时为 success" + }, + { + "name": "code", + "type": "number", + "description": "业务状态码,200 表示成功" + }, + { + "name": "message", + "type": "string", + "description": "返回信息" + }, + { + "name": "data", + "type": "array", + "description": "库位列表的数组,与 keywords 一一对应;每项为库位数组(最多 50 条),无记录时对应项为空数组 []", + "children": [ + { + "name": "id", + "type": "number", + "description": "库位 ID" + }, + { + "name": "space_code", + "type": "string", + "description": "库位编码" + }, + { + "name": "custom_barcode", + "type": "string", + "description": "库位自定义条码" + }, + { + "name": "custom_name", + "type": "string", + "description": "库位自定义名称" + } + ] + }, + { + "name": "total", + "type": "number", + "description": "返回的分组数量(等于 keywords.length)" + } + ], + "errors": [] + }, { "method": "index.listInterfaceTypes", "description": "查询可用的接口类型列表(如奇门仓储、开放接口等)", @@ -4174,6 +4247,7 @@ ], "notes": [ "使用 item_id 直接匹配商品主键,不依赖外部系统商品同步;item_id 可通过 singleitem.synchronize 返回的 itemId 获取", + "手工单 item_id 即仓库 stock_id(wms_stock_warehouse.id),系统会校验该库存记录归属货主与 store_id 一致,跨货主传库存将被拒绝(商品《xxx》库存归属货主与当前货主不一致)", "province/city/area 为必填项,空值返回 400" ] }, @@ -7263,7 +7337,7 @@ { "name": "matched_order_count_filtered", "type": "number", - "description": "按当前仓库且仅统计未在波次(step!=0)并满足同结构区间后的命中订单数" + "description": "按当前仓库且仅统计未在波次(step!=0)并满足同结构区间后的命中订单数;口径与抓取候选一致:require_same_express=1 时按「结构+快递」分组计数,否则仅按结构分组计数" }, { "name": "next_fetch_order_count", @@ -8455,7 +8529,7 @@ "name": "list", "type": "array", "required": true, - "description": "回退候选订单简要列表。数组内对象字段说明见 children;每行含 excluded_reason 标记:locked=订单已锁定(lock_status 非 none)、intercepted=订单已拦截、printed=已完全打印、no_match=未匹配任何波次策略。", + "description": "回退候选订单简要列表。数组内对象字段说明见 children;每行含 excluded_reason 中文标记:已锁定(lock_status 非 none)、已拦截、已打印、未匹配策略。", "children": [ { "name": "id", @@ -8525,7 +8599,7 @@ { "name": "excluded_reason", "type": "string", - "description": "订单进入回退列表的原因枚举:locked(已锁定,lock_status 非 none)/ intercepted(已拦截)/ printed(已完全打印)/ no_match(未匹配任何波次策略)" + "description": "订单进入回退列表的原因(中文标签):已锁定(lock_status 非 none)/ 已拦截 / 已打印 / 未匹配策略" } ] }, @@ -18614,7 +18688,7 @@ "list": [ { "method": "pick.query", - "description": "按 keyword(运单号或波次号)获取或创建当前用户的拣货任务:命中同用户活动任务返回 existing;无活动任务则创建并返回 created;若活动任务归属他人则返回冲突提示。", + "description": "按 keyword(运单号或波次号)获取或创建当前用户的拣货任务:命中同用户活动任务返回 existing;无活动任务则创建并返回 created;若活动任务归属他人则返回冲突提示。新增领单前置校验:扫描命中的波次属于大团购(pick_mode=5)或非抓取散单(wms_wave_batch.source=0 普通波次)时,若波次内存在未领料订单(claim_status != fin)则返回 400 并携带 action=wave_claim 提示「订单未领料,请先领料后再拣货」(pick.waveClaimScan),中止拣货任务创建。", "isNeedAuth": false, "isNeedLogin": true, "headers": [ @@ -18657,7 +18731,7 @@ "errors": [ { "code": 400, - "message": "参数错误或目标波次不满足建任务条件(如 keyword 为空、缺少仓库上下文、目标波次信息不完整、散单波次无可用订单)。" + "message": "参数错误或目标波次不满足建任务条件(如 keyword 为空、缺少仓库上下文、目标波次信息不完整、散单波次无可用订单);大团购/非抓取散单波次未领料时中止建任务并提示「订单未领料,请先领料后再拣货」(失败 data 含 action=wave_claim、wave_id、wave_no、wave_type、wave_source、pick_mode、unclaimed_order_count、total_order_count)。" }, { "code": 401, @@ -19477,6 +19551,116 @@ "message": "提交失败。" } ] + }, + { + "method": "pick.waveClaimScan", + "description": "扫描面单号领取整波(领料)。按面单号(运单号)定位待处理订单表中的订单后反查订单所在波次,仅对普通波次(wms_wave_batch.source=0,含团购/散单)支持整波领料:命中后将该波次下全部未领单订单 claim_status 置为 fin(领料完成)并写入 ORDER_WAVE_CLAIM 订单操作日志,返回波次ID与波次编码;波次下存在未打印订单(print_status != fin)时返回 400「波次未打印,禁止领料」(data 含 wave_id、wave_no、unprinted_order_count);策略抓取波次(source=1/2)无需领料,返回 400 并提示「该波次为抓取波次,无需领料」(失败 data 含 no_claim_needed=true、wave_id、wave_no);面单号查不到订单或订单不在待处理订单表返回 404 提示无记录;波次内订单已全部领料时返回 already_claimed 幂等结果并提示已领料。", + "isNeedAuth": false, + "isNeedLogin": true, + "isNeedRight": false, + "headers": [ + { + "name": "Authorization", + "type": "string", + "required": true, + "description": "Bearer token" + } + ], + "params": [ + { + "name": "waybill_no", + "type": "string", + "required": true, + "source": "body", + "description": "面单号(运单号,wms_order_express.waybill_code)" + } + ], + "response": [ + { + "name": "wave_id", + "type": "number", + "required": true, + "description": "波次ID" + }, + { + "name": "wave_no", + "type": "string", + "required": true, + "description": "波次号" + }, + { + "name": "wave_type", + "type": "number", + "required": true, + "description": "波次类型:1-团购 2-散单" + }, + { + "name": "wave_source", + "type": "number", + "required": true, + "description": "波次来源:0-普通波次 1-管理后台策略任务 2-PDA策略任务" + }, + { + "name": "pick_mode", + "type": "number", + "required": true, + "description": "拣货模式:1-团购小波次 2-散单单品单件 3-散单先拣后分 4-边拣边分 5-团购大波次(0 表示无关联拣货任务)" + }, + { + "name": "matched_order_id", + "type": "number", + "required": true, + "description": "面单号命中的订单ID" + }, + { + "name": "waybill_no", + "type": "string", + "required": true, + "description": "扫描的面单号" + }, + { + "name": "total_order_count", + "type": "number", + "required": true, + "description": "波次下订单总数" + }, + { + "name": "claimed_order_count", + "type": "number", + "required": true, + "description": "本次置为 fin 的订单数(已全部领料时返回 0)" + }, + { + "name": "status", + "type": "string", + "required": true, + "description": "操作结果:claimed(整波领料完成)或 already_claimed(波次已领料)" + }, + { + "name": "tip", + "type": "string", + "required": true, + "description": "提示文案" + } + ], + "errors": [ + { + "code": 400, + "message": "参数错误(waybill_no 为空、缺少仓库上下文、订单未分配波次、波次下无可用订单);波次下存在未打印订单返回「波次未打印,禁止领料」(data 含 wave_id、wave_no、unprinted_order_count);策略抓取波次(source=1/2)返回「该波次为抓取波次,无需领料」(data 含 no_claim_needed=true、wave_id、wave_no);其余不支持类型返回通用提示。" + }, + { + "code": 401, + "message": "未获取到操作人上下文。" + }, + { + "code": 404, + "message": "未查询到该面单号对应的订单(无记录)、订单不在待处理订单表(无记录),或波次不存在/不属于当前仓库。" + }, + { + "code": 500, + "message": "运单模型/订单模型不可用或内部错误。" + } + ] } ] }, diff --git a/package-lock.json b/package-lock.json index b51cb5b..622d6d7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "oms", + "name": "wms", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "oms", + "name": "wms", "version": "1.0.0", "license": "MIT", "dependencies": {