51 Commits

Author SHA1 Message Date
liufumingren
75a248fdf6 feat: 收货单列表新增 stock_query_where 商品维度过滤(条码/编码/ID) 2026-08-13 21:43:01 +08:00
liufumingren
b436b6dd9e feat: 拦截链路全流程完善 — 新增interceptScan + 运单表同步 + 工单通知
新增:
- order.recheckOrder.interceptScan: 拦截扫描接口,入参运单号,查express标记退回,处理工单,更新订单拦截状态
- afterSale.createInterceptWorkOrdersAndNotify: 共享方法,幂等创建工单+通知快递群

修复:
- confirmIntercept: 补运单is_back同步(仅限is_intercept=Y),补工单创建+通知
- batchIntercept: 补运单is_intercept同步,补工单创建+通知
- batchUnintercept: 补运单is_intercept/is_back清除
- Qimen/OpenAPI cancel: 补运单is_intercept同步,补工单创建+通知
- interceptScan: 删除死查询,加空指针兜底

文档:
- methods/system.json: interceptScan + confirmIntercept 完整API文档
- methods/changes/system.json: 变更记录
2026-08-12 20:47:19 +08:00
liufumingren
3e7c9a7a10 fix: 修复 docs 页面 JS 失效 + 入库 locked_quantity 流水补全 + stock_store 查询条件补全 is_valid
1. docs.js: 修复模板字面量中 '\n' 被服务端解释为换行符导致客户端 JS SyntaxError,所有交互功能失效(搜索/发送按钮)
2. inbound_direct_log.js: batch_no 修正为 effectiveBatchNo;storage 表更新时补全 before_locked_quantity/after_locked_quantity;新增 stock_id 归属校验
3. stock_store.js: 多处查询/更新补全 is_valid='Y' 过滤条件,避免软删除/失效数据泄露或误操作
4. storage/entry.js: 入库完成时补全 storage 表 before_locked_quantity/after_locked_quantity 流水字段
2026-08-09 00:23:42 +08:00
liufumingren
358fef0f71 chore: apply ESLint auto-fixes, JSDoc additions, and CRLF→LF normalization (no logic changes) 2026-08-08 20:28:18 +08:00
liufumingren
61b82512f2 feat(auth): 新增客服组权限授权/取消脚本,更新 dev-agent 配置
- scripts/auth/grant-cs-up.js: 客服组及以上角色批量授权(dev+prod)

- scripts/auth/revoke-cs-up.js: 客服组及以上角色批量取消授权(dev+prod)

- .github/agents/开发.agent.md: 新增关键定位地图第5项-客服组权限授权脚本

- .cursor/agents/wms-dev-agent.md: 同步 dev-agent 配置
2026-08-04 18:08:46 +08:00
liufumingren
8ee12374b3 fix(storage.entry.get): 移除 items[].stock 中多余的 quantity/locked_quantity 字段 2026-08-02 00:34:32 +08:00
liufumingren
315e366c4c feat(inventory): 新增库存异步导出功能
- systemMethods 层:export 提交异步任务 + exportTaskProgress 查询进度
- systems 层:exportInventoryList 导出实现(支持按 stock_id 聚合/按 storage_id 明细)
- 导出任务通过 Redis 缓存管理进度状态(TTL 30min)
2026-08-01 03:45:16 +08:00
liufumingren
fb2c00027e refactor(storage.receiving): 导出功能 storeId 改为从 ctx.user.store_id 获取 warehouseId;新增导出相关接口文档 2026-07-27 17:46:56 +08:00
liufumingren
81350c0d6b fix: 定时任务同步日志 + 基础设施修复 + 权限迁移(收尾)
【定时任务】sync_outbound_orders_to_delivery: 执行日志写缓存 + 错误详情提取(parent/validation)

【基础设施】system.js: snake_case→camelCase 服务路由转换(兼容 express_interface 等)

【看板】dashboard: queryWarehouseStats 支持 storeId 货主维度过滤

【订单基类】order/base: getOrderModel 兼容无上下文时传入 warehouseId(货主侧场景)

【库存】inventory: 全量移库软删除→硬删除(force destroy)释放唯一键 + 唯一约束/校验错误友好提示

【快递平台】express_platform: KS(快手)平台 receiver.phone 不传(平台要求)

【迁移】delivery 自增起点 + supervisor CS 权限修复
2026-07-27 03:49:27 +08:00
liufumingren
510b87632a feat(stock): 库存/仓库模块货主侧查询与报表增强
- stock/warehouse: 新增 externalList/externalExport(外仓/货主维度查询)

- storeWarehouse/store: 新增货主侧接口(list/get 等)

- stock_store: getWarehouseStock 支持 externalWarehouseId/externalStoreId

- store_warehouse: 合同关系改为单向维度查询(不再 OR 两边)

- storage/report: 库存报表支持 store 维度 + stockIds/keyword 精确筛选

- stock/transaction: storeList/exportStore store_id 从 ctx 获取防越权

- stock_warehouse: getStockDetails 支持显式传 null 跳过仓库过滤

- storage/management: 储位分配待处理排除待审核(step=1)订单
2026-07-27 03:48:06 +08:00
liufumingren
3c53b3c8fa feat(storage): 入库/收货模块货主侧功能 (listStore, export)
- entry: 新增 listStore(货主维度列表)、export/exportTaskProgress(异步导出)

- entry: 新增 storeExport/storeExportTaskProgress(货主侧导出)

- receiving: 新增 getStoreReceivingList(货主维度收货单查询)

- receiving: 新增 export 异步导出 + fix 时间字段 created_at→updated_at

- 迁移: receiving_detail creator_id 去 zerofill + 货主收货权限
2026-07-27 03:47:49 +08:00
liufumingren
a69fd3f393 fix(storage.entry): 入库超量静默裁剪 + containerList 按可用量过滤
1. inbound_direct_log._addSingleItem: 入库数量超过计划时不再拒绝,改为静默裁剪为 maxAllowed(仅无可入数量时拒绝)
2. storage/entry.containerList: NOT EXISTS 一刀切排除改为计算 actual_quantity - SUM(已占用),只返回可用量>0的收货明细
2026-07-23 17:42:28 +08:00
liufumingren
3e813c4975 fix: 将 storage.report 模块迁移至 stock.report,修正语义错误
库存报表属于 stock(商品库存)域而非 storage(库位存储)域。

变更:
- systemMethods/storage/report.js → systemMethods/stock/report.js
- 类名 StorageReportMethodService → StockReportMethodService
- 缓存键 storage_report_export_ → stock_report_export_
- 日志前缀 [storage.report] → [stock.report]
- methods/system.json: module + 5 method 名同步更新
- methods/changes/system.json: 追加迁移记录
- systems/storage/entry.js: 注释引用修正

旧文件直接删除,不保留兼容(旧 method 名为语义错误)。
2026-07-17 00:30:54 +08:00
liufumingren
6d58d7ff1f docs: 仓储报表微调 + methods 接口文档同步更新
- storage/report: 报表逻辑微调

- methods/system.json: storeWarehouse 系列接口文档更新

- methods/changes/system.json: 新增 2026.07.08/07.09 变更记录
2026-07-09 03:36:19 +08:00
liufumingren
d1818ae0bf fix: 修复 receiving.js 编码损坏导致语法错误(use_status → warehouse_use_status 重做) 2026-07-06 22:19:34 +08:00
liufumingren
76c52fa268 use_status 重命名为 warehouse_use_status,新增 store_use_status;仓库/货主侧独立控制签约使用状态,unbind 按身份分派字段 2026-07-06 22:12:23 +08:00
liufumingren
df1bd38601 商品流水增加锁定类目语义类型 2026-07-06 19:28:45 +08:00
liufumingren
7d92522c2f 库存报表导出增加新字段 2026-07-06 17:18:35 +08:00
liufumingren
7f05b26db2 1 2026-07-04 21:40:31 +08:00
liufumingren
5d7964132e 1 2026-07-03 16:56:39 +08:00
liufumingren
478ad2ab0d 1 2026-07-03 16:10:46 +08:00
liufumingren
5ef99e3bed 1 2026-07-01 14:00:59 +08:00
liufumingren
e7fcd2549e 20260625 2026-06-25 02:01:59 +08:00
liufumingren
569a25390f 1 2026-06-24 07:36:43 +08:00
liufumingren
77435aeb79 1 2026-06-23 18:48:33 +08:00
liufumingren
025184904a 1 2026-06-14 19:03:58 +08:00
liufumingren
eb100b056d 1 2026-06-07 01:52:06 +08:00
liufumingren
8cf2c5befa 1 2026-05-20 16:31:29 +08:00
liufumingren
1d70c01631 1 2026-05-17 22:59:57 +08:00
liufumingren
cd01be6fbd 收货部分更改 2026-05-17 21:51:46 +08:00
liufumingren
e23bf4f15e 1 2026-05-17 03:23:57 +08:00
liufumingren
9845a239e2 1 2026-05-16 02:44:53 +08:00
liufumingren
61c530c0cc 1 2026-05-14 04:00:07 +08:00
liufumingren
d711ba9c21 0506更新
Co-authored-by: Copilot <copilot@github.com>
2026-05-06 17:53:54 +08:00
liufumingren
77fe27008c Merge branch 'ming' of ssh://192.168.9.101:22/liufumingren/WMS_MAIN into ming 2026-05-06 01:33:52 +08:00
liufumingren
9b2cc5fc73 fix(receiving): 修复获取收货单时重复定义属性的问题 2026-05-06 01:32:55 +08:00
liufumingren
0c3aae0322 fix(receiving): 修复获取收货单时重复定义属性的问题 2026-04-30 19:23:26 +08:00
liufumingren
5ce689d771 1
Co-authored-by: Copilot <copilot@github.com>
2026-04-30 19:20:31 +08:00
liufumingren
b7f980188f 1
Co-authored-by: Copilot <copilot@github.com>
2026-04-29 17:43:54 +08:00
liufumingren
0ffe290a21 chore: commit all current workspace changes 2026-04-27 16:09:26 +08:00
liufumingren
622869787a feat: sync workspace changes 2026-04-17 19:21:57 +08:00
liufumingren
e73a311076 ok 2026-04-11 17:09:06 +08:00
liufumingren
57f1f44bae feat: sync wms updates 2026-04-09 15:45:14 +08:00
liufumingren
3d824a3a1d chore: sync lint and service fixes 2026-04-09 01:36:49 +08:00
liufumingren
e590808062 feat: update receiving notification and report flow 2026-04-05 21:45:18 +08:00
liufumingren
920d201c0e feat: refine setting role/account/permission auth and tests 2026-04-05 09:03:50 +08:00
liufumingren
2f838186de chore: sync updates and daylog 2026-03-26 2026-03-25 23:26:10 +08:00
liufumingren
b9e94f1035 chore: 提交当前工作区改动 2026-03-25 18:12:04 +08:00
liufumingren
bbc5891d16 chore: sync workspace changes 2026-03-23 17:10:07 +08:00
liufumingren
39a882f2c9 docs: 重写README,完善项目说明 2026-03-22 01:19:55 +08:00