1f199b01a5
Replace TODO marker trong Chunk B138469d(line 257-262) bằng UPSERT block mirror PE Mig 26 line 512-546. Changes: - ApproveV2Async: move matchingLevel computation UP (trước UPSERT block) - +UPSERT ContractLevelOpinion ~25 LOC: - Match level theo ApproverUserId (OR-of-N) + fallback first (admin override) - Empty comment → "(duyệt — không ý kiến)" placeholder - Insert mới hoặc update existing (UPSERT semantic) - SignedByUserId + SignedByFullName denormalized cho Section 5 FE - skipToFinal block reuse matchingLevel (KHÔNG re-compute) - +ResolveActorFullNameAsync helper (mirror PE line 774-783) Section 5 FE (Chunk E) sẽ render dynamic theo flow.steps[].levels[] với opinion data từ table này. Admin override → FE detect SignedByUserId !== Level.ApproverUserId → banner "Admin duyệt thay". Verify: - dotnet build SolutionErp.slnx PASS 0 err, 2 pre-existing DocxRenderer warn - dotnet test 111/111 PASS — 0 regression - V1 legacy path UNCHANGED (7 prod contract giữ behavior) Plan B chain status: - A158898e8✅ Entity +2 fields - A2a85e437✅ Mig 32 + Config + Seed - B138469d✅ Service ApproveV2Async branch (UPSERT TODO) - C26c98d3✅ Mig 33 ContractLevelOpinions - B2 (this) ✅ UPSERT block (resolve TODO Chunk B) - D FE Workspace V2 (Implementer, next) - E FE Section 5 V2 (Implementer, pending) Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
SOLUTION_ERP
Hệ thống quản lý Hợp đồng Nhà cung cấp / Thầu phụ / Tổ đội cho Công ty TNHH Xây dựng Solutions.
📘 AI context:
CLAUDE.md(pointer) →docs/CLAUDE.md(full)
Quick start (dev)
Yêu cầu: .NET 10 SDK, Node 20+, SQL Server (local hoặc qua Docker).
# 1. DB — chạy SQL Server qua Docker (nếu chưa có local)
docker compose up -d
# 2. Backend — migration + run Api (port 5443)
dotnet ef database update --project src/Backend/SolutionErp.Infrastructure --startup-project src/Backend/SolutionErp.Api
dotnet run --project src/Backend/SolutionErp.Api
# 3. Frontend admin (port 8082) — terminal mới
cd fe-admin
npm install
npm run dev
# 4. Frontend user (port 8080) — terminal mới
cd fe-user
npm install
npm run dev
Admin mặc định (sẽ seed sau Phase 1): admin@solutionerp.local / Admin@123456
Architecture
fe-admin (:8082) fe-user (:8080)
│ │
└────── /api proxy ──────┘
▼
SolutionErp.Api (:5443)
│
┌──────────────┼──────────────┐
▼ ▼ ▼
Application Domain Infrastructure ── SQL Server
Tech stack
- Backend: .NET 10 + Clean Architecture + CQRS (MediatR) + FluentValidation + AutoMapper + EF Core + ASP.NET Identity + JWT
- Frontend: React 18 + Vite + TypeScript + Tailwind + shadcn/ui + TanStack Query
- DB: SQL Server 2022
- Deploy: Windows Server + IIS
Roadmap
| Phase | Tuần | Focus |
|---|---|---|
| 0 Draft | T1 | Scaffold, parse FORM + QUY_TRINH |
| 1 Alpha Core | T2-4 | Auth, Permission, CRUD master |
| 2 Form Engine | T5-6 | Render template docx/xlsx |
| 3 Workflow | T7-9 | State machine 9 phase |
| 4 Report + Polish | T10-11 | Dashboard + Excel export |
| 5 Production | T12-13 | CI/CD IIS, UAT, go-live |
Chi tiết ở docs/changelog/migration-todos.md.
License
Proprietary — Công ty TNHH Xây dựng Solutions.