From 1a51150d2c99398518c33be82696367335bf207e Mon Sep 17 00:00:00 2001 From: yin <3313488199@qq.com> Date: Wed, 18 Nov 2026 18:05:41 +0800 Subject: [PATCH] =?UTF-8?q?feat(b2b):=20=E6=96=B0=E5=A2=9E=20B2B=20?= =?UTF-8?q?=E5=A4=87=E8=B4=A7/=E6=8F=90=E8=B4=A7=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=EF=BC=8C=E8=A1=A5=E5=85=A8=E4=B9=A1=E9=95=87?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E9=80=89=E6=8B=A9=E4=B8=8E=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 新增 B2B 作业接口:startB2bPrep / cancelB2bPrep / finishB2bPrep / pickupB2b / setB2bUrgent / cancelB2bUrgent;待处理与配送 B2B 页签新增「开始备货、备货完成、 取消备货、确认提货、加急/取消加急」按钮 - 新增 B2bPrepFinishForm(必填备货备注 + 总箱数校验,完成后同步扣减库存)与 use-b2b-actions 组合式:单行操作校验、确认弹窗、统一 loading 与成功后刷新 - 配送 B2B 页面复用配送页组件,增加 B2B 专用列与 ScanBox 字段,使用独立 cache-key - 新增 utils/chinaStreet:按 area_code 提供乡镇/街道选项,pcas 四級数据懒加载并 按区缓存;vite 将 pcas 单独拆为 vendor-china-division-street 块,避免与 省市区数据合成大 chunk - 新建订单预览行的「镇」改为街道下拉(支持输入新建),行政区数据按需加载; 预览新增「只看异常 N 行」过滤 - 快递接口配置的市/区下拉增加缓存,避免预览表逐格重复遍历 - 退货签收登记列表支持排序白名单(id/scan_date/created_at/updated_at/waybill_code), 重复登记提示补充加急与货主备注;货主签约页新增「发起签约」弹窗与筛选, 店铺接口配置新增「对方主体ID」筛选项 - 移除 storeWarehouse 中未使用的 storeList / queryPrintQuantityLogs 接口 --- .../order.deliveryorder/orderdeliveryOrder.ts | 14 + .../order.pendingorder/orderpendingOrder.ts | 276 ++++++++++++++ src/api/setting.warehouse/settingwarehouse.ts | 2 +- .../storewarehouse.store/storeWarehouse.ts | 45 --- src/utils/chinaStreet.ts | 56 +++ .../components/ReceiveRegisterPanel.vue | 39 +- .../components/ReturnReceivedTaskPanel.vue | 37 +- .../config/order-common-config.ts | 208 +++++++++- .../order/orderManagement/deliveryOrder.vue | 54 ++- .../order/orderManagement/deliveryOrder2b.vue | 2 +- .../form/B2bPrepFinishForm.vue | 357 ++++++++++++++++++ src/views/order/orderManagement/index.vue | 36 +- .../order/orderManagement/pendingOrder.vue | 105 ++++-- .../orderManagement/utils/use-b2b-actions.ts | 304 +++++++++++++++ .../shared/component/SelectProductDialog.vue | 4 +- .../CreatePendingOrderDialog.vue | 312 ++++++++------- .../useCreateOrderSession.ts | 1 - src/views/store/shipperSigning/index.vue | 168 ++++++++- src/views/store/stores/index.vue | 35 +- src/views/store/stores/store-config.ts | 52 +-- .../newview/pages/WarehouseSettingsForm.vue | 2 +- .../express-interface-config.ts | 33 +- vite.config.ts | 7 +- 23 files changed, 1834 insertions(+), 315 deletions(-) create mode 100644 src/utils/chinaStreet.ts create mode 100644 src/views/order/orderManagement/form/B2bPrepFinishForm.vue create mode 100644 src/views/order/orderManagement/utils/use-b2b-actions.ts diff --git a/src/api/order.deliveryorder/orderdeliveryOrder.ts b/src/api/order.deliveryorder/orderdeliveryOrder.ts index 70eefaa0..90334b27 100644 --- a/src/api/order.deliveryorder/orderdeliveryOrder.ts +++ b/src/api/order.deliveryorder/orderdeliveryOrder.ts @@ -236,6 +236,20 @@ export function orderDeliveryOrderList(data: DeliveryOrderListParams = {}): Prom } as any) } +/** + * order.deliveryOrder2b.list:B2B 配送订单列表 + * - 查询条件与 order.deliveryOrder.list 完全一致(dispatch 分表 + 默认 dispatch_lane=m4) + * - 额外强制 is_b2b='Y'(与请求 where 取 AND,传 is_b2b='N' 只会得到空列表) + * - 行内额外带出 wms_order_b2b 作业字段(无作业明细行时占位:数值 0 / is_picked_up=N / 时间为 null): + * total_box_count、pickup_plate_number、prep_remark、prep_duration_seconds、is_urgent(Y/N)、prep_at、 + * is_picked_up(Y/N)、picked_up_at、created_at(作业明细创建时间,与订单 create_at 不同)、 + * prep_status(none/padding/fin)、prep_operator_id、prep_operator_name、prep_start_at + * - where 额外支持(仅 B2B 列表开放,普通列表不识别):total_box_count / pickup_plate_number / prep_remark / + * prep_duration_seconds / is_picked_up / picked_up_at / created_at / prep_at / is_urgent / + * prep_status / prep_operator_id / prep_start_at(支持简写与 {operator,value} 标准结构,prep_at 支持 between) + * - 排序固定「加急优先」(is_urgent='Y' 在前、无作业明细行排最后),sort 只决定加急/非加急各自内部次序 + * (缺省 delivery_time DESC, id DESC) + */ export function orderDeliveryOrder2bList(data: DeliveryOrderListParams = {}): Promise { return request({ url: '/system', diff --git a/src/api/order.pendingorder/orderpendingOrder.ts b/src/api/order.pendingorder/orderpendingOrder.ts index d299a129..dddb9714 100644 --- a/src/api/order.pendingorder/orderpendingOrder.ts +++ b/src/api/order.pendingorder/orderpendingOrder.ts @@ -345,6 +345,20 @@ export function orderPendingOrderList(data: PendingOrderListParams = {}): Promis } as any); } +/** + * order.pendingOrder2b.list:B2B 待处理订单列表 + * - 查询条件与 order.pendingOrder.list 完全一致(current 分表 + 默认 outbound_status != padding 且 step in [1,2,3]) + * - 额外强制 is_b2b='Y'(与请求 where 取 AND,传 is_b2b='N' 只会得到空列表) + * - 行内额外带出 wms_order_b2b 作业字段(无作业明细行时占位:数值 0 / is_picked_up=N / 时间为 null): + * total_box_count、pickup_plate_number、prep_remark、prep_duration_seconds、is_urgent(Y/N)、prep_at、 + * is_picked_up(Y/N)、picked_up_at、created_at(作业明细创建时间,与订单 create_at 不同)、 + * prep_status(none/padding/fin)、prep_operator_id、prep_operator_name、prep_start_at + * - where 额外支持(仅 B2B 列表开放,普通列表不识别):total_box_count / pickup_plate_number / prep_remark / + * prep_duration_seconds / is_picked_up / picked_up_at / created_at / prep_at / is_urgent / + * prep_status / prep_operator_id / prep_start_at(支持简写与 {operator,value} 标准结构,prep_at 支持 between) + * - 排序固定「加急优先」(is_urgent='Y' 在前、无作业明细行排最后),sort 只决定加急/非加急各自内部次序 + * (缺省 updated_at DESC, id DESC) + */ export function orderPendingOrder2bList(data: PendingOrderListParams = {}): Promise { return request({ url: "/system", @@ -458,6 +472,250 @@ export function orderPendingOrderCancelB2b( } as any); } +/** + * B2B 作业入参(ids / order_ids / orderIds / id / order_id / orderId 均可,单值或数组) + * - 服务端取值优先级:ids > order_ids > orderIds > id > order_id > orderId + * - 加急类接口单次最多 200 个订单;备货/提货为**单订单作业**,传多个订单返回 400 + * - warehouse_id 由服务端从登录上下文注入(ctx.user.store_id),前端禁止传入 + */ +export type PendingOrderB2bOrderIdParams = { + ids?: number[] | number; + order_ids?: number[] | number; + orderIds?: number[] | number; + id?: number; + order_id?: number; + orderId?: number; +}; + +/** + * order.startB2bPrep:备货开始(仅 B2B 订单,单订单作业) + * - 操作人取当前登录工号写入 prep_operator_id / prep_operator_name,prep_status 置 padding,prep_start_at 记开始时间 + * - 同工号重复调用幂等成功(保留首次开始时间,见 idempotent_order_ids);已被其他工号开始或已备货完成则返回失败 + */ +export type PendingOrderStartB2bPrepResponse = { + /** 固定 padding */ + prep_status: string; + /** 本次备货人工号 ID */ + prep_operator_id: number; + /** 备货人姓名 */ + prep_operator_name?: string; + /** 备货开始成功的订单 ID(含幂等命中) */ + started_order_ids: number[]; + started_count: number; + /** 同工号重复开始、未重置开始时间的订单 ID */ + idempotent_order_ids: number[]; +}; + +export function orderPendingOrderStartB2bPrep( + data: PendingOrderB2bOrderIdParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.startB2bPrep", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.cancelB2bPrep:取消备货(仅 B2B 订单,单订单作业) + * - prep_status 重置 none,并清空 prep_operator_id / prep_operator_name / prep_start_at / prep_at,prep_duration_seconds 置 0 + * - 仅 prep_status=padding(备货中)可取消,且必须由记录在案的同一工号操作(备货人与当前工号不一致返回失败) + */ +export type PendingOrderCancelB2bPrepResponse = { + /** 固定 none */ + prep_status: string; + canceled_order_ids: number[]; + canceled_count: number; +}; + +export function orderPendingOrderCancelB2bPrep( + data: PendingOrderB2bOrderIdParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.cancelB2bPrep", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.finishB2bPrep:备货完成(仅 B2B 订单,单订单作业) + * - 必传 prep_remark(≤500 字符)与 total_box_count(≥0 整数) + * - 写入 prep_remark / total_box_count / prep_at(提交时刻)/ prep_duration_seconds,prep_status 置 fin + * - 仅 prep_status=padding 可提交,且必须由同一备货工号提交 + * - ⚠️ 完成时**同步扣减库存**(口径同拣货完成:扣 wms_storage 锁定+可用、写 OUTBOUND/PICK_OUTBOUND 流水、wms_picking 置 fin) + */ +export type PendingOrderFinishB2bPrepParams = PendingOrderB2bOrderIdParams & { + /** 备货备注,必填,最长 500 字符 */ + prep_remark: string; + prepRemark?: string; + /** 总箱数,必填,大于等于 0 的整数 */ + total_box_count: number; + totalBoxCount?: number; +}; + +/** order.finishB2bPrep 响应 */ +export type PendingOrderFinishB2bPrepResponse = { + /** 固定 fin */ + prep_status: string; + prep_remark: string; + total_box_count: number; + /** 备货完成时间(提交时刻) */ + prep_at: string; + /** 备货用时(秒)= 提交时刻 - 备货开始时间 */ + prep_duration_seconds: number; + finished_order_ids: number[]; + finished_count: number; + /** 本次扣减的库存记录(wms_storage.id),无扣减时为空数组 */ + stock_deducted_storage_ids: number[]; + /** 本次扣减的库存总量合计,无扣减时为 0 */ + stock_deducted_quantity: number; +}; + +export function orderPendingOrderFinishB2bPrep( + data: PendingOrderFinishB2bPrepParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.finishB2bPrep", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.pickupB2b:B2B 提货(仅 B2B 订单,单订单作业) + * - is_picked_up 置 Y、picked_up_at 记提交时刻;要求 is_b2b=Y、未取消、prep_status=fin + * - 已提货重复调用幂等成功并返回首次提货时间(already_picked_up=true) + * - 订单先在 current 分表查,未命中兜底 dispatch 分表 + */ +export type PendingOrderPickupB2bResponse = { + /** 固定 Y */ + is_picked_up: string; + /** 提货时间(幂等命中时为首次提货时间) */ + picked_up_at: string; + /** 提货订单 ID(恒为单元素数组) */ + picked_up_order_ids: number[]; + /** 固定 1 */ + picked_up_count: number; + /** true=已提货幂等命中(未改写提货时间与操作日志) */ + already_picked_up: boolean; +}; + +export function orderPendingOrderPickupB2b( + data: PendingOrderB2bOrderIdParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.pickupB2b", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.setB2bUrgent:批量设置 B2B 订单是否加急(单次最多 200 个) + * - 订单先查 current 分表,未命中兜底 dispatch 分表(覆盖配送域 B2B 订单) + * - 非 B2B 订单(is_b2b != 'Y')与已取消订单(status=cancel)逐条跳过,原因见 skipped_reasons + * - 设置后 order.pendingOrder2b.list / order.deliveryOrder2b.list 的「加急优先」排序立即生效 + */ +export type PendingOrderSetB2bUrgentParams = PendingOrderB2bOrderIdParams & { + /** + * 是否加急,缺省 Y(调用即设为加急);支持 Y/N(大小写与首尾空格不敏感)、true/false、1/0、是/否; + * 传 N/false/0 表示取消加急;取值非法返回 400 + */ + is_urgent?: string; + isUrgent?: string; + urgent?: string; +}; + +/** order.setB2bUrgent / cancelB2bUrgent 跳过原因项 */ +export type PendingOrderSetB2bUrgentSkipReason = { + order_id: number; + delivery_order_code?: string; + /** 订单不是B2B订单 / 订单已取消,不允许设置加急 */ + reason: string; +}; + +/** order.setB2bUrgent 响应 */ +export type PendingOrderSetB2bUrgentResponse = { + /** 本次设置的加急标记(Y/N),与入参归一化结果一致 */ + is_urgent: string; + updated_order_ids: number[]; + updated_count: number; + skipped_order_ids: number[]; + skipped_count: number; + skipped_reasons: PendingOrderSetB2bUrgentSkipReason[]; + /** current 与 dispatch 分表都查不到的订单 ID(不属于本仓、已归档/外仓或 ID 不存在) */ + not_found_order_ids: number[]; +}; + +export function orderPendingOrderSetB2bUrgent( + data: PendingOrderSetB2bUrgentParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.setB2bUrgent", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + +/** + * order.cancelB2bUrgent:取消 B2B 订单加急(等价 setB2bUrgent 传 is_urgent='N',本接口强制覆盖为 N) + * - 入参只有订单 ID(不需传 is_urgent),单次最多 200 个 + */ +export type PendingOrderCancelB2bUrgentResponse = Omit< + PendingOrderSetB2bUrgentResponse, + "is_urgent" +> & { + /** 固定 N */ + is_urgent: string; +}; + +export function orderPendingOrderCancelB2bUrgent( + data: PendingOrderB2bOrderIdParams, +): Promise { + return request({ + url: "/system", + method: "post", + params: { + method: "order.cancelB2bUrgent", + v, + timestamp: Date.now(), + }, + data, + isSystemApi: true, + } as any); +} + export function orderPendingOrderReverseReviewOrder( data: PendingOrderReverseReviewParams, ): Promise { @@ -937,6 +1195,12 @@ export type OrderPendingOrderApi = { list: typeof orderPendingOrderList; convertToB2b: typeof orderPendingOrderConvertToB2b; cancelB2b: typeof orderPendingOrderCancelB2b; + setB2bUrgent: typeof orderPendingOrderSetB2bUrgent; + cancelB2bUrgent: typeof orderPendingOrderCancelB2bUrgent; + startB2bPrep: typeof orderPendingOrderStartB2bPrep; + cancelB2bPrep: typeof orderPendingOrderCancelB2bPrep; + finishB2bPrep: typeof orderPendingOrderFinishB2bPrep; + pickupB2b: typeof orderPendingOrderPickupB2b; detail: typeof orderPendingOrderDetail; reverseReviewOrder: typeof orderPendingOrderReverseReviewOrder; markPendingOutboundOrder: typeof orderPendingOrderMarkPendingOutboundOrder; @@ -975,6 +1239,12 @@ export const orderPendingOrder: OrderPendingOrderApi = { list: orderPendingOrderList, convertToB2b: orderPendingOrderConvertToB2b, cancelB2b: orderPendingOrderCancelB2b, + setB2bUrgent: orderPendingOrderSetB2bUrgent, + cancelB2bUrgent: orderPendingOrderCancelB2bUrgent, + startB2bPrep: orderPendingOrderStartB2bPrep, + cancelB2bPrep: orderPendingOrderCancelB2bPrep, + finishB2bPrep: orderPendingOrderFinishB2bPrep, + pickupB2b: orderPendingOrderPickupB2b, detail: orderPendingOrderDetail, reverseReviewOrder: orderPendingOrderReverseReviewOrder, markPendingOutboundOrder: orderPendingOrderMarkPendingOutboundOrder, @@ -1011,4 +1281,10 @@ export const orderPendingOrder: OrderPendingOrderApi = { export const orderPendingOrder2b = { list: orderPendingOrder2bList, + setB2bUrgent: orderPendingOrderSetB2bUrgent, + cancelB2bUrgent: orderPendingOrderCancelB2bUrgent, + startB2bPrep: orderPendingOrderStartB2bPrep, + cancelB2bPrep: orderPendingOrderCancelB2bPrep, + finishB2bPrep: orderPendingOrderFinishB2bPrep, + pickupB2b: orderPendingOrderPickupB2b, }; diff --git a/src/api/setting.warehouse/settingwarehouse.ts b/src/api/setting.warehouse/settingwarehouse.ts index e442e864..ff5a64c4 100644 --- a/src/api/setting.warehouse/settingwarehouse.ts +++ b/src/api/setting.warehouse/settingwarehouse.ts @@ -171,7 +171,7 @@ export type SettingWarehouseSubjectConfig = SettingWarehouseSenderConfig & { big_group_pack_coefficient?: number /** * 散单称重是否需要打包(flag,默认 false 关闭):开启后散单称重(订单波次范围 wave_scope 非 1 大团购/3 小团购) - * 前必须已打包完成(pack_status=fin),未打包时拒绝称重并返回错误。 + * 须处于**打包中或已打包**(pack_status=padding/fin),未打包或打包异常时拒绝称重并返回错误。 * 仅接受布尔/like-flag(true/1/'1'/'true' → true;false/0/'0'/'false' → false),非法值报 400 */ single_weigh_require_pack?: boolean diff --git a/src/api/storewarehouse.store/storeWarehouse.ts b/src/api/storewarehouse.store/storeWarehouse.ts index 9aa3c4ca..d75ad07d 100644 --- a/src/api/storewarehouse.store/storeWarehouse.ts +++ b/src/api/storewarehouse.store/storeWarehouse.ts @@ -1,25 +1,6 @@ import request from '@/utils/request' const v = "1.0"; -/** 查询当前主体可见的货主列表 */ -export function storeList(data: { - keyword?: string - page?: number - page_size?: number -}) { - return request({ - url: '/system', - method: 'post', - params: { - method: 'storeWarehouse.store.list', - v, - timestamp: new Date().getTime() - }, - data, - isSystemApi: true - } as any) -} - /** 货主侧查询签约关系列表 */ export function storeWarehouseList(data: { keyword?: string @@ -407,32 +388,6 @@ export function saveApiConfig(data: { } as any) } -/** 按 store_id 分页查询面单余额变更日志 */ -export function queryPrintQuantityLogs(data: { - store_id: number | string - pagination?: { page?: number; page_size?: number } -}) { - const sid = Number(data.store_id) - if (!Number.isFinite(sid)) { - return Promise.reject(new Error('storeWarehouse.store.queryPrintQuantityLogs:store_id 无效')) - } - const body: Record = { store_id: sid } - if (data.pagination && typeof data.pagination === 'object') { - body.pagination = data.pagination - } - return request({ - url: '/system', - method: 'post', - params: { - method: 'storeWarehouse.store.queryPrintQuantityLogs', - v, - timestamp: new Date().getTime() - }, - data: body, - isSystemApi: true - } as any) -} - /** 删除签约关系上的奇门接口配置 */ export function storeWarehouseDeleteQimenConfig(data: { id: number diff --git a/src/utils/chinaStreet.ts b/src/utils/chinaStreet.ts new file mode 100644 index 00000000..c4898bb6 --- /dev/null +++ b/src/utils/chinaStreet.ts @@ -0,0 +1,56 @@ +/** + * 中国省/市/区/街道(镇) 四级行政区划数据 + * + * - 数据来源:`china-division` 的 `pcas-code.json`(约 1.9MB) + * - 只在需要「镇/街道」下拉时才动态 import,不会打进主包 + * - 街道 code 与 `pca-code.json` 的区县 code 一致,可直接用 `area_code` 反查 + * - 选项 value 取街道**名称**(建单接口 `town` 字段传名称字符串) + */ +export type StreetSelectOption = { label: string; value: string } + +type StreetRegionNode = { code?: string; name?: string; children?: StreetRegionNode[] } + +const streetOptionsByAreaCode = new Map() +let loadPromise: Promise | null = null + +/** 是否已加载完成(用于驱动视图刷新) */ +export function isStreetIndexLoaded() { + return streetOptionsByAreaCode.size > 0 +} + +/** 同步读取已缓存的街道选项;未加载或该区县无数据时返回空数组 */ +export function getStreetOptionsByAreaCode(areaCode?: string | null): StreetSelectOption[] { + const code = String(areaCode || '').trim() + if (!code) return [] + return streetOptionsByAreaCode.get(code) || [] +} + +/** 加载街道数据(幂等,多次调用共用同一个 Promise;失败时降级为空选项) */ +export function loadStreetIndex(): Promise { + if (loadPromise) return loadPromise + loadPromise = import('china-division/dist/pcas-code.json') + .then((mod) => { + const raw = mod as unknown as StreetRegionNode[] | { default?: StreetRegionNode[] } + const tree = Array.isArray(raw) ? raw : raw.default + if (!Array.isArray(tree)) return + for (const province of tree) { + for (const city of province?.children || []) { + for (const area of city?.children || []) { + const areaCode = String(area?.code || '').trim() + if (!areaCode) continue + const streets = (area?.children || []) + .map((street) => String(street?.name || '').trim()) + .filter(Boolean) + .map((name) => ({ label: name, value: name })) + if (streets.length) streetOptionsByAreaCode.set(areaCode, streets) + } + } + } + }) + .catch((error) => { + console.warn('[chinaStreet] 街道数据加载失败,改为手工输入', error) + // 失败后清掉缓存,下次打开下拉时可重试 + loadPromise = null + }) + return loadPromise +} diff --git a/src/views/data/returnrecord/components/ReceiveRegisterPanel.vue b/src/views/data/returnrecord/components/ReceiveRegisterPanel.vue index bac943d3..3f37c528 100644 --- a/src/views/data/returnrecord/components/ReceiveRegisterPanel.vue +++ b/src/views/data/returnrecord/components/ReceiveRegisterPanel.vue @@ -76,6 +76,7 @@ :query-time="queryTime" @page-change="handlePageChange" @page-size-change="handlePageSizeChange" + @sort-change="handleSortChange" @refresh="handleRefresh" >