How do you keep site photos organised between jobs?

Hello everyone, First post here. I run a two-man survey outfit and our biggest mess is photos: hundreds of shots per job, all named DSC_whatever, and by the time an invoice is queried nobody can find the right one. What has worked so far is renaming on the tablet before the files ever leave it, using job number plus station plus date. Clumsy but it beats searching by thumbnail. I have also started keeping a one-line text file in each folder with what the job was about, which sounds trivial until you open a folder from two years ago. Curious what the rest of you do. Folder-per-job, database, or something smarter?

Site plans by day, slot paytables by night. Keep a useful overview bookmarked for the numbers.