完善借款、编号、付款与预算并发及验收（09-06-release-gate-integrity）
汇总已落盘的借款本金与还款、兼容历史编号的周期化编号、付款责任与回单核验、报销进度和排序、PWA/采购事务、错误原因与日期校验及ERP退役。 统一共享预算池锁序和锁后判断，恢复差旅原预算选择，补原因码固定夹具及反向完整性检查。 纳入配套迁移、测试、受管QA、分层验收合同、规约及任务记录；原始证据留在ignored artifacts。 关联任务：09-17-company-loan-principal-repayment、09-17-erp-exclusive-retirement、09-18-reimbursement-periodic-numbering、09-08-reimbursement-payment-closeout、09-18-local-concurrency-product-fixes、09-19-budget-pool-concurrency、09-05-error-explainability-payment-readiness。 预算补审由Claude定向验证2文件928项通过，原4446/28及r6结果仍仅对应各自历史输入；本轮未重跑测试。 完整新候选门禁、R1真实入口接入与12项公网义务仍开放。生产编号未启用、差旅仍冻结；不推送、不部署，不宣称发布资格。
这个提交包含在：
+19
-95
@@ -1,4 +1,3 @@
|
||||
const { AppError } = require("./AppError");
|
||||
const { buildBusinessValidationError } = require("./businessValidationError");
|
||||
|
||||
const FINANCE_OWNER_APPROVAL_STEP_ID = "approval_1_ceo_finance_owner";
|
||||
@@ -35,12 +34,7 @@ const OWNER_SELF_FALLBACK_REASONS = new Set([
|
||||
function parseWorkflowSteps(definitionJson) {
|
||||
const steps = definitionJson?.steps;
|
||||
if (!Array.isArray(steps) || steps.length === 0) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "invalid_steps" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.steps_invalid", { workflow: "invalid_steps" }, 400);
|
||||
}
|
||||
|
||||
return steps;
|
||||
@@ -55,22 +49,12 @@ function assertBusinessApprovalRoleCode(roleCode) {
|
||||
return roleCode;
|
||||
}
|
||||
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "unsupported_business_approval_role" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.business_role_unsupported", { workflow: "unsupported_business_approval_role" }, 400);
|
||||
}
|
||||
|
||||
function buildWorkflowStepsFromApprovalRule(approvalRule) {
|
||||
if (!approvalRule || typeof approvalRule !== "object") {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "invalid_approval_rule" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.approval_rule_invalid", { workflow: "invalid_approval_rule" }, 400);
|
||||
}
|
||||
|
||||
const roleCodes = [
|
||||
@@ -80,12 +64,7 @@ function buildWorkflowStepsFromApprovalRule(approvalRule) {
|
||||
].filter(Boolean);
|
||||
|
||||
if (roleCodes.length === 0) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "empty_approval_chain" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.approval_chain_empty", { workflow: "empty_approval_chain" }, 400);
|
||||
}
|
||||
|
||||
roleCodes.forEach(assertBusinessApprovalRoleCode);
|
||||
@@ -179,24 +158,14 @@ function assertOwnerSelfFallbackRole(roleCode, ownerRoleCodes) {
|
||||
}
|
||||
|
||||
if (!SUPPORTED_OWNER_SELF_FALLBACK_ROLES.has(roleCode)) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { ownerSelfFallbackRole: "unsupported_business_approval_role" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.fallback_role_unsupported", { ownerSelfFallbackRole: "unsupported_business_approval_role" }, 400);
|
||||
}
|
||||
|
||||
if (ownerRoleCodes?.has(roleCode)) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 409,
|
||||
details: {
|
||||
throw buildBusinessValidationError("workflow.fallback_role_is_self", {
|
||||
workflow: "no_actionable_approver",
|
||||
reason: "owner_self_fallback_self_role",
|
||||
},
|
||||
});
|
||||
}, 409);
|
||||
}
|
||||
|
||||
return roleCode;
|
||||
@@ -291,16 +260,11 @@ async function buildApprovalWorkflowSnapshot({ tx, approvalRule, ownerId, submit
|
||||
|
||||
const hasHolder = await hasActiveNonSelfRoleHolder(tx, fallbackRole, ownerId);
|
||||
if (!hasHolder) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 409,
|
||||
details: {
|
||||
throw buildBusinessValidationError("workflow.fallback_holder_unavailable", {
|
||||
workflow: "no_actionable_approver",
|
||||
reason: "owner_self_fallback_role_unavailable",
|
||||
fallbackRole,
|
||||
},
|
||||
});
|
||||
}, 409);
|
||||
}
|
||||
|
||||
if (!seenRoleCodes.has(fallbackRole)) {
|
||||
@@ -317,15 +281,10 @@ async function buildApprovalWorkflowSnapshot({ tx, approvalRule, ownerId, submit
|
||||
}
|
||||
|
||||
if (normalizedSteps.length === 0) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 409,
|
||||
details: {
|
||||
throw buildBusinessValidationError("workflow.fallback_chain_empty", {
|
||||
workflow: "no_actionable_approver",
|
||||
reason: "owner_self_fallback_empty_chain",
|
||||
},
|
||||
});
|
||||
}, 409);
|
||||
}
|
||||
|
||||
return normalizedSteps;
|
||||
@@ -423,22 +382,12 @@ async function resolveDepartmentManagerAssignee({ tx, ownerId, logger }) {
|
||||
|
||||
async function resolveAssigneeFromRule(rule, options = {}) {
|
||||
if (!rule || typeof rule !== "object") {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "invalid_assignee_rule" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.assignee_rule_invalid", { workflow: "invalid_assignee_rule" }, 400);
|
||||
}
|
||||
|
||||
if (rule.type === "role") {
|
||||
if (typeof rule.value !== "string" || !rule.value) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "invalid_role_assignee" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.role_assignee_invalid", { workflow: "invalid_role_assignee" }, 400);
|
||||
}
|
||||
assertBusinessApprovalRoleCode(rule.value);
|
||||
|
||||
@@ -452,12 +401,7 @@ async function resolveAssigneeFromRule(rule, options = {}) {
|
||||
|
||||
if (rule.type === "specific_user") {
|
||||
if (typeof rule.value !== "string" || !UUID_REGEX.test(rule.value)) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "invalid_specific_user_assignee" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.user_assignee_invalid", { workflow: "invalid_specific_user_assignee" }, 400);
|
||||
}
|
||||
|
||||
return {
|
||||
@@ -473,12 +417,7 @@ async function resolveAssigneeFromRule(rule, options = {}) {
|
||||
const tx = options.tx;
|
||||
|
||||
if (!ownerId || !UUID_REGEX.test(ownerId) || !tx) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "invalid_department_manager_context" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.manager_context_invalid", { workflow: "invalid_department_manager_context" }, 400);
|
||||
}
|
||||
|
||||
const managerResult = await resolveDepartmentManagerAssignee({
|
||||
@@ -504,12 +443,7 @@ async function resolveAssigneeFromRule(rule, options = {}) {
|
||||
};
|
||||
}
|
||||
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "unsupported_assignee_rule_type" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.assignee_type_unsupported", { workflow: "unsupported_assignee_rule_type" }, 400);
|
||||
}
|
||||
|
||||
async function resolveActionableStep({
|
||||
@@ -544,16 +478,11 @@ async function resolveActionableStep({
|
||||
|
||||
if (resolved.skipReason) {
|
||||
if (blockOnUnresolvedAssignee && BLOCKING_ASSIGNEE_SKIP_REASONS.has(resolved.skipReason)) {
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 409,
|
||||
details: {
|
||||
throw buildBusinessValidationError("workflow.manager_unavailable", {
|
||||
workflow: "no_actionable_approver",
|
||||
reason: resolved.skipReason,
|
||||
stepId: step.id,
|
||||
},
|
||||
});
|
||||
}, 409);
|
||||
}
|
||||
|
||||
skipped.push({
|
||||
@@ -565,12 +494,7 @@ async function resolveActionableStep({
|
||||
continue;
|
||||
}
|
||||
|
||||
throw new AppError({
|
||||
code: "VALID_001",
|
||||
message: "参数校验失败",
|
||||
statusCode: 400,
|
||||
details: { workflow: "invalid_resolved_assignee" },
|
||||
});
|
||||
throw buildBusinessValidationError("workflow.assignee_resolution_invalid", { workflow: "invalid_resolved_assignee" }, 400);
|
||||
}
|
||||
|
||||
return {
|
||||
|
||||
在新工单中引用
屏蔽一个用户