完善借款、编号、付款与预算并发及验收(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项公网义务仍开放。生产编号未启用、差旅仍冻结;不推送、不部署,不宣称发布资格。
这个提交包含在:
@@ -255,7 +255,7 @@ describe("travelOrders routes", () => {
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("marks confirmed order as paid and enqueues ERP journal", async () => {
|
||||
it("marks confirmed order as paid without ERP side effects", async () => {
|
||||
const { prisma, state } = buildPrisma({
|
||||
currentOrder: buildTravelOrderRecord(),
|
||||
});
|
||||
@@ -279,11 +279,10 @@ describe("travelOrders routes", () => {
|
||||
paymentVoucherNo: "BANK-001",
|
||||
paymentDate: "2026-03-10",
|
||||
paymentChannel: "bank_transfer",
|
||||
erpJournal: expect.objectContaining({ enqueued: true, outboxId: "outbox-1" }),
|
||||
}),
|
||||
);
|
||||
expect(state.currentOrder.status).toBe("paid");
|
||||
expect(prisma.integrationOutbox.create).toHaveBeenCalledTimes(1);
|
||||
expect(prisma.integrationOutbox.create).not.toHaveBeenCalled();
|
||||
|
||||
await app.close();
|
||||
});
|
||||
@@ -315,9 +314,6 @@ describe("travelOrders routes", () => {
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.json().data.erpJournal).toEqual(
|
||||
expect.objectContaining({ enqueued: true, outboxId: "outbox-existing" }),
|
||||
);
|
||||
expect(prisma.travelOrder.update).not.toHaveBeenCalled();
|
||||
|
||||
await app.close();
|
||||
@@ -346,7 +342,7 @@ describe("travelOrders routes", () => {
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(409);
|
||||
expect(response.json().error.details).toEqual({ payment: "already_paid_conflict" });
|
||||
expect(response.json().error.details).toEqual({ payment: "already_paid_conflict", reasonCode: "travel_order.already_paid_conflict" });
|
||||
|
||||
await app.close();
|
||||
});
|
||||
@@ -370,34 +366,35 @@ describe("travelOrders routes", () => {
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(409);
|
||||
expect(response.json().error.details).toEqual({ payment: "missing_settled_transaction" });
|
||||
|
||||
await app.close();
|
||||
});
|
||||
|
||||
it("skips ERP enqueue when gate is off", async () => {
|
||||
const { prisma } = buildPrisma({
|
||||
currentOrder: buildTravelOrderRecord(),
|
||||
});
|
||||
const app = await buildApp({ prisma, config: { erpSyncEnabled: false } });
|
||||
|
||||
const response = await app.inject({
|
||||
method: "POST",
|
||||
url: "/api/travel-orders/11111111-1111-4111-8111-111111111111/mark-paid",
|
||||
headers: { authorization: "Bearer test" },
|
||||
payload: {
|
||||
paymentVoucherNo: "BANK-001",
|
||||
paymentDate: "2026-03-10",
|
||||
paymentChannel: "bank_transfer",
|
||||
},
|
||||
});
|
||||
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(response.json().data.erpJournal).toEqual(
|
||||
expect.objectContaining({ enqueued: false, outboxId: null }),
|
||||
);
|
||||
expect(prisma.integrationOutbox.create).not.toHaveBeenCalled();
|
||||
expect(response.json().error.details).toEqual({ payment: "missing_settled_transaction", reasonCode: "travel_order.settled_transaction_required" });
|
||||
|
||||
await app.close();
|
||||
});
|
||||
});
|
||||
|
||||
|
||||
describe("travel payment calendar input", () => {
|
||||
it.each(["2026-02-29", "2026-04-31", "2026-13-01", ""])("rejects %s before payment side effects", async (date) => {
|
||||
const { prisma, state } = buildPrisma({ currentOrder: buildTravelOrderRecord() });
|
||||
const app = await buildApp({ prisma });
|
||||
try {
|
||||
const response = await app.inject({ method: "POST", url: `/api/travel-orders/${state.currentOrder.id}/mark-paid`, headers: { authorization: "Bearer test" }, payload: { paymentDate: date } });
|
||||
expect(response.statusCode).toBe(400);
|
||||
expect(prisma.$transaction).not.toHaveBeenCalled();
|
||||
expect(prisma.travelOrder.update).not.toHaveBeenCalled();
|
||||
expect(prisma.integrationOutbox.create).not.toHaveBeenCalled();
|
||||
expect(prisma.auditLog.create).not.toHaveBeenCalled();
|
||||
expect(state.currentOrder.status).toBe("confirmed");
|
||||
} finally { await app.close(); }
|
||||
});
|
||||
it.each(["2024-02-29", "2026-04-30", null, undefined])("preserves payment date %s", async (date) => {
|
||||
const { prisma, state } = buildPrisma({ currentOrder: buildTravelOrderRecord() });
|
||||
const app = await buildApp({ prisma });
|
||||
try {
|
||||
const response = await app.inject({ method: "POST", url: `/api/travel-orders/${state.currentOrder.id}/mark-paid`, headers: { authorization: "Bearer test" }, payload: { paymentVoucherNo: "SYNTHETIC", paymentChannel: "bank_transfer", ...(date === undefined ? {} : { paymentDate: date }) } });
|
||||
expect(response.statusCode).toBe(200);
|
||||
expect(state.currentOrder.payment_date).toEqual(date ? new Date(`${date}T00:00:00.000Z`) : null);
|
||||
expect(state.currentOrder.status).toBe("paid");
|
||||
} finally { await app.close(); }
|
||||
});
|
||||
});
|
||||
|
||||
在新工单中引用
屏蔽一个用户