[CLAUDE] PE workflow 3-button Duyệt/Trả lại/Từ chối (Task 4)
All checks were successful
Deploy SOLUTION_ERP / build-deploy (push) Successful in 3m6s

User chỉ thị thay 2-button hiện tại bằng 3 hành động rõ ràng:
- Duyệt = forward phase tiếp theo
- Trả lại = về DangSoanThao + Drafter sửa → workflow tự jump tới phase
  đã reject (smart reject Mig 16 pattern + clear N-stage rows)
- Từ chối = phiếu khoá hoàn toàn (Phase=TuChoi → 17 handler Mig 16 lock
  edit). Drafter phải tạo phiếu mới.

Domain (PurchaseEvaluationPolicy.cs):
- NccOnly + NccWithPlan: thêm (X → TuChoi) transition cho mọi phase
  trung gian (ChoPurchasing/ChoCCM/ChoCEODuyetNCC/ChoDuAn/ChoCEODuyetPA)
  với roles của phase đó. Trước đây chỉ DangSoanThao → TuChoi (Drafter).
- FromDefinition expand: mỗi step (trừ DangSoanThao) thêm
  (step.Phase → TuChoi) với roles của step.

Service (PurchaseEvaluationWorkflowService.cs):
- Reject branch tách 2 case:
  * target=TuChoi → giữ nguyên (KHÔNG override + KHÔNG set
    RejectedFromPhase + KHÔNG clear N-stage rows). Phiếu khoá vĩnh viễn.
  * target khác (thường DangSoanThao) → smart reject (set
    RejectedFromPhase + force DangSoanThao + clear N-stage rows).

FE (PeWorkflowPanel.tsx, fe-admin + fe-user mirror):
- next.phases render 3 button rõ ràng:
  * "✓ Duyệt → <label>" brand (forward)
  * "← Trả lại (về Drafter sửa)" red (target=DangSoanThao + isSendBack)
  * "✗ Hủy / Từ chối" red (target=TuChoi)
- Decision logic: target=TuChoi || isSendBack → Reject (2), else Approve (1)
- Dialog confirm:
  * Title rõ theo loại hành động
  * Cancel case: warning red "Phiếu sẽ bị khoá hoàn toàn"
  * SendBack case: hint amber "Phiếu sẽ về Đang soạn thảo, Drafter sửa
    rồi trình lại — workflow tự jump tới phase này"

Tests update + add 1 test mới:
- Reject_Sets_RejectedFromPhase_And_Forces_DangSoanThao →
  Reject_To_DangSoanThao_Sets_RejectedFromPhase_TraLai (rename + change
  target từ TuChoi → DangSoanThao để test Trả lại pattern)
- + Reject_To_TuChoi_Locks_Permanently_No_RejectedFromPhase (NEW test
  Từ chối — phase=TuChoi + RejectedFromPhase null)
- NStage_Reject_Clears_InnerStep_Rows_At_Phase: target TuChoi →
  DangSoanThao (test Trả lại + clear N-stage rows pattern)

Verify:
- dotnet build 0 error
- dotnet test 95 → **96 pass** (+1 test mới Từ chối)
- npm build fe-admin + fe-user pass

Pending Task 2: Sample data seed N-stage.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
pqhuy1987
2026-05-07 19:25:44 +07:00
parent b06bdce694
commit 0d776987e4
6 changed files with 214 additions and 87 deletions

View File

@ -278,11 +278,11 @@ public class PeNStageApprovalTests : IClassFixture<IdentityFixture>
pe = await _db.PurchaseEvaluations.FirstAsync(x => x.Id == pe.Id);
// Act: admin reject (skip 2-stage gate).
// Act: admin "Trả lại" (target=DangSoanThao + decision=Reject Session 14).
var admin = await _fx.CreateUserAsync($"adm-rej-{Guid.NewGuid():N}@test", "Admin", null, ["Admin"]);
await _service.TransitionAsync(
pe, PurchaseEvaluationPhase.TuChoi, admin.Id, ["Admin"],
ApprovalDecision.Reject, "reject test");
pe, PurchaseEvaluationPhase.DangSoanThao, admin.Id, ["Admin"],
ApprovalDecision.Reject, "trả lại test");
// Assert: phase = DangSoanThao, RejectedFromPhase = ChoPurchasing,
// N-stage rows tại ChoPurchasing đã clear.

View File

@ -197,24 +197,41 @@ public class PeTwoStageApprovalTests : IClassFixture<IdentityFixture>
}
[Fact]
public async Task Reject_Sets_RejectedFromPhase_And_Forces_DangSoanThao()
public async Task Reject_To_DangSoanThao_Sets_RejectedFromPhase_TraLai()
{
// Arrange: PE phase=ChoCCM. Drafter reject.
// Session 14: "Trả lại" semantic — target=DangSoanThao + decision=Reject.
// Service set RejectedFromPhase + force về DangSoanThao + Drafter resume jump-back.
var actor = await _fx.CreateUserAsync(
$"ccm-{Guid.NewGuid():N}@test", "CCM TPB", _deptCcm, ["DeptManager", "CostControl"]);
var pe = await SeedPeAsync(PurchaseEvaluationPhase.ChoCCM);
// Act: reject (target irrelevant — service forces về DangSoanThao).
await _service.TransitionAsync(
pe, PurchaseEvaluationPhase.TuChoi, actor.Id, ["DeptManager", "CostControl"],
ApprovalDecision.Reject, "không phù hợp");
pe, PurchaseEvaluationPhase.DangSoanThao, actor.Id, ["DeptManager", "CostControl"],
ApprovalDecision.Reject, "trả lại Drafter sửa");
// Assert.
var fresh = await _db.PurchaseEvaluations.AsNoTracking().FirstAsync(x => x.Id == pe.Id);
fresh.Phase.Should().Be(PurchaseEvaluationPhase.DangSoanThao);
fresh.RejectedFromPhase.Should().Be(PurchaseEvaluationPhase.ChoCCM);
}
[Fact]
public async Task Reject_To_TuChoi_Locks_Permanently_No_RejectedFromPhase()
{
// Session 14: "Từ chối" semantic — target=TuChoi + decision=Reject.
// Service KHÔNG override target + KHÔNG set RejectedFromPhase (phiếu khoá vĩnh viễn).
var actor = await _fx.CreateUserAsync(
$"ccm-{Guid.NewGuid():N}@test", "CCM TPB cancel", _deptCcm, ["DeptManager", "CostControl"]);
var pe = await SeedPeAsync(PurchaseEvaluationPhase.ChoCCM);
await _service.TransitionAsync(
pe, PurchaseEvaluationPhase.TuChoi, actor.Id, ["DeptManager", "CostControl"],
ApprovalDecision.Reject, "từ chối hoàn toàn");
var fresh = await _db.PurchaseEvaluations.AsNoTracking().FirstAsync(x => x.Id == pe.Id);
fresh.Phase.Should().Be(PurchaseEvaluationPhase.TuChoi);
fresh.RejectedFromPhase.Should().BeNull();
}
[Fact]
public async Task Resume_After_Reject_Jumps_Back_To_RejectedPhase()
{