liufumingren
|
60b4babb34
|
feat(order): 订单列表与导出支持波次范围 wave_scope 筛选
- extractWaveScopeVirtualFilter 解析 wave_scope(0=未分配波次/1=团购/2=散单)
- buildWaveScopeWhereCondition 经 wms_wave_batch 反查波次ID注入条件
- list 与 order_export 均接入该虚拟筛选
|
2026-08-21 02:20:13 +08:00 |
|
liufumingren
|
ace0e456a7
|
feat(order): 订单列表联查波次序号副表并支持序号范围筛选
- 所有订单列表联查 wms_order_wave_index 输出 wave_index(9 个工作台列表/复核散单列表/波次策略兜底列表,无记录降级 0)
- 新增 wave_index 虚拟筛选入参:between/eq/in/gt/lt/ge/le/notbetween,between 要求 value 为长度 2 的数组;复核散单列表支持 wave_index_min/wave_index_max
- 订单导出(waybill/item 模式)接入 wave_index 联查并新增波次序号列
- 新增 app/model/order_wave_index.js 副表模型
- 同步 methods/system.json 接口说明与 methods/changes/system.json 变更记录
|
2026-08-19 03:23:50 +08:00 |
|
liufumingren
|
3817948b35
|
feat(order): 锁定订单作业门禁与订单列表 lock_status 转 Y/N
- lock_guard: 新增 isLockedOrderStatus,lock_status 非 none 一律视为已锁定
- 储位分配(allocatePicking)跳过锁定订单,skipped_reason=locked
- 快递分配(createWaybillCodePipeline、wave.batchAllocateExpress)跳过锁定订单并返回 skipped_locked_order_ids
- 抓取波次 singleFetchByIds 排除锁定订单并返回 excluded_locked_order_ids
- 自动加团(delivery_order)锁定订单跳过自动分配快递/储位/自动加团
- 订单列表 normalizeOrderListItem 统一 lock_status 输出 Y/N(none→N,其余→Y)
- 同步 methods/system.json、methods/changes/system.json 文档
|
2026-08-18 16:25:12 +08:00 |
|
liufumingren
|
a8200a3a35
|
feat(order): 订单拦截全链路阻断与作业排除
- 新增 app/lib/intercept_guard 共享守卫:除 none 外所有拦截状态一律视为已拦截
- 分配波次(singleFetchByIds)/抓取波次(createWavePickTask) 排除拦截订单并回传清单
- 分配储位(allocatePicking)/分配快递(createWaybillCodePipeline、batchAllocateExpress) 跳过拦截订单并回报
- 打印组装(getWavePlatformPrintData/getOrderPrintData/getPrintDataByWaybillCodes) 剔除拦截订单,打印回写/波次反查/标记均排除
- 拣货完成(wavePickTaskComplete) 拦截报错;复核(assertOrderCanRecheck/批量快捷复核) 补全拦截状态
- 打包/称重(workbench、order.updateExpressWeighingWeight) 拦截阻断,波次批量操作排除拦截单
- 绑定包材(order_express) 拦截阻断,波次批量绑定排除拦截单
|
2026-08-17 21:58:43 +08:00 |
|
liufumingren
|
7ab67b239a
|
feat: 订单列表新增 stock_query 商品模糊查询条件
所有订单列表接口支持通过 where.stock_query 进行商品维度的模糊筛选:
- 模糊匹配 stock_warehouse 的 item_code(商品编码)、item_name(商品名称)、id(主键)
- 模糊匹配 stock_barcodes 的 barcode(条码)
- 通过 order_items 关联查找匹配的订单 ID 并过滤订单列表
涉及方法:
- base.js: listByModule(覆盖 9 个订单列表入口)
- wave.js: groupOrderFetchList / singleOrderFetchList / waveStrategyFallbackOrderList
- recheckOrder.js: queryRecheckOrderSingleList / queryRecheckOrderGroupList
|
2026-08-05 22:46:58 +08:00 |
|
liufumingren
|
a9a015117f
|
feat(print): 新增打印完成后异步解绑拣货车逻辑
- tryUnbindCartAfterPrintComplete: 接收 waveId,按团购/散单检测任务下所有订单 print_status
- 团购仅小团购(pick_mode=1)触发,统一用订单 print_status != 'none' 判断
- send() express 成功分支异步 fire-and-forget 调用,不阻塞返回
- 解绑时写入 unbind_user_id,从 ctx 上下文提取操作人
- 含 extractUniqueWaveIds 去重 + 18 项单元测试全部通过
|
2026-08-03 21:03:21 +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
|
478ad2ab0d
|
1
|
2026-07-03 16:10:46 +08:00 |
|
liufumingren
|
5ef99e3bed
|
1
|
2026-07-01 14:00:59 +08:00 |
|
liufumingren
|
d743e67b9d
|
1
|
2026-06-17 01:18:55 +08:00 |
|
liufumingren
|
0b207a1c9c
|
1
|
2026-06-10 09:14:05 +08:00 |
|
liufumingren
|
0e50ff6671
|
1
|
2026-06-08 08:58:13 +08:00 |
|
liufumingren
|
c2b5ffc319
|
1
|
2026-06-07 20:42:24 +08:00 |
|
liufumingren
|
99367e5043
|
1
|
2026-06-06 05:15:46 +08:00 |
|
liufumingren
|
9c2b254206
|
1
Co-authored-by: Copilot <copilot@github.com>
|
2026-05-11 08:44:27 +08:00 |
|
liufumingren
|
9b2cc5fc73
|
fix(receiving): 修复获取收货单时重复定义属性的问题
|
2026-05-06 01:32:55 +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
|
e590808062
|
feat: update receiving notification and report flow
|
2026-04-05 21:45:18 +08:00 |
|
liufumingren
|
2f838186de
|
chore: sync updates and daylog 2026-03-26
|
2026-03-25 23:26:10 +08:00 |
|
liufumingren
|
bbc5891d16
|
chore: sync workspace changes
|
2026-03-23 17:10:07 +08:00 |
|