1
This commit is contained in:
parent
b31eef97c2
commit
897d95f046
@ -10,7 +10,10 @@ export type ReturnReceivedCreateParams = {
|
||||
waybill_code: string
|
||||
/** 备注 */
|
||||
remark?: string
|
||||
/** 退回收件任务ID(不传默认 1 = 系统预设「历史收件」) */
|
||||
/**
|
||||
* 收件任务ID(wms_return_received_task.id),不传默认 1=系统预设「历史收件」。
|
||||
* 服务端有缓存校验(key `return_received_task:{id}`):任务不存在 / 非法 / 不属于当前仓库 → 400
|
||||
*/
|
||||
return_received_task_id?: number
|
||||
}
|
||||
|
||||
@ -224,7 +227,8 @@ export type ReturnReceivedExportParams = {
|
||||
/**
|
||||
* 查询条件,语义与 returnReceived.list 的 where 一致;禁止传 warehouse_id/warehouseId(服务端注入)。
|
||||
* 支持字段:waybill_code(模糊)、scan_date/created_at/updated_at(范围)、
|
||||
* scanner_id/scanner_name/store_id/order_express_id/order_id(等值)、is_original_return(是否原单退回)
|
||||
* scanner_id/scanner_name/store_id/order_express_id/order_id/return_received_task_id(等值)、
|
||||
* is_original_return(是否原单退回)
|
||||
*/
|
||||
where?: Record<string, any>
|
||||
/** 排序参数,语义与 returnReceived.list 的 sort 一致(sortField 白名单 id/scan_date/created_at/updated_at/waybill_code,默认 created_at desc) */
|
||||
|
||||
@ -49,6 +49,15 @@ export type ReturnReceivedTaskListWhere = {
|
||||
batch_no?: string | { operator: string; value: any }
|
||||
/** 创建人(支持 {operator, value} 或直接值) */
|
||||
creator_name?: string | { operator: string; value: any }
|
||||
/**
|
||||
* 是否有登记(2026-10-07 文档新增):true=仅看有登记任务,false=仅看无登记任务;
|
||||
* 按当前仓库的 wms_return_received.return_received_task_id 引用判定(**不跨仓**)
|
||||
*/
|
||||
has_register?: boolean
|
||||
/** 创建人账户ID(等值或 in) */
|
||||
creator_id?: number | number[]
|
||||
/** 任务ID(等值或 in) */
|
||||
id?: number | number[]
|
||||
/** 创建时间范围 */
|
||||
created_at?: { operator: 'between' | 'gte' | 'lte'; value: [string, string] | string }
|
||||
/** 更新时间范围 */
|
||||
@ -116,16 +125,27 @@ export type ReturnReceivedTaskCreateResponse = {
|
||||
code?: number
|
||||
message?: string
|
||||
timestamp?: number
|
||||
/** 新建的任务记录 */
|
||||
/** 新建的任务记录(部分后端实现会把整行放在 record 里) */
|
||||
record?: ReturnReceivedTaskRecord
|
||||
/** 以下为文档列出的平铺字段(服务端注入 warehouse_id / creator_*) */
|
||||
id?: number
|
||||
batch_no?: string
|
||||
title?: string
|
||||
warehouse_id?: number
|
||||
creator_id?: number
|
||||
creator_name?: string
|
||||
created_at?: string
|
||||
updated_at?: string
|
||||
data?: {
|
||||
record?: ReturnReceivedTaskRecord
|
||||
id?: number
|
||||
batch_no?: string
|
||||
title?: string
|
||||
warehouse_id?: number
|
||||
creator_id?: number
|
||||
creator_name?: string
|
||||
created_at?: string
|
||||
updated_at?: string
|
||||
}
|
||||
}
|
||||
|
||||
@ -153,18 +173,47 @@ export function returnReceivedTaskCreate(
|
||||
|
||||
// ============ returnReceivedTask.delete ============
|
||||
|
||||
/** returnReceivedTask.delete 请求参数 */
|
||||
/**
|
||||
* returnReceivedTask.delete 请求参数
|
||||
*
|
||||
* ⚠️ 兼容两种入参(2026-10-07 文档):
|
||||
* - `ids`(数组或单值,**优先于 id**)→ 批量删除,返回批量形态(total/deleted_count/...)
|
||||
* - `id`(单值)→ 单值删除,不满足条件抛 404/409,返回 `{ id, deleted: true }`
|
||||
*/
|
||||
export type ReturnReceivedTaskDeleteParams = {
|
||||
/** 任务主键ID数组(批量删除) */
|
||||
ids: number[]
|
||||
/** 任务主键ID数组(批量删除,兼容单值,去重后上限 200;优先于 id) */
|
||||
ids?: number[]
|
||||
/** 任务主键ID(单值删除) */
|
||||
id?: number
|
||||
}
|
||||
|
||||
/** returnReceivedTask.delete 响应(两种形态合一;按入参走哪个分支取对应字段) */
|
||||
export type ReturnReceivedTaskDeleteResponse = {
|
||||
flag?: string
|
||||
code?: number
|
||||
message?: string
|
||||
timestamp?: number
|
||||
/** 单值删除:被删除的任务ID / 是否已删除 */
|
||||
id?: number
|
||||
deleted?: boolean
|
||||
/** 批量删除:去重总数 / 实际删除数 / 跳过数 / 已删除ID / 跳过ID(均保持入参顺序) */
|
||||
total?: number
|
||||
deleted_count?: number
|
||||
skipped_count?: number
|
||||
deleted_ids?: number[]
|
||||
skipped_ids?: number[]
|
||||
}
|
||||
|
||||
/**
|
||||
* returnReceivedTask.delete:批量删除退回收件任务(硬删除)
|
||||
* - 已有收件登记引用该任务 → 409 不可删除
|
||||
* - 系统预设 id=1(历史收件)→ 404 不可删除
|
||||
* returnReceivedTask.delete:删除退回收件任务(**硬删除**)
|
||||
*
|
||||
* 逐条分流不整体报错:任务不存在 / 系统预设 id=1(历史收件)/ 非当前仓库任务 /
|
||||
* 已有收件登记引用(wms_return_received)的任务 → 计入 skipped_ids,其余硬删除。
|
||||
* warehouse_id 由服务端注入(前端不传)。
|
||||
*/
|
||||
export function returnReceivedTaskDelete(data: ReturnReceivedTaskDeleteParams): Promise<any> {
|
||||
export function returnReceivedTaskDelete(
|
||||
data: ReturnReceivedTaskDeleteParams
|
||||
): Promise<ReturnReceivedTaskDeleteResponse> {
|
||||
return request({
|
||||
url: SYSTEM_URL,
|
||||
method: 'post',
|
||||
@ -178,10 +227,60 @@ export function returnReceivedTaskDelete(data: ReturnReceivedTaskDeleteParams):
|
||||
} as any)
|
||||
}
|
||||
|
||||
// ============ returnReceivedTask.batchDelete ============
|
||||
|
||||
/** returnReceivedTask.batchDelete 请求参数(2026-10-07 新增) */
|
||||
export type ReturnReceivedTaskBatchDeleteParams = {
|
||||
/** 收件任务ID数组(兼容单值,去重后单次上限 200) */
|
||||
ids: number[] | number
|
||||
}
|
||||
|
||||
/** returnReceivedTask.batchDelete 响应(2026-10-07 新增) */
|
||||
export type ReturnReceivedTaskBatchDeleteResponse = {
|
||||
flag?: string
|
||||
code?: number
|
||||
message?: string
|
||||
timestamp?: number
|
||||
/** 入参去重后的任务ID总数 */
|
||||
total: number
|
||||
/** 实际删除数量 */
|
||||
deleted_count: number
|
||||
/** 跳过数量(不存在/系统预设/非本仓库/已有登记) */
|
||||
skipped_count: number
|
||||
/** 已删除的任务ID列表(保持入参顺序) */
|
||||
deleted_ids: number[]
|
||||
/** 跳过的任务ID列表(保持入参顺序) */
|
||||
skipped_ids: number[]
|
||||
}
|
||||
|
||||
/**
|
||||
* returnReceivedTask.batchDelete:批量删除收件任务(**硬删除**,2026-10-07 新增)
|
||||
*
|
||||
* 与 `returnReceivedTask.delete` 传 `ids` 同口径(逐条分流、skipped_ids 不报错),
|
||||
* 差别是 batchDelete **只受理 ids** 且返回固定为批量形态。
|
||||
* warehouse_id 由服务端注入(前端不传);需登录、免 API 权限校验。
|
||||
*/
|
||||
export function returnReceivedTaskBatchDelete(
|
||||
data: ReturnReceivedTaskBatchDeleteParams
|
||||
): Promise<ReturnReceivedTaskBatchDeleteResponse> {
|
||||
return request({
|
||||
url: SYSTEM_URL,
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'returnReceivedTask.batchDelete',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
// ============ 模块导出 ============
|
||||
|
||||
export const returnReceivedTaskModule = {
|
||||
list: returnReceivedTaskList,
|
||||
create: returnReceivedTaskCreate,
|
||||
remove: returnReceivedTaskDelete
|
||||
remove: returnReceivedTaskDelete,
|
||||
batchDelete: returnReceivedTaskBatchDelete
|
||||
}
|
||||
|
||||
@ -170,6 +170,7 @@ export type ReturnWaybillListSort = {
|
||||
|
||||
/** returnWaybill.list 请求参数 */
|
||||
export type ReturnWaybillListParams = {
|
||||
/** 分页 { page: 1, pageSize: 20 }(pageSize 上限 500,默认 20) */
|
||||
pagination?: { page?: number; pageSize?: number }
|
||||
where?: ReturnWaybillListWhere
|
||||
sort?: ReturnWaybillListSort
|
||||
|
||||
@ -27,10 +27,16 @@ export type StockCheckEnvelope<T> = {
|
||||
/**
|
||||
* 库存盘点(module folder = stock.check)接口封装。
|
||||
*
|
||||
* 响应封装(2026-10-02 起全部 20 个接口统一):
|
||||
* 响应封装(2026-10-02 起全部接口统一,本模块现 24 个方法):
|
||||
* `{ flag, code, message, data, timestamp }` —— 业务数据**整体在 `data` 内**(见 StockCheckEnvelope)。
|
||||
* 调用侧统一 `const data = res.data ?? res`;`code=1` 为成功(request.ts 已含在 SUCCESS_CODES 内)。
|
||||
*
|
||||
* 作业数据(workData 家族,2026-10-07 文档更新):
|
||||
* · workData —— 三视图(location/goods/space),服务端分页,新增 keyword / only_abnormal 入参,
|
||||
* **不再返回 check**(任务信息请调 detail)
|
||||
* · workDataDetail —— 单条明细的作业数据(单行对象,按 scope_type 分流)
|
||||
* · workDataSpaceDetails —— space 视图服务端分页版(可只取某个库位)
|
||||
*
|
||||
* 状态机(主表 status):
|
||||
* created ──submit──> submitted ──audit(approve)──> approved ──report(首次)──> checking ──finish──> completed
|
||||
* │ │ (终态:completed / cancelled)
|
||||
@ -955,12 +961,21 @@ export type StockCheckWorkLocationRow = {
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
/** goods 视图行内按库位聚合的作业记录(明盘另含 quantity=该库位实盘合计) */
|
||||
/** goods 视图行内按库位聚合的作业记录(明盘另含账面/锁定/实盘数量) */
|
||||
export type StockCheckWorkGoodsLocation = {
|
||||
/** 空库位归 location_code=null 组 */
|
||||
location_code?: string | null
|
||||
checked_at?: string | null
|
||||
checker_name?: string | null
|
||||
/** 该库位该商品全部作业记录 ID(按记录 id 升序,供编辑/移除单条记录) */
|
||||
record_ids?: number[]
|
||||
/** 该库位该商品全部作业照片(扁平去重) */
|
||||
images?: StockCheckWorkImage[]
|
||||
/** 该库位账面数量(=可用+锁定;仅明盘) */
|
||||
system_quantity?: number | null
|
||||
/** 该库位锁定数量(仅明盘) */
|
||||
locked_quantity?: number | null
|
||||
/** 该库位实盘数量(未盘库位 0;仅明盘) */
|
||||
quantity?: number | null
|
||||
[key: string]: unknown
|
||||
}
|
||||
@ -1009,8 +1024,12 @@ export type StockCheckWorkSpaceGoods = {
|
||||
status: 'checked' | 'unchecked' | string
|
||||
/** 该库位该商品的账面(wms_storage space+stock SUM(quantity);仅明盘) */
|
||||
system_quantity?: number | null
|
||||
/** 该库位该商品的锁定数量(仅明盘) */
|
||||
locked_quantity?: number | null
|
||||
/** 该库位该商品的实盘合计(仅明盘) */
|
||||
checked_quantity?: number | null
|
||||
/** 该库位该商品全部作业记录 ID(2026-10-07 文档新增) */
|
||||
record_ids?: number[]
|
||||
[key: string]: unknown
|
||||
}
|
||||
|
||||
@ -1081,6 +1100,24 @@ export type StockCheckWorkDataParams = {
|
||||
is_goods?: boolean
|
||||
/** 商品视图开关(驼峰别名,兼容写法;is_goods 优先) */
|
||||
isGoods?: boolean
|
||||
/**
|
||||
* 关键字(可选,2026-10-07 新增):**仅库位任务(解析视图=location)生效** ——
|
||||
* 按行 `location_code`(优先明细快照,缺失回退库位表 space_code)与
|
||||
* `location_name`(custom_name 兜底 space_code)做 contains 模糊匹配(不区分大小写),
|
||||
* 过滤任务明细后再分页;非库位任务(goods/store → space/goods 视图)忽略;空/纯空白视为未传
|
||||
*/
|
||||
keyword?: string
|
||||
/**
|
||||
* 只看未盘和差异(可选,2026-10-07 新增):过滤在 keyword 之后、分页切片之前完成,三视图均生效 ——
|
||||
* location:仅保留 status=unchecked 或 has_unknown=true 的行(is_empty 的空标记行 status=checked,不保留)
|
||||
* goods :仅保留未盘行(locations 均无 record_ids)或明盘差异行(is_diff=1);盲盘无数量字段时仅按未盘过滤
|
||||
* space :按行内 goods 子项过滤(status=unchecked 或明盘 checked_quantity≠system_quantity),
|
||||
* 过滤后 goods 为空的行整体移除
|
||||
* 未传 / 非 true(false/0/'')不过滤;`total` 为过滤后行数
|
||||
*/
|
||||
only_abnormal?: boolean
|
||||
/** 同 only_abnormal(驼峰别名,兼容写法;only_abnormal 优先) */
|
||||
onlyAbnormal?: boolean
|
||||
/** 分页参数 { page, pageSize }(可选) */
|
||||
pagination?: StockCheckWorkDataPagination
|
||||
}
|
||||
@ -1091,8 +1128,16 @@ export type StockCheckWorkDataParams = {
|
||||
export type StockCheckWorkDataResponse<
|
||||
V extends StockCheckWorkDataView = StockCheckWorkDataView
|
||||
> = {
|
||||
/** 盘点主表信息(_formatCheckRow 口径) */
|
||||
check: StockCheckTask
|
||||
/**
|
||||
* 服务端实际解析出的视图类型(location / goods / space,供调用方判断 rows 行结构)
|
||||
* 📌 2026-10-07 文档新增
|
||||
*/
|
||||
view?: StockCheckWorkDataView
|
||||
/**
|
||||
* ⚠️ **2026-10-07 文档已不再返回本字段**:workData 不返回任务主表信息,
|
||||
* 任务信息请改调 `stock.check.detail`。此处仅为兼容旧响应保留(**不要依赖**)。
|
||||
*/
|
||||
check?: StockCheckTask
|
||||
/**
|
||||
* **当前页**作业数据行(后端先构建全量行再按页切片);结构随**解析视图**变化
|
||||
* (任务范围 + is_goods);任务无对应范围行时为空数组
|
||||
@ -1109,13 +1154,17 @@ export type StockCheckWorkDataResponse<
|
||||
/**
|
||||
* stock.check.workData:拉取盘点作业数据(**单接口三视图**,由**任务范围类型 + is_goods** 解析)
|
||||
*
|
||||
* 返回 `{ check, rows, total, page, pageSize }`(**服务端分页**:rows 为当前页,total 为全量行数);
|
||||
* 返回 `{ view, rows, total, page, pageSize }`
|
||||
* (view=服务端实际解析出的视图类型,**2026-10-07 新增**;
|
||||
* **服务端分页**:rows 为当前页,total 为全量行数,keyword / only_abnormal 过滤后 total 为过滤后行数);
|
||||
* `rows` 结构随**解析视图**不同(见各视图行类型):
|
||||
* - `location`:库位结构,行内 `goods`(已知商品)/ `unknown`(未知商品)子列表
|
||||
* - `location`:库位结构,行内 `goods`(已知 + 未知商品记录均在内)/ `unknown`(旧响应兼容)
|
||||
* - `goods` :商品结构,行内 `locations`(按库位聚合的作业记录);**盲盘不返回数量字段**
|
||||
* - `space` :聚合库位列表(当前库存库位 ∪ 作业记录库位,按拣货路径排序),
|
||||
* 行内 `goods` 为该库位的任务商品(库位列字段为 id/space_code/custom_name)
|
||||
*
|
||||
* ⚠️ **不返回任务主表信息**(旧响应里的 `check` 已移除,**任务信息请调 `stock.check.detail`**)。
|
||||
*
|
||||
* ⚠️ **状态限制**:仅任务 `status=approved`(待盘点)/ `checking`(盘点中)可拉取,
|
||||
* 其他状态(created/submitted/rejected/completed/cancelled)后端返回 400:
|
||||
* 「当前状态(xx)不允许拉取盘点作业数据,仅审核完成(approved)或盘点作业中(checking)的任务可拉取」
|
||||
@ -1123,6 +1172,8 @@ export type StockCheckWorkDataResponse<
|
||||
*
|
||||
* 与 detail / result 的区别:detail 只给范围行、result 按明细行聚合作业记录,
|
||||
* workData 直接给「作业视角」的三套结构,前端无需再自行聚合。
|
||||
* 需要「一行一条明细」时用 `stockCheckWorkDataDetail`(单条明细)、
|
||||
* space 视图要服务端分页时用 `stockCheckWorkDataSpaceDetails`。
|
||||
*/
|
||||
export function stockCheckWorkData<
|
||||
V extends StockCheckWorkDataView = StockCheckWorkDataView
|
||||
@ -1142,6 +1193,106 @@ export function stockCheckWorkData<
|
||||
} as any)
|
||||
}
|
||||
|
||||
// ============ stock.check.workDataDetail ============
|
||||
|
||||
/**
|
||||
* workDataDetail 返回的单行作业数据(**按明细范围类型分流**):
|
||||
* - `scope_type=location`(库位明细) → `StockCheckWorkLocationRow`
|
||||
* - `scope_type=goods`(商品明细) → `StockCheckWorkGoodsRow`
|
||||
*/
|
||||
export type StockCheckWorkDataDetailRow = StockCheckWorkLocationRow | StockCheckWorkGoodsRow
|
||||
|
||||
/** stock.check.workDataDetail 请求参数(2026-10-07 新增) */
|
||||
export type StockCheckWorkDataDetailParams = {
|
||||
/** 盘点明细ID(wms_stock_check_detail.id) */
|
||||
detail_id: number
|
||||
/** 盘点明细ID(驼峰别名,兼容写法;detail_id 优先) */
|
||||
detailId?: number
|
||||
}
|
||||
|
||||
/**
|
||||
* stock.check.workDataDetail:拉取**单条盘点明细**的作业数据(workData 单行版,2026-10-07 新增)
|
||||
*
|
||||
* - 入参只有 `detail_id`(盘点明细ID),warehouse_id 由服务端注入(前端不传)
|
||||
* - 统一 success 包装,`data` 为**单行作业数据**(不是数组),行结构按明细范围类型分流:
|
||||
* · 库位明细(scope_type=location)→ 结构同 workData 的 location 视图单行
|
||||
* · 商品明细(scope_type=goods) → 结构同 workData 的 goods 视图行
|
||||
* - 仅任务 `approved`(待盘点)/ `checking`(盘点中)可拉取(与 workData 同口径)
|
||||
*/
|
||||
export function stockCheckWorkDataDetail(
|
||||
data: StockCheckWorkDataDetailParams
|
||||
): Promise<StockCheckEnvelope<StockCheckWorkDataDetailRow>> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'stock.check.workDataDetail',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
// ============ stock.check.workDataSpaceDetails ============
|
||||
|
||||
/** stock.check.workDataSpaceDetails 请求参数(2026-10-07 新增) */
|
||||
export type StockCheckWorkDataSpaceDetailsParams = {
|
||||
/** 盘点任务ID(wms_stock_check.id) */
|
||||
id: number
|
||||
/** 库位ID(wms_location_space.id,可选;传入时只返回该库位行,total 恒为 1) */
|
||||
location_id?: number
|
||||
/** 库位ID(驼峰别名,兼容写法;location_id 优先) */
|
||||
locationId?: number
|
||||
/**
|
||||
* 分页配置(默认 page=1 / pageSize=20,pageSize 上限 200);
|
||||
* 传 `location_id` 时分页参数仅影响返回结构,`total` 恒为 1
|
||||
*/
|
||||
pagination?: StockCheckWorkDataPagination
|
||||
}
|
||||
|
||||
/**
|
||||
* stock.check.workDataSpaceDetails 响应(2026-10-07 新增)
|
||||
*
|
||||
* ⚠️ **不返回任务主表信息**(任务信息请调 `stock.check.detail`)。
|
||||
*/
|
||||
export type StockCheckWorkDataSpaceDetailsResponse = {
|
||||
/** 恒为 space(聚合库位视图) */
|
||||
view: 'space'
|
||||
/** 当前页库位行(结构同 workData 的 space 视图行) */
|
||||
rows: StockCheckWorkSpaceRow[]
|
||||
/** 全部库位行数(传 location_id 时恒为 1) */
|
||||
total: number
|
||||
page: number
|
||||
pageSize: number
|
||||
}
|
||||
|
||||
/**
|
||||
* stock.check.workDataSpaceDetails:space 视图(聚合库位)**服务端分页版**作业数据(2026-10-07 新增)
|
||||
*
|
||||
* - 行结构与 workData 的 `space` 视图行一致(id/space_code/custom_barcode/custom_name + goods 子列表;
|
||||
* 明盘 goods 另含 system_quantity/locked_quantity/checked_quantity/record_ids,盲盘不返回数量字段)
|
||||
* - 库位按拣货路径排序(pick_sequence 升序 → pick_priority 降序 → 库位 id 升序兜底)
|
||||
* - 传入 `location_id` 时**只返回该库位行**(`total=1`),否则按分页返回全部库位行
|
||||
* - 仅任务 `approved`(待盘点)/ `checking`(盘点中)可拉取(与 workData 同口径)
|
||||
*/
|
||||
export function stockCheckWorkDataSpaceDetails(
|
||||
data: StockCheckWorkDataSpaceDetailsParams
|
||||
): Promise<StockCheckEnvelope<StockCheckWorkDataSpaceDetailsResponse>> {
|
||||
return request({
|
||||
url: '/system',
|
||||
method: 'post',
|
||||
params: {
|
||||
method: 'stock.check.workDataSpaceDetails',
|
||||
v,
|
||||
timestamp: new Date().getTime()
|
||||
},
|
||||
data,
|
||||
isSystemApi: true
|
||||
} as any)
|
||||
}
|
||||
|
||||
// ============ stock.check.report ============
|
||||
|
||||
/**
|
||||
|
||||
@ -8,13 +8,19 @@ const v = '1.0'
|
||||
export type WaybillWarehouseListWhere = {
|
||||
/** 运单号筛选:字符串时为模糊搜索(LIKE '%值%',向后兼容);字符串数组时为精确匹配(Op.in,元素自动 trim 并过滤空值,空数组或全空值时不加该筛选条件) */
|
||||
waybillCode?: string | string[]
|
||||
/** 主单号(精确匹配),与 waybillCode 互斥,同时传入时 mainWaybillCode 优先 */
|
||||
mainWaybillCode?: string
|
||||
/**
|
||||
* 主单号筛选:
|
||||
* - 字符串时为精确匹配(通过主单号定位 order_id,返回该订单下所有运单(主+子))
|
||||
* - 字符串数组时按 Op.in 精确匹配多个主单号,返回这些主单对应订单下的全部运单
|
||||
* (元素自动 trim 并过滤空值;全部不存在时返回空列表;空数组或全空值时不加该筛选条件)
|
||||
* ⚠️ 与 waybillCode 同时传入时按 **AND 叠加**,不做互斥优先级处理(旧「mainWaybillCode 优先」口径已废弃)
|
||||
*/
|
||||
mainWaybillCode?: string | string[]
|
||||
/** 订单ID(等值匹配) */
|
||||
orderId?: number
|
||||
/** 订单号(模糊搜索,匹配 delivery_order_code 快照列) */
|
||||
/** 订单号(模糊搜索,⚠️ 暂不可用,待快照字段就绪) */
|
||||
orderNo?: string
|
||||
/** 运单类型:"main"/"1"=主单号,"child"/"2"=子单号 */
|
||||
/** 运单类型:"main"/"1"=主单号(business_key=1),"child"/"2"=子单号(business_key>1) */
|
||||
waybillType?: string
|
||||
/** 货主ID(等值匹配) */
|
||||
storeId?: number
|
||||
@ -44,7 +50,10 @@ export type WaybillWarehouseListWhere = {
|
||||
createdAtEnd?: string
|
||||
/** 创建时间范围:{ operator: 'between', value: [起始时间, 结束时间] } */
|
||||
createdAt?: { operator: string; value: string[] }
|
||||
/** 运单ID列表(勾选导出,按 wms_order_express.id 精确过滤) */
|
||||
/**
|
||||
* 运单ID列表(按 wms_order_express.id 精确过滤)。
|
||||
* ⚠️ **仅 waybill.warehouse.export(勾选导出)支持**;waybill.warehouse.list 不识别该字段。
|
||||
*/
|
||||
ids?: number[]
|
||||
}
|
||||
|
||||
|
||||
@ -79,6 +79,15 @@
|
||||
<el-button size="small" type="primary" link @click.stop="handleViewRegistrations(row)">
|
||||
查看登记
|
||||
</el-button>
|
||||
<el-button
|
||||
size="small"
|
||||
type="danger"
|
||||
link
|
||||
:loading="rowDeletingId === Number(row.id)"
|
||||
@click.stop="handleDeleteTask(row)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
@ -125,6 +134,7 @@ import {
|
||||
returnReceivedTaskList,
|
||||
returnReceivedTaskCreate,
|
||||
returnReceivedTaskDelete,
|
||||
returnReceivedTaskBatchDelete,
|
||||
} from '@/api/returnreceivedtask'
|
||||
import type { ToolbarButtonConfig } from '@/views/order/orderManagement/config/order-common-config'
|
||||
import {
|
||||
@ -210,6 +220,8 @@ const upperTable = ref<any>(null)
|
||||
const loading = ref(false)
|
||||
const createLoading = ref(false)
|
||||
const deleteLoading = ref(false)
|
||||
/** 行内「删除」进行中的任务ID(按钮 loading;与工具栏批量删除的 deleteLoading 分开) */
|
||||
const rowDeletingId = ref<number | null>(null)
|
||||
const queryTime = ref(0)
|
||||
const tableData = ref<any[]>([])
|
||||
const selectionRows = ref<any[]>([])
|
||||
@ -436,9 +448,24 @@ async function handleBatchDelete() {
|
||||
|
||||
deleteLoading.value = true
|
||||
try {
|
||||
const res: any = await returnReceivedTaskDelete({ ids })
|
||||
// 专用批量接口(只受理 ids,固定返回批量形态):逐条分流,
|
||||
// 任务不存在 / 系统预设 / 非本仓库 / 已有登记 → 计入 skipped_ids 而**不整体报错**
|
||||
const res: any = await returnReceivedTaskBatchDelete({ ids })
|
||||
if (res && (res.code === 1 || res.code === 200 || res.code === 20000)) {
|
||||
ElMessage.success(`已删除 ${ids.length} 个任务`)
|
||||
const data = res.data ?? res
|
||||
const deleted = Number(data?.deleted_count ?? data?.deleted_ids?.length)
|
||||
const skipped = Number(data?.skipped_count ?? data?.skipped_ids?.length)
|
||||
if (Number.isFinite(deleted) && deleted > 0) {
|
||||
ElMessage.success(
|
||||
Number.isFinite(skipped) && skipped > 0
|
||||
? `已删除 ${deleted} 个任务,跳过 ${skipped} 个(系统预设 / 已有登记 / 非本仓库)`
|
||||
: `已删除 ${deleted} 个任务`
|
||||
)
|
||||
} else if (Number.isFinite(skipped) && skipped > 0) {
|
||||
ElMessage.warning(`${skipped} 个任务未删除(系统预设 / 已有登记 / 非本仓库)`)
|
||||
} else {
|
||||
ElMessage.success('批量删除完成')
|
||||
}
|
||||
upperTable.value?.clearSelection?.()
|
||||
selectionRows.value = []
|
||||
buttonDisabledMap.value = { ...buttonDisabledMap.value, hasNoSelection: true }
|
||||
@ -451,12 +478,68 @@ async function handleBatchDelete() {
|
||||
ElMessage.error(res?.message || '批量删除失败')
|
||||
}
|
||||
} catch {
|
||||
// 请求层已提示错误(如 409 已有登记不可删除)
|
||||
// 请求层已提示错误
|
||||
} finally {
|
||||
deleteLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
// ==================== 行内删除任务(单条) ====================
|
||||
|
||||
/**
|
||||
* 行内「删除」→ returnReceivedTask.delete(单值形态:传 `id`,返回 `{ id, deleted }`)
|
||||
*
|
||||
* 与工具栏批量删除(`batchDelete`)同一条接口族,区别:单值删除只受理一个 id,
|
||||
* 不满足条件(系统预设 / 已有登记 / 非本仓库)后端直接抛 404/409 → 前端先做同口径前置校验,
|
||||
* 避免无谓请求;失败时由请求层统一提示。
|
||||
*/
|
||||
async function handleDeleteTask(row: any) {
|
||||
const id = Number(row?.id)
|
||||
if (!Number.isInteger(id) || id <= 0) return
|
||||
if (id === 1) {
|
||||
ElMessage.warning('系统预设任务「历史收件」不可删除')
|
||||
return
|
||||
}
|
||||
if (Number(row?.register_count) > 0) {
|
||||
ElMessage.warning('该任务已有登记,不可删除')
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
await ElMessageBox.confirm(
|
||||
`确认删除任务「${row?.title || row?.batch_no || id}」?删除后不可恢复。`,
|
||||
'删除确认',
|
||||
{ type: 'warning', confirmButtonText: '删除', cancelButtonText: '取消' }
|
||||
)
|
||||
} catch {
|
||||
return
|
||||
}
|
||||
|
||||
rowDeletingId.value = id
|
||||
try {
|
||||
const res: any = await returnReceivedTaskDelete({ id })
|
||||
if (res && (res.code === 1 || res.code === 200 || res.code === 20000)) {
|
||||
const data = res.data ?? res
|
||||
if (data?.deleted === false) {
|
||||
ElMessage.warning(data?.message || '任务未删除(系统预设 / 已有登记 / 非本仓库)')
|
||||
} else {
|
||||
ElMessage.success('任务已删除')
|
||||
}
|
||||
// 当前页删空时回退一页,避免停留在空页
|
||||
if (tableData.value.length === 1 && pagination.currentPage > 1) {
|
||||
pagination.currentPage -= 1
|
||||
}
|
||||
fetchData()
|
||||
} else {
|
||||
ElMessage.error(res?.message || '删除任务失败')
|
||||
}
|
||||
} catch {
|
||||
// 请求层已提示错误(如 409 已有登记不可删除)
|
||||
} finally {
|
||||
rowDeletingId.value = null
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
fetchData()
|
||||
})
|
||||
|
||||
@ -66,7 +66,8 @@ export const returnReceivedTaskColumns = [
|
||||
{ prop: 'register_count', label: '登记数', width: '90' },
|
||||
{ prop: 'created_at', label: '创建时间', width: '170', sortable: 'custom' },
|
||||
{ prop: 'updated_at', label: '更新时间', width: '170', sortable: 'custom' },
|
||||
{ prop: 'actions', label: '操作', width: '170', fixed: 'right' },
|
||||
// 操作列:登记收件 / 查看登记 / 删除(三个 link 按钮)
|
||||
{ prop: 'actions', label: '操作', width: '230', fixed: 'right' },
|
||||
]
|
||||
|
||||
// ============================================================
|
||||
|
||||
@ -192,6 +192,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
|
||||
waybill_code: {
|
||||
key: 'waybill_code',
|
||||
label: '运单号',
|
||||
// 传参口径(对齐 waybill.warehouse.list 文档):单值字符串 = 模糊 LIKE;多值(ScanBox 的「包含/IN」切数组)= **精确 Op.in**
|
||||
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic },
|
||||
table: { minWidth: 170, fixed: 'left', copyAction: 'copy', showOverflowTooltip: true },
|
||||
slot: null,
|
||||
@ -200,6 +201,8 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
|
||||
main_waybill_code: {
|
||||
key: 'main_waybill_code',
|
||||
label: '主单号',
|
||||
// 传参口径(2026-10-07 文档):单值/多值均为**精确匹配**,先定位 order_id 再返回该订单下全部(主+子)运单;
|
||||
// 与运单号同时传入时**按 AND 叠加**(旧「主单号优先」口径已废弃)
|
||||
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic },
|
||||
table: { minWidth: 170, copyAction: 'copy', showOverflowTooltip: true },
|
||||
slot: null,
|
||||
@ -216,6 +219,7 @@ export const FIELD_DICT: Record<string, FieldDefinition> = {
|
||||
order_no: {
|
||||
key: 'order_no',
|
||||
label: '发货单号',
|
||||
// ⚠️ waybill.warehouse.list 文档:orderNo 模糊搜索「暂不可用,待快照字段就绪」→ 当前传了也不会生效,保留筛选项等后端就绪
|
||||
scanBox: { type: 'text', group: SCANBOX_GROUPS.basic },
|
||||
table: { minWidth: 160, copyAction: 'copy', showOverflowTooltip: true },
|
||||
slot: null,
|
||||
|
||||
@ -18,6 +18,12 @@
|
||||
**服务端分页**:入参 `pagination: { page, pageSize }`(pageSize 上限 200),
|
||||
响应 `rows` 为当前页、`total` 为全量行数、`page/pageSize` 回显 → 翻页/改页长均重新请求。
|
||||
|
||||
**筛选(2026-10-07 文档新增的 workData 入参)**:
|
||||
- `keyword`:**仅库位任务(解析视图=location)生效**,按行 `location_code`/`location_name` contains 匹配;
|
||||
只在该视图渲染输入框(非库位任务服务端会忽略,不给无效入口)
|
||||
- `only_abnormal`:只看未盘和差异,**三视图均生效**,过滤在 keyword 之后、分页切片之前;
|
||||
开启时单行刷新会退化为整表刷新(行的去留只有服务端知道)
|
||||
|
||||
⚠️ **视图不是自由入参**(`view` 已废弃,传了也被忽略),由「任务范围 + `is_goods`」解析:
|
||||
- 库位任务(type=all/location)→ **固定 location**(库位结构),页面不提供切换
|
||||
- 商品任务(type=store/goods)→ 默认 **space**(聚合库位,按拣货路径);
|
||||
@ -30,6 +36,11 @@
|
||||
删除作业记录:stock.check.recordDelete,用 workData 给出的 record_id;
|
||||
**仅主表 approved/checking 允许**,记录删光后该明细回到未盘口径,主表状态不回退。
|
||||
|
||||
**单行刷新(不老整表重拉)**:删记录 / 重盘清库位后只重取「那一行」,其它行与滚动位置不受影响:
|
||||
- `location` / `goods` 视图行 → **stock.check.workDataDetail**(传 `detail_id`,返回**单行对象**不是数组)
|
||||
- `space` 视图行 → **stock.check.workDataSpaceDetails**(传 `location_id=行.id`,只返该库位行、total=1)
|
||||
操作列还提供手动「刷新」入口;单行取不到(行已不在当前筛选/分页)时自动回退整表 `loadRecords()`。
|
||||
|
||||
重盘清除库位:stock.check.recheckClearLocation(`{ id, location_id }`)——**库位盘点专用**,
|
||||
清除该库位范围内明细(scope_type=location)的**全部作业记录(含空库位标记)**,该库位回到未盘;
|
||||
仅任务范围为库位(type=location/all)且 approved/checking 允许(与本面板 canLoad 的状态限制一致),
|
||||
@ -60,6 +71,27 @@
|
||||
</el-radio-button>
|
||||
</el-radio-group>
|
||||
<span v-else class="hint-text">{{ viewOptions[0]?.label }}(库位盘点固定视图)</span>
|
||||
<!-- 关键词:文档仅库位任务(location 视图)生效,非库位任务忽略 → 只在 location 视图渲染 -->
|
||||
<el-input
|
||||
v-if="view === 'location'"
|
||||
v-model="keyword"
|
||||
size="small"
|
||||
clearable
|
||||
class="filter-keyword"
|
||||
placeholder="库位编码 / 名称"
|
||||
:disabled="!canLoad"
|
||||
@keyup.enter="handleKeywordSearch"
|
||||
@clear="handleKeywordSearch"
|
||||
/>
|
||||
<!-- 只看未盘和差异:三视图均生效(服务端在 keyword 之后、分页切片之前过滤) -->
|
||||
<el-checkbox
|
||||
v-model="onlyAbnormal"
|
||||
size="small"
|
||||
:disabled="!canLoad"
|
||||
@change="handleFilterChange"
|
||||
>
|
||||
只看未盘和差异
|
||||
</el-checkbox>
|
||||
</div>
|
||||
<div class="right-actions">
|
||||
<span v-if="!canLoad" class="hint-text">
|
||||
@ -106,7 +138,7 @@
|
||||
type="danger"
|
||||
size="small"
|
||||
:loading="deletingId === item.record_id"
|
||||
@click="handleDeleteRecord(item)"
|
||||
@click="handleDeleteRecord(item, row)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
@ -126,7 +158,7 @@
|
||||
type="danger"
|
||||
size="small"
|
||||
:loading="deletingId === item.record_id"
|
||||
@click="handleDeleteRecord(item)"
|
||||
@click="handleDeleteRecord(item, row)"
|
||||
>
|
||||
删除
|
||||
</el-button>
|
||||
@ -159,11 +191,20 @@
|
||||
<template #default="{ row }">{{ formatTime(row.checked_at) }}</template>
|
||||
</el-table-column>
|
||||
<!--
|
||||
操作列:库位维度「重盘清库位」——清除该库位全部作业记录(含空库位标记),库位回到未盘
|
||||
操作列:单行刷新 + 库位维度「重盘清库位」——清除该库位全部作业记录(含空库位标记),库位回到未盘
|
||||
(stock.check.recheckClearLocation;与展开行里的逐条「删除」是同一族操作,这里是整体重来)
|
||||
-->
|
||||
<el-table-column label="操作" width="120" align="center" fixed="right">
|
||||
<el-table-column label="操作" width="180" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
:loading="refreshingKey === rowKeyOf(row)"
|
||||
@click="handleRefreshRow(row)"
|
||||
>
|
||||
刷新
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="canClearLocation(row)"
|
||||
link
|
||||
@ -174,7 +215,6 @@
|
||||
>
|
||||
重盘清库位
|
||||
</el-button>
|
||||
<span v-else class="hint-text">—</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
@ -248,6 +288,21 @@
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- 操作列:单行刷新(stock.check.workDataDetail,按 detail_id 重取该商品明细行) -->
|
||||
<el-table-column label="操作" width="90" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
:loading="refreshingKey === rowKeyOf(row)"
|
||||
@click="handleRefreshRow(row)"
|
||||
>
|
||||
刷新
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">{{ emptyText }}</div>
|
||||
</template>
|
||||
@ -302,6 +357,21 @@
|
||||
<template #default="{ row }">{{ checkedGoodsCount(row) }}</template>
|
||||
</el-table-column>
|
||||
|
||||
<!-- 操作列:单行刷新(stock.check.workDataSpaceDetails,传 location_id 只重取该库位行) -->
|
||||
<el-table-column label="操作" width="90" align="center" fixed="right">
|
||||
<template #default="{ row }">
|
||||
<el-button
|
||||
link
|
||||
type="primary"
|
||||
size="small"
|
||||
:loading="refreshingKey === rowKeyOf(row)"
|
||||
@click="handleRefreshRow(row)"
|
||||
>
|
||||
刷新
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
||||
<template #empty>
|
||||
<div class="empty-tip">{{ emptyText }}</div>
|
||||
</template>
|
||||
@ -335,6 +405,8 @@ import {
|
||||
stockCheckRecheckClearLocation,
|
||||
stockCheckRecordDelete,
|
||||
stockCheckWorkData,
|
||||
stockCheckWorkDataDetail,
|
||||
stockCheckWorkDataSpaceDetails,
|
||||
type StockCheckWorkDataParams,
|
||||
type StockCheckWorkDataView
|
||||
} from '@/api/stock.check/stock.check'
|
||||
@ -394,12 +466,19 @@ const loading = ref(false)
|
||||
const deletingId = ref<number | null>(null)
|
||||
/** 「重盘清库位」进行中的库位ID(按钮 loading) */
|
||||
const clearingLocationId = ref<number | null>(null)
|
||||
/** 单行刷新进行中的行 key(按钮 loading) */
|
||||
const refreshingKey = ref('')
|
||||
|
||||
/** 头部统计取自 workData 的 check(删除后随重新拉取同步) */
|
||||
const stats = reactive({ total: 0, checked: 0 })
|
||||
|
||||
const pagination = reactive({ page: 1, pageSize: 20, total: 0 })
|
||||
|
||||
/** 库位关键词(workData 的 `keyword`,**仅库位任务 / location 视图生效**) */
|
||||
const keyword = ref('')
|
||||
/** 只看未盘和差异(workData 的 `only_abnormal`,三视图均生效) */
|
||||
const onlyAbnormal = ref(false)
|
||||
|
||||
const tableRef = ref<any>(null)
|
||||
const tableHostRef = ref<HTMLElement | null>(null)
|
||||
const tableHeight = ref(260)
|
||||
@ -413,6 +492,10 @@ const emptyText = computed(() => {
|
||||
if (!canLoad.value) {
|
||||
return `当前状态(${translate('status', taskStatus.value)})不可查看作业数据:仅「待盘点 / 盘点中」可拉取`
|
||||
}
|
||||
if (onlyAbnormal.value) return '没有未盘或差异的行(已开启「只看未盘和差异」)'
|
||||
if (view.value === 'location' && keyword.value.trim()) {
|
||||
return `没有匹配「${keyword.value.trim()}」的库位`
|
||||
}
|
||||
if (view.value === 'goods') return '该盘点单暂无商品明细'
|
||||
if (view.value === 'space') return '任务商品暂无所在库位(可能尚未入库)'
|
||||
return isLocationScopeType(props.row?.type) ? '该盘点单暂无库位明细' : '商品盘点无库位范围行'
|
||||
@ -444,6 +527,11 @@ async function loadRecords() {
|
||||
}
|
||||
// 视图由「任务范围 + is_goods」解析:仅商品任务可切 goods,space 是商品任务默认、库位任务不带
|
||||
if (!isLocationTask.value && view.value === 'goods') payload.is_goods = true
|
||||
// 关键词(2026-10-07 文档新增):**仅库位任务(解析视图=location)生效**,按行 location_code / location_name contains 匹配
|
||||
const keywordText = keyword.value.trim()
|
||||
if (isLocationTask.value && keywordText) payload.keyword = keywordText
|
||||
// 只看未盘和差异(2026-10-07 文档新增):三视图均生效,过滤在 keyword 之后、分页切片之前;false/未传不过滤
|
||||
if (onlyAbnormal.value) payload.only_abnormal = true
|
||||
const res: any = await stockCheckWorkData(payload)
|
||||
if (!isCheckApiSuccess(res)) {
|
||||
throw new Error(res?.message || '获取盘点作业数据失败')
|
||||
@ -474,6 +562,18 @@ function handleViewChange() {
|
||||
void loadRecords()
|
||||
}
|
||||
|
||||
/** 关键词查询(仅 location 视图可见):回车 / 清空即查,回到第 1 页 */
|
||||
function handleKeywordSearch() {
|
||||
pagination.page = 1
|
||||
void loadRecords()
|
||||
}
|
||||
|
||||
/** 「只看未盘和差异」切换:过滤在服务端完成 → 重新拉取并回到第 1 页 */
|
||||
function handleFilterChange() {
|
||||
pagination.page = 1
|
||||
void loadRecords()
|
||||
}
|
||||
|
||||
/** 翻页:服务端分页,需重新请求 */
|
||||
function handlePageChange() {
|
||||
void loadRecords()
|
||||
@ -484,6 +584,94 @@ function handlePageSizeChange() {
|
||||
void loadRecords()
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 单行刷新(stock.check.workDataDetail / stock.check.workDataSpaceDetails)
|
||||
// ============================================================
|
||||
|
||||
/**
|
||||
* 行 key:与各表格 `row-key` 保持一致
|
||||
* - space 视图行 → `space:<库位ID>`(row-key=id)
|
||||
* - location / goods 视图行 → `detail:<明细ID>`(row-key=detail_id)
|
||||
*/
|
||||
function rowKeyOf(row: Record<string, any>): string {
|
||||
if (view.value === 'space') {
|
||||
const spaceId = Number(row?.id)
|
||||
return Number.isFinite(spaceId) && spaceId > 0 ? `space:${spaceId}` : ''
|
||||
}
|
||||
const detailId = Number(row?.detail_id)
|
||||
return Number.isFinite(detailId) && detailId > 0 ? `detail:${detailId}` : ''
|
||||
}
|
||||
|
||||
/** 单行刷新时以接口返回为准的「作业集合」字段(接口未回带时置空,避免残留已删除记录) */
|
||||
const ROW_COLLECTION_KEYS = ['goods', 'unknown', 'locations']
|
||||
|
||||
/**
|
||||
* 单行刷新:只重取该行的最新作业数据(不动其它行、不重置滚动位置)
|
||||
*
|
||||
* - `space` 视图行 → `stock.check.workDataSpaceDetails`(传 `location_id`,只返该库位行、total=1)
|
||||
* - `location` / `goods` 视图行 → `stock.check.workDataDetail`(传 `detail_id`,返回**单行对象**非数组)
|
||||
*
|
||||
* @returns true = 已就地更新该行;false = 未取到(行已不在当前筛选/分页、或接口异常)→ 调用方回退整表刷新
|
||||
*/
|
||||
async function refreshSingleRow(row: Record<string, any>): Promise<boolean> {
|
||||
const key = rowKeyOf(row)
|
||||
if (!taskId.value || !key) return false
|
||||
// 「只看未盘和差异」下,作业数据变化可能让该行不再命中过滤条件(服务端才知道)→
|
||||
// 单行刷新无法感知行的去留,直接返回 false 让调用方整表重拉
|
||||
if (onlyAbnormal.value) return false
|
||||
try {
|
||||
let fresh: Record<string, any> | null = null
|
||||
if (view.value === 'space') {
|
||||
const spaceId = Number(row?.id)
|
||||
if (!Number.isFinite(spaceId) || spaceId <= 0) return false
|
||||
const res: any = await stockCheckWorkDataSpaceDetails({
|
||||
id: taskId.value,
|
||||
location_id: spaceId
|
||||
})
|
||||
if (!isCheckApiSuccess(res)) return false
|
||||
const data = res.data ?? res
|
||||
fresh = Array.isArray(data?.rows) ? (data.rows[0] ?? null) : null
|
||||
} else {
|
||||
const detailId = Number(row?.detail_id)
|
||||
if (!Number.isFinite(detailId) || detailId <= 0) return false
|
||||
const res: any = await stockCheckWorkDataDetail({ detail_id: detailId })
|
||||
if (!isCheckApiSuccess(res)) return false
|
||||
const data = res.data ?? res
|
||||
// 单行版 data 是**行对象**(不是数组),兼容数组首项写法
|
||||
fresh = Array.isArray(data) ? (data[0] ?? null) : (data ?? null)
|
||||
}
|
||||
if (!fresh || typeof fresh !== 'object') return false
|
||||
const index = rows.value.findIndex((item) => rowKeyOf(item) === key)
|
||||
if (index < 0) return false
|
||||
const next: Record<string, any> = { ...rows.value[index], ...fresh }
|
||||
ROW_COLLECTION_KEYS.forEach((field) => {
|
||||
if (fresh?.[field] === undefined) next[field] = []
|
||||
})
|
||||
rows.value[index] = next
|
||||
return true
|
||||
} catch (e) {
|
||||
console.error('[stockcheck] 单行刷新失败', e)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
/** 操作列「刷新」:只重取该行;取不到时回退整表刷新 */
|
||||
async function handleRefreshRow(row: Record<string, any>) {
|
||||
const key = rowKeyOf(row)
|
||||
if (!key || !canLoad.value || refreshingKey.value) return
|
||||
refreshingKey.value = key
|
||||
try {
|
||||
const ok = await refreshSingleRow(row)
|
||||
if (ok) {
|
||||
ElMessage.success('已刷新该行')
|
||||
return
|
||||
}
|
||||
await loadRecords()
|
||||
} finally {
|
||||
refreshingKey.value = ''
|
||||
}
|
||||
}
|
||||
|
||||
// ============================================================
|
||||
// 单元格渲染辅助
|
||||
// ============================================================
|
||||
@ -551,7 +739,14 @@ function diffClass(value: any) {
|
||||
// ============================================================
|
||||
// 删除作业记录(stock.check.recordDelete,用 workData 的 record_id)
|
||||
// ============================================================
|
||||
async function handleDeleteRecord(record: Record<string, any>) {
|
||||
/**
|
||||
* 删除单条作业记录
|
||||
*
|
||||
* @param record 展开行里的作业记录(含 record_id)
|
||||
* @param row 该记录所属的**父行**(location/goods 视图传明细行,space 视图传库位行)——
|
||||
* 用于删后单行刷新;未传时退回整表刷新
|
||||
*/
|
||||
async function handleDeleteRecord(record: Record<string, any>, row?: Record<string, any>) {
|
||||
const recordId = Number(record?.record_id)
|
||||
if (!Number.isFinite(recordId) || recordId <= 0) return
|
||||
const name = record?.item_name || record?.item_code || record?.barcode || '—'
|
||||
@ -573,9 +768,13 @@ async function handleDeleteRecord(record: Record<string, any>) {
|
||||
throw new Error(res?.message || '删除作业记录失败')
|
||||
}
|
||||
ElMessage.success('作业记录已删除')
|
||||
// 删除当前页最后一条时回退页码,避免停留在空页
|
||||
if (rows.value.length === 1 && pagination.page > 1) pagination.page -= 1
|
||||
await loadRecords()
|
||||
// 单行刷新:只重取该明细行(取不到才回退整表)
|
||||
const refreshed = row ? await refreshSingleRow(row) : false
|
||||
if (!refreshed) {
|
||||
// 删除当前页最后一条时回退页码,避免停留在空页
|
||||
if (rows.value.length === 1 && pagination.page > 1) pagination.page -= 1
|
||||
await loadRecords()
|
||||
}
|
||||
emit('changed')
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 删除作业记录失败', e)
|
||||
@ -640,7 +839,9 @@ async function handleClearLocation(row: Record<string, any>) {
|
||||
ElMessage.success(
|
||||
Number.isFinite(deleted) && deleted > 0 ? `已清除 ${deleted} 条盘点信息` : '库位盘点信息已清除'
|
||||
)
|
||||
await loadRecords()
|
||||
// 单行刷新:只重取该库位行(取不到才回退整表)
|
||||
const refreshed = await refreshSingleRow(row)
|
||||
if (!refreshed) await loadRecords()
|
||||
emit('changed')
|
||||
} catch (e: any) {
|
||||
console.error('[stockcheck] 清除库位盘点信息失败', e)
|
||||
@ -657,6 +858,8 @@ watch(
|
||||
() => [props.row?.id, props.row?.status],
|
||||
() => {
|
||||
view.value = defaultView.value
|
||||
// 关键词只对库位任务生效,换单后清空(只看未盘和差异属用户偏好,保留)
|
||||
keyword.value = ''
|
||||
pagination.page = 1
|
||||
void loadRecords()
|
||||
},
|
||||
@ -704,6 +907,11 @@ watch(
|
||||
}
|
||||
}
|
||||
|
||||
/* 库位关键词输入框(仅 location 视图) */
|
||||
.filter-keyword {
|
||||
width: 180px;
|
||||
}
|
||||
|
||||
.stat-text {
|
||||
font-size: 12px;
|
||||
color: #909399;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user