21 Commits

Author SHA1 Message Date
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
d0621dd4ec fix(order): 已取消订单跳过分配储位与分配快递
- order_storage_allocation: allocatePicking 过滤循环校验 status=cancel,已取消订单跳过并记 skipped_reason=order_cancelled,不再锁库存写 picking
- express: createWaybillCodePipeline step1 的 current/dispatch 查询排除 status=cancel,createWaybillCode 事务内再次剔除取消订单(不标记异常、不写失败日志、不取号)
- 新增回归测试:分配储位跳过取消订单、分配快递流水线跳过取消订单
2026-08-17 02:07:29 +08:00
liufumingren
02b3a5e813 fix(order): 订单同步/运单/库位分配防御性修复
- express: 运单查询补充 pay_no/from_key 字段;step 更新增加 status!=cancel 过滤
- order_async: 同步分发前过滤 sync_status=fin 的已完成订单;修复 Op.ne 引用缺失;强制 SELECT FOR UPDATE 重读;多处更新增加 status!=cancel 守卫
- order_storage_allocation: SN/快递分配失败回写增加 status!=cancel 守卫
- methods: allocateExpressCode 文档更新为异步接口说明
2026-08-02 00:38:34 +08:00
liufumingren
b2ae5683e1 feat(order): 波次/拣货/复核透传货主信息 + 取消订单过滤
- wave: 透传 store_id/owner_code/store_remark

- recheckOrder: 波次视图新增 store_id/store_remark,批量查询货主备注

- pick: 分组聚合透传 store_id/owner_code/store_remark/stock

- order_storage_allocation: 储位分配注入 stock_id + 回传排除取消订单

- order_async: 标记异常排除取消状态订单
2026-07-27 03:48:45 +08:00
liufumingren
2817d17fc7 1 2026-07-06 00:33:12 +08:00
liufumingren
7f05b26db2 1 2026-07-04 21:40:31 +08:00
liufumingren
34273c166b 1 2026-07-02 22:08:47 +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
77435aeb79 1 2026-06-23 18:48:33 +08:00
liufumingren
d743e67b9d 1 2026-06-17 01:18:55 +08:00
liufumingren
025184904a 1 2026-06-14 19:03:58 +08:00
liufumingren
99367e5043 1 2026-06-06 05:15:46 +08:00
liufumingren
150e2977d4 修改快递接口配置,拼多多取号,未完成 2026-05-22 08:39:07 +08:00
liufumingren
e23bf4f15e 1 2026-05-17 03:23:57 +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