From 6701e661c549acb9b8de0464f62f32626c84eb8a Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 10 Sep 2026 23:52:43 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E6=8B=A3=E8=B4=A7=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E6=8C=89=E6=8B=A3?= =?UTF-8?q?=E8=B4=A7=E8=BD=A6=E7=BC=96=E7=A0=81=20cart=5Fcode=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/service/systemMethods/order/wave.js | 12 +- methods/changes/system.json | 17 +++ methods/system.json | 9 +- .../order/wave.wavePickTaskList.test.js | 109 +++++++++++++++++- 4 files changed, 142 insertions(+), 5 deletions(-) diff --git a/app/service/systemMethods/order/wave.js b/app/service/systemMethods/order/wave.js index 94dcb95..34f3143 100644 --- a/app/service/systemMethods/order/wave.js +++ b/app/service/systemMethods/order/wave.js @@ -1855,7 +1855,7 @@ class WaveService extends OrderBaseService { * 归一化拣货任务列表请求参数。 * * 兼容顶层筛选参数与 where 结构并保持旧调用可用: - * - 顶层支持 warehouse_id/status/source/keyword/task_no + * - 顶层支持 warehouse_id/status/source/keyword/task_no/cart_id/cart_code * - 同名字段优先使用顶层值覆盖 where * - warehouse_id 未传时回退当前仓库上下文 * @@ -1886,6 +1886,7 @@ class WaveService extends OrderBaseService { 'review_user_name', 'claim_operator', 'cart_id', + 'cart_code', 'start_time_start', 'start_time_end', ].forEach(mergeFieldFromTopLevel); @@ -1941,6 +1942,7 @@ class WaveService extends OrderBaseService { 'task_no', 'wave_no', 'cart_id', + 'cart_code', 'keyword', 'start_time_start', 'start_time_end', @@ -2042,6 +2044,9 @@ class WaveService extends OrderBaseService { appendNameCondition('review_user_name', 't.review_user_name', 'whereReviewUserName'); appendNameCondition('claim_operator', 't.claim_operator', 'whereClaimOperator'); appendNameCondition('wave_no', 't.batch_no_array', 'whereWaveNo'); + // 拣货车编码:主表冗余的绑定快照(current_cart_code_snapshot),与列表返回字段同源, + // 支持操作符对象 { operator: 'like'|'notlike'|'eq', value },默认 like + appendNameCondition('cart_code', 't.current_cart_code_snapshot', 'whereCartCode'); const keyword = normalizedWhere.keyword; if (keyword !== undefined && keyword !== null && keyword !== '') { @@ -2055,6 +2060,7 @@ class WaveService extends OrderBaseService { OR t.pick_user_name LIKE :whereKeyword OR t.review_user_name LIKE :whereKeyword OR t.batch_no LIKE :whereKeyword + OR t.current_cart_code_snapshot LIKE :whereKeyword )`); replacements.whereKeyword = `%${normalizedKeyword}%`; } @@ -5161,8 +5167,8 @@ class WaveService extends OrderBaseService { }); } catch (error) { const errorMessage = String(error && error.message || '').trim(); - const isBadRequest = /参数|上下文/.test(errorMessage); - return this.fail(`查询拣货任务列表失败: ${errorMessage || '未知错误'}`, isBadRequest ? 400 : 500); + const isBadRequest = /参数|上下文|不支持/.test(errorMessage); + return this.fail(`查询拣货任务列表失败: ${errorMessage || '未知错误'}`, {}, isBadRequest ? 400 : 500); } } diff --git a/methods/changes/system.json b/methods/changes/system.json index 92050a3..5ecdb36 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -8862,5 +8862,22 @@ "代码变更:app/service/systems/storage/inventory.js#directPutaway、app/service/systemMethods/storage/inventory.js#directPutaway(_noNeedAuth 新增 directPutaway)、methods/system.json 新增 method 文档、database/migrations/20260824 新增权限记录(path=storage.inventory.directPutaway)。" ], "module": "storage" + }, + { + "version": "2026.09.10-order.wave.wavePickTaskList-cart-code", + "date": "2026-09-10", + "type": "updated", + "summary": "order.wave.wavePickTaskList 新增 cart_code 筛选:按拣货车编码查询拣货任务", + "methods": [ + "order.wave.wavePickTaskList" + ], + "notes": [ + "新增 cart_code 过滤字段,匹配拣货任务主表快照字段 wms_wave_pick_task.current_cart_code_snapshot(与列表返回的 current_cart_code_snapshot 同源),支持操作符对象 { operator: 'like'|'notlike'|'eq', value },默认 like;顶层 cart_code 与 where.cart_code 均支持,顶层参数优先。", + "keyword 关键字搜索同步覆盖 current_cart_code_snapshot 字段(此前文档已声明支持,本次代码补齐)。", + "代码变更:app/service/systemMethods/order/wave.js#normalizeWavePickTaskListRequest 新增 cart_code 顶层合并、#buildWavePickTaskListWhereClause 新增 cart_code 白名单与条件拼接(复用 appendNameCondition)。", + "顺带修正:该接口失败响应未透传业务码(this.fail(msg, 400) → this.fail(msg, {}, 400/500)),并将「不支持的 operator」类入参错误归为 400,与其它 systemMethods 约定及本文档错误码一致。", + "测试:test/app/service/systemMethods/order/wave.wavePickTaskList.test.js 补充 cart_code 操作符/默认模糊/顶层优先/keyword 覆盖用例,并修复原 mock 缺失 QueryTypes.SELECT 导致的既有用例失败。" + ], + "module": "order" } ] diff --git a/methods/system.json b/methods/system.json index 8627270..d53be91 100644 --- a/methods/system.json +++ b/methods/system.json @@ -1,7 +1,7 @@ { "module": "system", "description": "系统接口标准入口,method 对应系统内置方法,全部使用 POST 请求,参数统一放在 body 内", - "version": "0.3.109", + "version": "0.3.110", "updatedAt": "2026-09-10", "headers": [ { @@ -9209,6 +9209,13 @@ "source": "body", "description": "拣货车/作业车ID" }, + { + "name": "cart_code", + "type": "string", + "required": false, + "source": "body", + "description": "拣货车编码;匹配拣货任务主表绑定快照 current_cart_code_snapshot,支持模糊匹配,也支持操作符对象 { operator: 'like'|'notlike'|'eq', value }(默认 like,如 { operator: 'eq', value: 'car08' })" + }, { "name": "keyword", "type": "string", diff --git a/test/app/service/systemMethods/order/wave.wavePickTaskList.test.js b/test/app/service/systemMethods/order/wave.wavePickTaskList.test.js index acb420d..998f4e7 100644 --- a/test/app/service/systemMethods/order/wave.wavePickTaskList.test.js +++ b/test/app/service/systemMethods/order/wave.wavePickTaskList.test.js @@ -23,6 +23,9 @@ function createHarness() { store_id: 100000, }, model: { + QueryTypes: { + SELECT: 'SELECT', + }, async query(sql, queryOptions = {}) { const normalizedSql = String(sql || '').replace(/\s+/g, ' ').trim(); captures.sqlList.push(normalizedSql); @@ -32,6 +35,19 @@ function createHarness() { return [[{ total: 2 }]]; } + // 波次关联表查询(批量补全 wave_list)走 QueryTypes.SELECT,直接返回行数组 + if (/wms_wave_pick_task_wave/i.test(normalizedSql)) { + return [{ + task_id: 501, + wave_id: 9001, + wave_no: 'W20260508001', + box_no: 1, + status: 1, + bind_time: '2026-05-08 10:05:00', + pick_time: '2026-05-08 10:30:00', + }]; + } + return [[{ id: 501, task_no: 'WPT100000117892299991ABCDEF', @@ -49,7 +65,10 @@ function createHarness() { review_user_name: '', current_cart_id: 11, current_cart_code_snapshot: 'CART-11', + cart_name: '拣货车11', batch_no: 'BATCH-1', + claim_operator_id: 0, + claim_operator: '', device_id: 'PDA-1', start_time: null, finish_time: null, @@ -95,18 +114,34 @@ describe('test/app/service/systemMethods/order/wave.wavePickTaskList.test.js', ( box_count: 2, pick_user_id: 9001, pick_user_name: 'tester', + operator_id: 9001, + operator_name: 'tester', review_user_id: 0, review_user_name: '', current_cart_id: 11, current_cart_code_snapshot: 'CART-11', + cart_name: '拣货车11', batch_no: 'BATCH-1', + claim_operator_id: null, + claim_operator: null, device_id: 'PDA-1', start_time: null, + start_at: null, finish_time: null, + finish_at: null, review_start_time: null, review_finish_time: null, create_time: '2026-05-08 10:00:00', + created_at: '2026-05-08 10:00:00', update_time: '2026-05-08 10:00:00', + wave_list: [{ + wave_id: 9001, + wave_no: 'W20260508001', + box_no: 1, + status: 1, + bind_time: '2026-05-08 10:05:00', + pick_time: '2026-05-08 10:30:00', + }], }); }); @@ -123,7 +158,8 @@ describe('test/app/service/systemMethods/order/wave.wavePickTaskList.test.js', ( }); assert.equal(result.flag, 'success'); - assert.equal(captures.sqlList.length, 2); + // 依次为:列表查询、计数查询、wave_list 补全查询 + assert.equal(captures.sqlList.length, 3); const listSql = captures.sqlList[0]; const listReplacements = captures.replacementList[0]; @@ -140,4 +176,75 @@ describe('test/app/service/systemMethods/order/wave.wavePickTaskList.test.js', ( assert.equal(result.page, 2); assert.equal(result.page_size, 50); }); + + it('cart_code 操作符对象应过滤 current_cart_code_snapshot', async () => { + const { service, captures } = createHarness(); + + const result = await service.wavePickTaskList({ + warehouse_id: 100000, + page_no: 1, + page_size: 20, + where: { + cart_code: { operator: 'eq', value: 'car08' }, + }, + }); + + assert.equal(result.flag, 'success'); + + const listSql = captures.sqlList[0]; + const countSql = captures.sqlList[1]; + const listReplacements = captures.replacementList[0]; + + // 列表与计数 SQL 均需带上拣货车编码条件(count SQL 仅用 t 别名,故必须走主表快照字段) + assert.ok(listSql.includes('t.current_cart_code_snapshot = :whereCartCode')); + assert.ok(countSql.includes('t.current_cart_code_snapshot = :whereCartCode')); + assert.equal(listReplacements.whereCartCode, 'car08'); + }); + + it('cart_code 默认模糊匹配且顶层参数优先于 where', async () => { + const { service, captures } = createHarness(); + + const result = await service.wavePickTaskList({ + warehouse_id: 100000, + cart_code: 'CAR', + where: { + cart_code: 'IGNORED', + }, + }); + + assert.equal(result.flag, 'success'); + + const listReplacements = captures.replacementList[0]; + assert.equal(listReplacements.whereCartCode, '%CAR%'); + }); + + it('cart_code 不支持的 operator 应返回 400', async () => { + const { service, captures } = createHarness(); + + const result = await service.wavePickTaskList({ + where: { + cart_code: { operator: 'in', value: 'car08' }, + }, + }); + + assert.equal(result.flag, 'failure'); + assert.equal(result.code, 400); + assert.equal(captures.sqlList.length, 0); + }); + + it('keyword 应覆盖拣货车编码快照字段', async () => { + const { service, captures } = createHarness(); + + const result = await service.wavePickTaskList({ + where: { + keyword: 'car08', + }, + }); + + assert.equal(result.flag, 'success'); + + const listSql = captures.sqlList[0]; + assert.ok(listSql.includes('t.current_cart_code_snapshot LIKE :whereKeyword')); + assert.equal(captures.replacementList[0].whereKeyword, '%car08%'); + }); });