feat(consignment): 支持多数量拆分与份额级赠送,并对齐待抢单看板

- 匹配引擎支持一条库存按剩余数量拆给多张整单/拼单,份额数量、报酬、分配数量按实际占用计算
- 「我的寄卖」改为按占用单/份额一行 + 剩余库存行,卖家按 allocation/share/workOrder 定位确认加好友与提交凭证
- 解绑/撤销/超时按 allocation 精确回补,修复单绑定字段在多占用下被误清的问题
- 拼单好友赠送改为份额级 friend_added_at / gift_available_at(迁移 146),新增后台按份额确认加好友入口与寄卖赠送列
- 待抢单匹配看板改用新引擎:覆盖全部寄卖分类、拼单余量、精确/非精确/冲突明细,去掉手枪品类写死
- 发布押金改为该提报单全部售出/作废后才释放,避免多件库存分多单时提前退款
- 补齐集成测试与单测:拆分、多占用、份额级独立冷却与凭证、看板新旧引擎对齐
This commit is contained in:
2026-11-06 12:23:55 +08:00
parent 3f16b15c5c
commit e0a85359b6
28 changed files with 1758 additions and 125 deletions
@@ -1,5 +1,7 @@
import type { PoolClient } from 'pg'
import { query } from '../../db/client.js'
export type ConsignmentAllocationRow = {
id: number
inventory_id: number
@@ -134,6 +136,34 @@ async function releaseAllocationRows(
`,
[now, row.inventory_id],
)
} else {
// 还有其它占用:绑定字段必须指向剩下的最新一张工单,否则客服侧会看到已释放的旧单。
await client.query(
`
UPDATE consignment_inventories ci
SET
bound_order_id = wo.order_id,
bound_work_order_id = wo.id,
bound_platform_order_id = COALESCE(wo.platform_order_id, ''),
shop_name = COALESCE(
NULLIF(wo.material_json -> 'source' ->> 'shopName', ''),
NULLIF(wo.material_json -> 'source' ->> 'shopTitle', ''),
''
),
allocation_status = '已安排',
updated_at = $2
FROM work_orders wo
WHERE ci.id = $1
AND wo.id = (
SELECT work_order_id
FROM consignment_inventory_allocations
WHERE inventory_id = $1 AND status IN ('reserved', 'consumed')
ORDER BY id DESC
LIMIT 1
)
`,
[row.inventory_id, now],
)
}
}
}
@@ -144,14 +174,58 @@ export async function releaseConsignmentAllocationForShareWithClient(
shareId: number,
now: string,
): Promise<number> {
const result = await client.query<ConsignmentAllocationRow>(
`SELECT * FROM consignment_inventory_allocations WHERE work_order_share_id = $1 AND status = 'reserved' FOR UPDATE`,
const result = await client.query<ConsignmentAllocationRow & { friend_added_at: string | null }>(
`SELECT ca.*, wos.friend_added_at
FROM consignment_inventory_allocations ca
LEFT JOIN work_order_shares wos ON wos.id = ca.work_order_share_id
WHERE ca.work_order_share_id = $1 AND ca.status = 'reserved'
FOR UPDATE OF ca`,
[shareId],
)
if (result.rows.length === 0) return 0
// 已确认加好友的赠礼份额:货可能已经送给买家,撤销时只能作废,不能回池二次出售。
if (result.rows.some((row) => Boolean(row.friend_added_at))) {
for (const row of result.rows) {
await client.query(
`
UPDATE consignment_inventories
SET
status = 'archived',
remaining_quantity = 0,
allow_matching = FALSE,
allocation_status = '待安排',
bound_order_id = NULL,
bound_work_order_id = NULL,
bound_platform_order_id = '',
shop_name = '',
consumed_at = NULL,
updated_at = $1
WHERE id = $2
`,
[now, row.inventory_id],
)
await client.query(
`UPDATE consignment_inventory_allocations SET status = 'released', updated_at = $1 WHERE id = $2`,
[now, row.id],
)
}
return result.rows.length
}
await releaseAllocationRows(client, result.rows, now)
return result.rows.length
}
/** 供其它释放路径复用:按分配行回补数量/释放绑定。 */
export async function releaseConsignmentAllocationRowsWithClient(
client: PoolClient,
rows: ConsignmentAllocationRow[],
now: string,
): Promise<void> {
await releaseAllocationRows(client, rows, now)
}
/** 释放整个工单占用的全部库存(整单取消 / 退回大厅 / 撤销履约)。 */
export async function releaseConsignmentAllocationsForWorkOrderWithClient(
client: PoolClient,
@@ -177,3 +251,22 @@ export async function markConsignmentAllocationsConsumedWithClient(
[now, workOrderId],
)
}
/**
* 一条库存当前的有效占用(一库存可拆给多张订单)。
* 卖家操作必须据此定位具体订单/份额,不能再只看 bound_work_order_id。
*/
export async function listActiveConsignmentAllocationsForInventory(
inventoryId: number | string,
): Promise<ConsignmentAllocationRow[]> {
const result = await query<ConsignmentAllocationRow>(
`
SELECT *
FROM consignment_inventory_allocations
WHERE inventory_id = $1 AND status IN ('reserved', 'consumed')
ORDER BY id DESC
`,
[Number(inventoryId)],
)
return result.rows
}
@@ -248,6 +248,37 @@ export async function releaseConsignmentPublishDepositBySubmissionWithClient(
now: string
},
): Promise<number> {
// 一条提报单可能对应多件库存 / 一份库存拆给多张订单:只有全部售出或作废后才能退发布押金。
const active = await client.query<{ active: boolean }>(
`
SELECT (
EXISTS (
SELECT 1 FROM consignment_inventories ci
WHERE ci.source_submission_id = $1
AND ci.status = 'in_stock'
AND ci.remaining_quantity > 0
)
OR EXISTS (
SELECT 1
FROM consignment_inventory_allocations ca
JOIN consignment_inventories ci2 ON ci2.id = ca.inventory_id
LEFT JOIN work_order_shares wos ON wos.id = ca.work_order_share_id
LEFT JOIN work_orders wo ON wo.id = ca.work_order_id
WHERE ci2.source_submission_id = $1
AND ca.status = 'reserved'
AND (
(ca.work_order_share_id IS NOT NULL
AND COALESCE(wos.status, 'joined') NOT IN ('accepted', 'cancelled'))
OR (ca.work_order_share_id IS NULL
AND COALESCE(wo.status, '') NOT IN ('accepted', 'completed', 'cancelled'))
)
)
) AS active
`,
[input.submissionId],
)
if (active.rows[0]?.active === true) return 0
const target = await getConsignmentSubmissionDepositTarget(client, input.submissionId)
if (!target) return 0
return releaseConsignmentPublishDepositWithClient(client, {
@@ -152,11 +152,24 @@ test('我的寄卖:关键字必须覆盖卖家找单的口径(单号/规格/
assert.ok(body.includes(field), `关键字查询缺少可搜字段:${field}`)
}
// 兜底行(没有归属提报单的库存)里不能引用提报单别名,否则真库直接 42703 报错
const orphanStart = body.indexOf('orphanKeywordFilter = `')
const orphanEnd = body.indexOf('`', orphanStart + 'orphanKeywordFilter = `'.length)
const orphanBody = body.slice(orphanStart, orphanEnd)
assert.ok(!orphanBody.includes('cs.'), '兜底库存行的关键字条件引用了提报单别名 cs.')
// 待审核行还没有库存,关键字条件不能引用 ci./wo.,否则真库直接 42703 报错
const pendingStart = body.indexOf('pendingKeywordFilter = `')
assert.ok(pendingStart > 0, '缺少待审核行的关键字条件')
const pendingEnd = body.indexOf('`', pendingStart + 'pendingKeywordFilter = `'.length)
const pendingBody = body.slice(pendingStart, pendingEnd)
assert.ok(
!pendingBody.includes('ci.') && !pendingBody.includes('wo.'),
'待审核行没有库存/工单别名,关键字条件不能引用 ci./wo.',
)
// 一库存拆给多张订单后,基表必须同时产出“占用行”和“剩余库存行”
assert.ok(body.includes('ca.id AS allocation_id'), '缺少占用行')
assert.ok(body.includes('ca.quantity AS row_quantity'), '占用行必须带出本单数量')
assert.ok(body.includes("ca.status IN ('reserved', 'consumed')"), '占用行口径错误')
assert.ok(
body.includes('SELECT 1 FROM consignment_inventory_allocations ca0'),
'剩余库存行必须排除已有占用的库存',
)
})
test('我的寄卖:分页与分组过滤必须走 SQL,不能再把全量记录捞回前端', async () => {
@@ -1,5 +1,10 @@
import type { PoolClient } from 'pg'
import { query, withTransaction } from '../../db/client.js'
import {
releaseConsignmentAllocationRowsWithClient,
releaseConsignmentAllocationsForWorkOrderWithClient,
type ConsignmentAllocationRow,
} from './consignment-allocation-repo.js'
import { toJsonString } from './shared.js'
import { isWorkOrderGiftDepositForfeitable } from '../../domain/work-order-acceptance-mode.js'
@@ -883,7 +888,63 @@ export async function releaseConsignmentInventoryBindingForWorkOrderWithClient(
}>('SELECT acceptance_mode, friend_added_at FROM work_orders WHERE id = $1', [workOrderId])
const order = orderRes.rows[0]
if (!order) return null
const archiveOnly = isWorkOrderGiftDepositForfeitable(order)
const confirmedShare = await client.query<{ id: number }>(
`SELECT ca.id
FROM consignment_inventory_allocations ca
JOIN work_order_shares wos ON wos.id = ca.work_order_share_id
WHERE ca.work_order_id = $1 AND wos.friend_added_at IS NOT NULL
LIMIT 1`,
[Number(workOrderId)],
)
const archiveOnly = isWorkOrderGiftDepositForfeitable(order) || Boolean(confirmedShare.rows[0])
if (archiveOnly) {
// 已确认加好友的份额作废下架;未确认的份额正常回库。整单级 friend_added_at 只作为兜底。
const allocationResult = await client.query<
ConsignmentAllocationRow & { friend_added_at: string | null }
>(
`SELECT ca.*, wos.friend_added_at
FROM consignment_inventory_allocations ca
LEFT JOIN work_order_shares wos ON wos.id = ca.work_order_share_id
WHERE ca.work_order_id = $1 AND ca.status IN ('reserved', 'consumed')
FOR UPDATE OF ca`,
[Number(workOrderId)],
)
for (const row of allocationResult.rows) {
if (row.friend_added_at) {
await client.query(
`
UPDATE consignment_inventories
SET
status = 'archived',
remaining_quantity = 0,
allow_matching = FALSE,
allocation_status = '待安排',
bound_order_id = NULL,
bound_work_order_id = NULL,
bound_platform_order_id = '',
shop_name = '',
consumed_at = NULL,
updated_at = $1
WHERE id = $2
`,
[input.now, row.inventory_id],
)
await client.query(
`UPDATE consignment_inventory_allocations SET status = 'released', updated_at = $1 WHERE id = $2`,
[input.now, row.id],
)
} else {
await releaseConsignmentAllocationRowsWithClient(client, [row], input.now)
}
}
} else {
// 普通回库:先按分配记录回补数量,再走下面的单绑定兜底(兼容没有分配记录的历史数据)。
await releaseConsignmentAllocationsForWorkOrderWithClient(
client,
Number(workOrderId),
input.now,
)
}
const res = await client.query<ConsignmentInventoryRow>(
archiveOnly
@@ -891,6 +952,7 @@ export async function releaseConsignmentInventoryBindingForWorkOrderWithClient(
UPDATE consignment_inventories
SET
status = 'archived',
remaining_quantity = 0,
allocation_status = '待安排',
assigned_worker_id = NULL,
bound_order_id = NULL,
@@ -1064,6 +1126,12 @@ export type WorkerConsignmentGroup = 'all' | 'reviewing' | 'active' | 'finished'
export type WorkerConsignmentRowKey = {
submissionId: number | null
inventoryId: number | null
/** 一条库存拆分给多张订单时,按占用记录拆行;库存剩余行/待审核行没有 */
allocationId: number | null
shareId: number | null
workOrderId: number | null
/** 本行对应的数量:占用行为占用数,库存剩余行为剩余数,待审核行为 1 */
rowQuantity: number
createdAt: string
}
@@ -1096,13 +1164,27 @@ export async function listWorkerConsignmentPage(input: {
}): Promise<WorkerConsignmentPage> {
const values: unknown[] = [input.workerId]
const keyword = String(input.keyword || '').trim()
let submissionKeywordFilter = ''
let orphanKeywordFilter = ''
let pendingKeywordFilter = ''
let inventoryKeywordFilter = ''
if (keyword) {
values.push(`%${keyword}%`)
const p = `$${values.length}`
// 提报单行:提报单 + 它产出的库存 + 绑定工单上的买家资料
submissionKeywordFilter = `
// 待审核行还没有库存,只能搜提报单字段
pendingKeywordFilter = `
AND (
cs.submission_no ILIKE ${p}
OR cs.item_name ILIKE ${p}
OR cs.spec_text ILIKE ${p}
OR cs.system ILIKE ${p}
OR cs.server_zone ILIKE ${p}
OR cs.series ILIKE ${p}
OR cs.diamond_level::text || '钻' ILIKE ${p}
OR cs.seller_game_id ILIKE ${p}
OR cs.contact_info ILIKE ${p}
OR cs.seller_phone ILIKE ${p}
)`
// 库存行 / 占用行:提报单 + 库存 + 绑定工单上的买家资料
inventoryKeywordFilter = `
AND (
cs.submission_no ILIKE ${p}
OR cs.item_name ILIKE ${p}
@@ -1127,63 +1209,77 @@ export async function listWorkerConsignmentPage(input: {
OR wo.material_json -> 'collect' -> 'fields' ->> 'characterId' ILIKE ${p}
OR wo.material_json -> 'collect' -> 'fields' ->> 'uid' ILIKE ${p}
)`
// 兜底行(没有归属提报单的库存):只能搜库存与买家资料,不能引用提报单别名
orphanKeywordFilter = `
AND (
ci.inventory_no ILIKE ${p}
OR ci.item_name ILIKE ${p}
OR ci.system ILIKE ${p}
OR ci.server_zone ILIKE ${p}
OR ci.series ILIKE ${p}
OR ci.diamond_level::text || '钻' ILIKE ${p}
OR ci.seller_game_id ILIKE ${p}
OR ci.seller_contact ILIKE ${p}
OR ci.seller_phone ILIKE ${p}
OR wo.material_json -> 'collect' -> 'fields' ->> 'gameNickname' ILIKE ${p}
OR wo.material_json -> 'collect' -> 'fields' ->> 'roleName' ILIKE ${p}
OR wo.material_json -> 'collect' -> 'fields' ->> 'nickname' ILIKE ${p}
OR wo.material_json -> 'collect' -> 'fields' ->> 'gameId' ILIKE ${p}
OR wo.material_json -> 'collect' -> 'fields' ->> 'characterId' ILIKE ${p}
OR wo.material_json -> 'collect' -> 'fields' ->> 'uid' ILIKE ${p}
)`
}
// 提报单行(连带它产出的库存与绑定工单)与「没有归属提报单的库存」兜底行
// 三类行:待审核提报单(无库存)、库存剩余数量、库存占用记录(一库存可拆给多张订单)
const baseSql = `
WITH base AS (
SELECT
cs.id AS submission_id,
ci.id AS inventory_id,
NULL::bigint AS inventory_id,
NULL::bigint AS allocation_id,
NULL::bigint AS share_id,
NULL::bigint AS work_order_id,
1::integer AS row_quantity,
cs.created_at AS sort_at,
CASE
WHEN cs.status = 'pending_review' THEN 'reviewing'
WHEN cs.status = 'rejected' THEN 'finished'
ELSE 'active'
END AS group_key
FROM consignment_submissions cs
WHERE cs.worker_id = $1
AND NOT EXISTS (
SELECT 1 FROM consignment_inventories ci0 WHERE ci0.source_submission_id = cs.id
)
${pendingKeywordFilter}
UNION ALL
SELECT
cs.id AS submission_id,
ci.id AS inventory_id,
NULL::bigint AS allocation_id,
NULL::bigint AS share_id,
NULL::bigint AS work_order_id,
GREATEST(ci.remaining_quantity, 0) AS row_quantity,
ci.created_at AS sort_at,
CASE
WHEN cs.status = 'rejected' THEN 'finished'
WHEN ci.status = 'archived' THEN 'finished'
ELSE 'active'
END AS group_key
FROM consignment_inventories ci
LEFT JOIN consignment_submissions cs ON cs.id = ci.source_submission_id
LEFT JOIN work_orders wo ON wo.id = ci.bound_work_order_id
WHERE ci.worker_id = $1
AND (
ci.remaining_quantity > 0
OR NOT EXISTS (
SELECT 1 FROM consignment_inventory_allocations ca0
WHERE ca0.inventory_id = ci.id AND ca0.status IN ('reserved', 'consumed')
)
)
${inventoryKeywordFilter}
UNION ALL
SELECT
cs.id AS submission_id,
ci.id AS inventory_id,
ca.id AS allocation_id,
ca.work_order_share_id AS share_id,
ca.work_order_id AS work_order_id,
ca.quantity AS row_quantity,
ca.created_at AS sort_at,
CASE
WHEN cs.status = 'rejected' THEN 'finished'
WHEN ci.status = 'archived' THEN 'finished'
WHEN wo.status IN ('cancelled', 'accepted', 'completed') THEN 'finished'
ELSE 'active'
END AS group_key
FROM consignment_submissions cs
LEFT JOIN consignment_inventories ci ON ci.source_submission_id = cs.id
LEFT JOIN work_orders wo ON wo.id = ci.bound_work_order_id
WHERE cs.worker_id = $1
${submissionKeywordFilter}
UNION ALL
SELECT
NULL AS submission_id,
ci.id AS inventory_id,
ci.created_at AS sort_at,
CASE
WHEN ci.status = 'archived' THEN 'finished'
WHEN wo.status IN ('cancelled', 'accepted', 'completed') THEN 'finished'
ELSE 'active'
END AS group_key
FROM consignment_inventories ci
LEFT JOIN work_orders wo ON wo.id = ci.bound_work_order_id
FROM consignment_inventory_allocations ca
JOIN consignment_inventories ci ON ci.id = ca.inventory_id
LEFT JOIN consignment_submissions cs ON cs.id = ci.source_submission_id
JOIN work_orders wo ON wo.id = ca.work_order_id
WHERE ci.worker_id = $1
AND NOT EXISTS (
SELECT 1 FROM consignment_submissions cs2
WHERE cs2.id = ci.source_submission_id AND cs2.worker_id = $1
)
${orphanKeywordFilter}
AND ca.status IN ('reserved', 'consumed')
${inventoryKeywordFilter}
)
`
@@ -1226,13 +1322,20 @@ export async function listWorkerConsignmentPage(input: {
const listRes = await query<{
submission_id: string | number | null
inventory_id: string | number | null
allocation_id: string | number | null
share_id: string | number | null
work_order_id: string | number | null
row_quantity: number | string
sort_at: string
}>(
`${baseSql}
SELECT submission_id, inventory_id, sort_at
SELECT submission_id, inventory_id, allocation_id, share_id, work_order_id, row_quantity, sort_at
FROM base
${groupFilter}
ORDER BY sort_at DESC, COALESCE(submission_id, 0) DESC, COALESCE(inventory_id, 0) DESC
ORDER BY sort_at DESC,
COALESCE(submission_id, 0) DESC,
COALESCE(inventory_id, 0) DESC,
COALESCE(allocation_id, 0) DESC
LIMIT $${listValues.length - 1} OFFSET $${listValues.length}`,
listValues,
)
@@ -1241,6 +1344,10 @@ export async function listWorkerConsignmentPage(input: {
rows: listRes.rows.map((row) => ({
submissionId: row.submission_id == null ? null : Number(row.submission_id),
inventoryId: row.inventory_id == null ? null : Number(row.inventory_id),
allocationId: row.allocation_id == null ? null : Number(row.allocation_id),
shareId: row.share_id == null ? null : Number(row.share_id),
workOrderId: row.work_order_id == null ? null : Number(row.work_order_id),
rowQuantity: Math.max(0, Number(row.row_quantity || 0)),
createdAt: row.sort_at,
})),
total,
@@ -383,6 +383,9 @@ export type WorkOrderShareRow = {
request_id?: string
/** 拼单份额对应的寄卖库存;非寄卖份额为 NULL */
consignment_inventory_id?: number | null
/** 寄卖拼单份额:卖家确认加好友时间 / 赠送冷却结束时间 */
friend_added_at?: string | null
gift_available_at?: string | null
worker_username?: string
worker_display_name?: string
}
@@ -2,6 +2,11 @@ import type { PoolClient } from 'pg'
import { query, withTransaction } from '../../db/client.js'
import { resolveShareReduceTargetQuantity } from '../../domain/work-order-share-quantity.js'
import {
isFriendGiftAcceptanceMode,
normalizeWorkOrderGiftCooldownHours,
normalizeWorkOrderGiftCooldownMinutes,
} from '../../domain/work-order-acceptance-mode.js'
import {
ensureWorkerWalletWithClient,
getWorkerWalletWithClient,
@@ -136,6 +141,95 @@ export async function getWorkOrderShareById(
return result.rows[0] || null
}
/**
* 寄卖拼单份额:卖家确认已加买家好友。
* 冷却起止只写这一条份额,不影响同单其他卖家。
*/
export async function confirmWorkOrderShareFriendAdded(input: {
workOrderId: number
shareId: number
actorType?: 'admin' | 'worker'
actorId?: string
now: string
}): Promise<{
share: WorkOrderShareRow | null
failureReason:
| 'work_order_not_found'
| 'work_order_gift_mode_invalid'
| 'share_not_found'
| 'share_status_invalid'
| 'share_not_consignment'
| null
}> {
return withTransaction(async (client) => {
const orderResult = await client.query<WorkOrderRow>(
'SELECT * FROM work_orders WHERE id = $1 FOR UPDATE',
[Number(input.workOrderId)],
)
const workOrder = orderResult.rows[0] || null
if (!workOrder) return { share: null, failureReason: 'work_order_not_found' }
if (!isFriendGiftAcceptanceMode(workOrder.acceptance_mode)) {
return { share: null, failureReason: 'work_order_gift_mode_invalid' }
}
const lockResult = await client.query<{ id: number }>(
`SELECT id FROM work_order_shares
WHERE id = $1 AND work_order_id = $2
FOR UPDATE`,
[Number(input.shareId), Number(input.workOrderId)],
)
if (!lockResult.rows[0]) return { share: null, failureReason: 'share_not_found' }
const shareResult = await client.query<WorkOrderShareRow>(
`${WORK_ORDER_SHARE_SELECT} WHERE wos.id = $1 LIMIT 1`,
[Number(input.shareId)],
)
const share = shareResult.rows[0] || null
if (!share) return { share: null, failureReason: 'share_not_found' }
if (share.status !== 'joined') return { share, failureReason: 'share_status_invalid' }
if (!Number(share.consignment_inventory_id || 0)) {
return { share, failureReason: 'share_not_consignment' }
}
const cooldownHours = normalizeWorkOrderGiftCooldownHours(workOrder.gift_cooldown_hours)
const cooldownMinutes = normalizeWorkOrderGiftCooldownMinutes(workOrder.gift_cooldown_minutes)
await client.query(
`
UPDATE work_order_shares
SET friend_added_at = $1::timestamptz,
gift_available_at = $1::timestamptz
+ ($2::int * INTERVAL '1 hour')
+ ($3::int * INTERVAL '1 minute'),
updated_at = $1::timestamptz
WHERE id = $4
`,
[input.now, cooldownHours, cooldownMinutes, Number(input.shareId)],
)
await createWorkOrderEventWithClient(client, {
workOrderId: Number(input.workOrderId),
actorType: input.actorType || 'worker',
actorId: input.actorId || '',
eventType: 'consignment_share_gift_countdown_started',
fromStatus: workOrder.status,
toStatus: workOrder.status,
payloadJson: JSON.stringify({
shareId: Number(input.shareId),
workerId: Number(share.worker_id),
inventoryId: Number(share.consignment_inventory_id),
cooldownHours,
cooldownMinutes,
friendAddedAt: input.now,
}),
now: input.now,
})
const updated = await client.query<WorkOrderShareRow>(
`${WORK_ORDER_SHARE_SELECT} WHERE wos.id = $1 LIMIT 1`,
[Number(input.shareId)],
)
return { share: updated.rows[0] || null, failureReason: null }
})
}
/** 普通拼单使用指定份数,立即抢单则在事务中承接全部剩余份数。 */
export function resolveWorkOrderShareJoinQuantity(input: {
quantity: number
@@ -546,6 +640,8 @@ export async function submitWorkOrderShareAcceptance(input: {
shareId: number
acceptanceJson: string
now: string
/** 寄卖拼单:母单是 in_progress,提交份额后不能按大厅规则把母单改回 open */
preserveWorkOrderStatus?: boolean
}): Promise<{
share: WorkOrderShareRow | null
failureReason: 'share_not_found' | 'share_status_invalid' | 'work_order_status_invalid' | null
@@ -562,9 +658,6 @@ export async function submitWorkOrderShareAcceptance(input: {
if (!workOrder) {
return { share: null, failureReason: 'share_not_found' }
}
if (!['open', 'pending_acceptance'].includes(workOrder.status)) {
return { share: null, failureReason: 'work_order_status_invalid' }
}
const lockResult = await client.query<{ id: number }>(
`
@@ -587,6 +680,12 @@ export async function submitWorkOrderShareAcceptance(input: {
if (!share) {
return { share: null, failureReason: 'share_not_found' }
}
const consignmentShare = Number(share.consignment_inventory_id || 0) > 0
const allowedStatuses = ['open', 'pending_acceptance']
if (consignmentShare || input.preserveWorkOrderStatus) allowedStatuses.push('in_progress')
if (!allowedStatuses.includes(workOrder.status)) {
return { share: null, failureReason: 'work_order_status_invalid' }
}
if (share.status !== 'joined') {
return { share, failureReason: 'share_status_invalid' }
}
@@ -599,7 +698,9 @@ export async function submitWorkOrderShareAcceptance(input: {
[input.acceptanceJson, input.now, Number(share.id)],
)
await recomputeWorkOrderSharingStatusWithClient(client, input.workOrderId, input.now)
if (!consignmentShare && !input.preserveWorkOrderStatus) {
await recomputeWorkOrderSharingStatusWithClient(client, input.workOrderId, input.now)
}
await createWorkOrderEventWithClient(client, {
workOrderId: input.workOrderId,
@@ -612,6 +713,7 @@ export async function submitWorkOrderShareAcceptance(input: {
workerId: input.workerId,
shareId: Number(share.id),
quantity: share.quantity,
consignmentShare,
}),
now: input.now,
})