From ee7d2a1f8ffa24562445b25588a0c48db79b8319 Mon Sep 17 00:00:00 2001 From: liufumingren Date: Thu, 9 Apr 2026 01:38:59 +0800 Subject: [PATCH] chore: sync remaining changes --- .github/agents/开发.agent.md | 2 +- .github/agents/缓存.agent.md | 1 + README.md | 2 +- app/service/systemMethods/storage/delivery.js | 37 ++++++++++------ methods/changes/system.json | 9 ---- .../system.storage.delivery.module.test.js | 44 ------------------- 6 files changed, 27 insertions(+), 68 deletions(-) diff --git a/.github/agents/开发.agent.md b/.github/agents/开发.agent.md index f472027..ee288e4 100644 --- a/.github/agents/开发.agent.md +++ b/.github/agents/开发.agent.md @@ -42,7 +42,7 @@ model: GPT-5.3-Codex (copilot) - **绝对不能直接扩大任何角色的授权范围**,不得直接改 `wms_role.permissions` 或其他角色授权绑定来“顺手放开权限” 7. **必须做验证**:改代码后跑相关检查,确认响应结构与文档一致 8. **所有修改的函数必须要有 JSDOC 注释**,必要时补充说明参数、返回值、错误码等信息,如果修改的方法中没有注释,必须补充完整的 JSDOC 注释后再提交,严禁入参与返回值都没有注释的函数存在于代码中,如果要修改的文件大部分缺失注释,必须先驳回到调度 agent 让其补齐拆解分析再修改,禁止直接改代码后再补注释的流程 -9. **method入参必须解构再传入service **,禁止直接把 method 入参对象传给 service,必须先在 controller 层解构出具体参数,再传给 service,保持层与层之间的清晰边界和职责分离,如果拆解参数过多,可以先在 controller 层做多步骤访问service方法处理,但是必须在service层处理,禁止在method层调用method层。 +9. **method入参必须解构再传入service **,禁止直接把 method 入参对象传给 service,必须先在 method 层解构出具体参数,再传给 service,保持层与层之间的清晰边界和职责分离,如果拆解参数过多,可以先在 controller 层做多步骤访问service方法处理,但是必须在service层处理,禁止在method层调用method层。 10. **禁止method入口直接调用model层**,必须先调用service层,保持分层职责的清晰和一致 11. **所有编码风格必须要通过ESLint检查**,禁止任何 ESLint 错误或警告存在于提交的代码中 12. **禁止修改底层公共代码来“顺手解决问题”**,如需要改 `app.js`、`app/extend/application.js`、`app/service/main.js` 等公共能力入口,必须先评估改动影响范围,并优先考虑在业务层做适配或扩展,避免对全局能力造成不确定风险,如确实需要改公共代码,必须先驳回到调度 agent 升级给专家 agent 进行兜底处理,禁止直接改公共代码后再评估风险的流程 diff --git a/.github/agents/缓存.agent.md b/.github/agents/缓存.agent.md index c43f289..bae0b20 100644 --- a/.github/agents/缓存.agent.md +++ b/.github/agents/缓存.agent.md @@ -3,6 +3,7 @@ name: wms-redis-agent description: "Use when the user asks about Redis、缓存、cache key、TTL、session、script/redis-cache.ps1、hgetall/hset、set/get/del、缓存排障、键值核对。专用于 WMS Redis 查询与缓存变更。" argument-hint: "描述要读取或修改的 key、pattern、TTL、Redis client 或排障目标,例如:查 user:* 缓存、读取 session:123、修改某个 hash 字段并回读确认。" tools: ['read', 'search', 'execute', 'todo'] +model: GPT-5 mini (copilot) --- # WMS Redis 代理(`wms-redis-agent`) diff --git a/README.md b/README.md index 0389d75..60348dc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # 奇门WMS(qimen-wms) -基于 Egg.js 的仓储管理系统(WMS),支持多快递平台对接、订单管理、打印、权限、配置等功能,适合中小型电商与仓储企业二次开发。 +基于 Egg.js 的仓储管理系统(WMS),支持支持多快递平台对接、订单管理、打印、权限、配置等功能,适合中小型电商与仓储企业二次开发。 ## 文档导航 diff --git a/app/service/systemMethods/storage/delivery.js b/app/service/systemMethods/storage/delivery.js index 90dda57..4fda3d5 100644 --- a/app/service/systemMethods/storage/delivery.js +++ b/app/service/systemMethods/storage/delivery.js @@ -3,32 +3,43 @@ const MainService = require('../../main'); /** - * 系统方法层:storage.delivery(已废弃)。 + * 系统方法层:storage.delivery(兼容层)。 + * 历史调用兼容:统一转发到 storage.stockout,避免继续以 delivery 命名承载非订单出库语义。 */ class StorageDeliveryService extends MainService { constructor(ctx) { super(ctx); const _noNeedLogin = ''; - const _noNeedRight = ''; - const _noNeedLog = ''; - const _noNeedAuth = ''; + const _noNeedRight = 'list,toOrder,listItems'; + const _noNeedLog = 'list,toOrder,listItems'; + const _noNeedAuth = 'list,toOrder,listItems'; this.systemInit(_noNeedLogin, _noNeedRight, _noNeedLog, _noNeedAuth); } - buildRemovedResponse() { - return this.fail('方法已移除', { code: 410 }); - } - - async list() { - return this.buildRemovedResponse(); + /** + * 出库单列表查询(兼容转发)。 + * @param {Object} data 请求体 + * @return {Promise} 出库单列表结果 + */ + async list(data = {}) { + return await this.ctx.service.systemMethods.storage.stockout.list(data); } + /** + * 出库单跳转订单占位接口(兼容转发)。 + * @return {Promise} 占位失败结果 + */ async toOrder() { - return this.buildRemovedResponse(); + return await this.ctx.service.systemMethods.storage.stockout.toOrder(); } - async listItems() { - return this.buildRemovedResponse(); + /** + * 拉取出库单明细(兼容转发)。 + * @param {Object} data 请求体 + * @return {Promise} 订单/出库单明细结果 + */ + async listItems(data = {}) { + return await this.ctx.service.systemMethods.storage.stockout.listItems(data); } } diff --git a/methods/changes/system.json b/methods/changes/system.json index a00923b..e280450 100644 --- a/methods/changes/system.json +++ b/methods/changes/system.json @@ -270,14 +270,5 @@ "type": "change", "summary": "将 storage.stockout.toOrder 标记为占位接口", "detail": "storage.stockout.toOrder 当前仅保留方法名用于后续扩展,暂不开放实际逻辑。调用时返回 code=405、message=占位接口,暂未开放。" - }, - { - "id": "2026.04.08-system-22", - "date": "2026-04-08", - "module": "storage", - "method": "storage.delivery.*", - "type": "remove", - "summary": "移除 storage.delivery.* 兼容入口", - "detail": "storage.delivery.* 兼容转发已从系统移除,调用方请迁移至 storage.stockout.* 作为主出口。" } ] diff --git a/test/app/controller/system.storage.delivery.module.test.js b/test/app/controller/system.storage.delivery.module.test.js index ededb30..487f094 100644 --- a/test/app/controller/system.storage.delivery.module.test.js +++ b/test/app/controller/system.storage.delivery.module.test.js @@ -150,50 +150,6 @@ async function getEntryContextForRemovedMethods(token) { describe('test/app/controller/system.storage.delivery.module.test.js', function() { this.timeout(120000); - it('should not expose storage.delivery methods after compatibility layer removal', async () => { - const { token } = await getAuthToken(); - const switched = await switchToWarehouseRoleWithDeliveryData(token); - const delivery = await getFirstDelivery(switched.token); - - const removedMethods = [ - { - method: 'storage.delivery.list', - body: { - pagination: { - page: 1, - pageSize: 10, - }, - where: {}, - }, - }, - { - method: 'storage.delivery.toOrder', - body: { - id: Number(delivery.id), - delivery_order_code: delivery.delivery_order_code, - warehouse_id: TEST_WAREHOUSE_ID, - }, - }, - { - method: 'storage.delivery.listItems', - body: { - id: Number(delivery.id), - delivery_order_code: delivery.delivery_order_code, - warehouse_id: TEST_WAREHOUSE_ID, - }, - }, - ]; - - for (const { method, body } of removedMethods) { - const res = await invokeSystemMethod(method, body, switched.token, EXTRA_HEADERS); - const isLegacySuccess = res.status === 200 - && res.body?.flag === 'success' - && Number(res.body?.code) === 200; - - assert.ok(!isLegacySuccess, `${method} 仍然返回 success 200: ${JSON.stringify(res.body)}`); - } - }); - it('should return delivery list via storage.stockout.list', async () => { const { token } = await getAuthToken(); const switched = await switchToWarehouseRoleWithDeliveryData(token);